From 8f217890cfb89860d2acd61078f390a2610aad1f Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 4 Jun 2024 07:54:22 -0400 Subject: [PATCH 01/15] Begin Overlay 62 decomp The function I'm leaving on is breaking my brain so gonna commit and document some of the structs to the best of my ability --- asm/overlay_62.s | 1435 +----------------------------------- include/heap.h | 1 + include/overlay_mic_test.h | 102 +++ include/unk_0200CF18.h | 4 +- main.lsf | 1 + src/overlay_mic_test.c | 554 ++++++++++++++ 6 files changed, 677 insertions(+), 1420 deletions(-) create mode 100644 include/overlay_mic_test.h create mode 100644 src/overlay_mic_test.c diff --git a/asm/overlay_62.s b/asm/overlay_62.s index 9bfbbf077f..54184925cc 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -5,1424 +5,13 @@ .text - thumb_func_start ov62_021E5900 -ov62_021E5900: ; 0x021E5900 - push {r4, lr} - add r4, r0, #0 - mov r0, #3 - mov r1, #0x62 - lsl r2, r0, #0x10 - bl CreateHeap - mov r1, #0x4f - add r0, r4, #0 - lsl r1, r1, #2 - mov r2, #0x62 - bl OverlayManager_CreateAndGetData - mov r2, #0x4f - mov r1, #0 - lsl r2, r2, #2 - add r4, r0, #0 - bl MI_CpuFill8 - mov r1, #0x62 - add r0, r1, #0 - add r0, #0xd6 - str r1, [r4, r0] - add r1, #0xd6 - ldr r0, [r4, r1] - bl ov62_021E5C34 - bl ov62_021E5CB8 - ldr r0, _021E59B4 ; =ov62_021E5CC8 - add r1, r4, #0 - bl Main_SetVBlankIntrCB - mov r0, #4 - mov r1, #0x62 - bl FontID_Alloc - mov r1, #0x4e - lsl r1, r1, #2 - add r0, r4, #0 - ldr r1, [r4, r1] - add r0, #0xb8 - bl ov62_021E5FD4 - mov r1, #0x4e - lsl r1, r1, #2 - add r0, r4, #0 - ldr r1, [r4, r1] - add r0, #0xb8 - bl ov62_021E604C - mov r1, #0x4e - lsl r1, r1, #2 - add r0, r4, #0 - ldr r1, [r4, r1] - add r0, #0xb8 - bl ov62_021E60E4 - mov r1, #0x4e - lsl r1, r1, #2 - ldr r1, [r4, r1] - add r0, r4, #0 - bl ov62_021E5CF4 - add r0, r4, #0 - bl ov62_021E5D88 - mov r1, #0x4e - lsl r1, r1, #2 - add r0, r4, #0 - ldr r1, [r4, r1] - ldr r2, _021E59B8 ; =ov62_021E62B8 - add r0, #0xf0 - add r3, r4, #0 - bl ov62_021E61AC - mov r0, #0x4a - lsl r0, r0, #2 - ldr r2, _021E59BC ; =ov62_021E5A9C - add r0, r4, r0 - add r1, r4, #0 - bl ov62_021E5A5C - mov r0, #0 - mov r1, #0xa - bl GF_SndStartFadeOutBGM - mov r0, #1 - pop {r4, pc} - nop -_021E59B4: .word ov62_021E5CC8 -_021E59B8: .word ov62_021E62B8 -_021E59BC: .word ov62_021E5A9C - thumb_func_end ov62_021E5900 - - thumb_func_start ov62_021E59C0 -ov62_021E59C0: ; 0x021E59C0 - push {r3, r4, r5, lr} - add r5, r0, #0 - bl OverlayManager_GetData - add r4, r0, #0 - add r0, #0xf0 - bl ov62_021E61FC - add r0, r4, #0 - bl ov62_021E5FA0 - add r0, r4, #0 - bl ov62_021E5D54 - add r0, r4, #0 - add r0, #0xb8 - bl ov62_021E6178 - add r0, r4, #0 - add r0, #0xb8 - bl ov62_021E6024 - bl ov62_021E5C80 - mov r0, #4 - bl FontID_Release - add r0, r5, #0 - bl OverlayManager_FreeData - mov r0, #0x4e - lsl r0, r0, #2 - ldr r0, [r4, r0] - bl DestroyHeap - ldr r0, _021E5A14 ; =FS_OVERLAY_ID(intro_title) - ldr r1, _021E5A18 ; =gApplication_TitleScreen - bl RegisterMainOverlay - mov r0, #1 - pop {r3, r4, r5, pc} - nop -_021E5A14: .word FS_OVERLAY_ID(intro_title) -_021E5A18: .word gApplication_TitleScreen - thumb_func_end ov62_021E59C0 - - thumb_func_start ov62_021E5A1C -ov62_021E5A1C: ; 0x021E5A1C - push {r4, lr} - bl OverlayManager_GetData - add r4, r0, #0 - mov r0, #0x4a - lsl r0, r0, #2 - add r0, r4, r0 - bl ov62_021E5A90 - cmp r0, #0 - beq _021E5A36 - mov r0, #1 - pop {r4, pc} -_021E5A36: - mov r0, #0x4a - lsl r0, r0, #2 - add r0, r4, r0 - bl ov62_021E5A6C - add r0, r4, #0 - bl ov62_021E5D64 - add r0, r4, #0 - add r0, #0xb8 - bl ov62_021E6048 - add r4, #0xf0 - add r0, r4, #0 - bl ov62_021E620C - mov r0, #0 - pop {r4, pc} - .balign 4, 0 - thumb_func_end ov62_021E5A1C - - thumb_func_start ov62_021E5A5C -ov62_021E5A5C: ; 0x021E5A5C - ldr r3, _021E5A68 ; =ov62_021E5A84 - str r1, [r0] - mov r1, #0 - str r1, [r0, #0xc] - add r1, r2, #0 - bx r3 - .balign 4, 0 -_021E5A68: .word ov62_021E5A84 - thumb_func_end ov62_021E5A5C - - thumb_func_start ov62_021E5A6C -ov62_021E5A6C: ; 0x021E5A6C - push {r4, lr} - add r4, r0, #0 - bl ov62_021E5A90 - cmp r0, #0 - bne _021E5A82 - add r1, r4, #0 - ldr r2, [r4, #4] - add r0, r4, #0 - add r1, #8 - blx r2 -_021E5A82: - pop {r4, pc} - thumb_func_end ov62_021E5A6C - - thumb_func_start ov62_021E5A84 -ov62_021E5A84: ; 0x021E5A84 - str r1, [r0, #4] - mov r1, #0 - str r1, [r0, #8] - bx lr - thumb_func_end ov62_021E5A84 - - thumb_func_start ov62_021E5A8C -ov62_021E5A8C: ; 0x021E5A8C - ldr r0, [r0] - bx lr - thumb_func_end ov62_021E5A8C - - thumb_func_start ov62_021E5A90 -ov62_021E5A90: ; 0x021E5A90 - ldr r0, [r0, #0xc] - bx lr - thumb_func_end ov62_021E5A90 - - thumb_func_start ov62_021E5A94 -ov62_021E5A94: ; 0x021E5A94 - mov r1, #1 - str r1, [r0, #0xc] - bx lr - .balign 4, 0 - thumb_func_end ov62_021E5A94 - - thumb_func_start ov62_021E5A9C -ov62_021E5A9C: ; 0x021E5A9C - push {r4, r5, lr} - sub sp, #0xc - add r4, r1, #0 - add r5, r0, #0 - bl ov62_021E5A8C - ldr r1, [r4] - cmp r1, #0 - beq _021E5AB8 - cmp r1, #1 - beq _021E5ADA - cmp r1, #2 - beq _021E5AEA - b _021E5AF6 -_021E5AB8: - mov r1, #6 - str r1, [sp] - mov r1, #1 - mov r2, #0x4e - str r1, [sp, #4] - lsl r2, r2, #2 - ldr r0, [r0, r2] - add r2, r1, #0 - str r0, [sp, #8] - mov r0, #0 - add r3, r0, #0 - bl BeginNormalPaletteFade - mov r0, #1 - add sp, #0xc - str r0, [r4] - pop {r4, r5, pc} -_021E5ADA: - bl IsPaletteFadeFinished - cmp r0, #0 - beq _021E5AFA - mov r0, #2 - add sp, #0xc - str r0, [r4] - pop {r4, r5, pc} -_021E5AEA: - ldr r1, _021E5B00 ; =ov62_021E5B04 - add r0, r5, #0 - bl ov62_021E5A84 - add sp, #0xc - pop {r4, r5, pc} -_021E5AF6: - bl GF_AssertFail -_021E5AFA: - add sp, #0xc - pop {r4, r5, pc} - nop -_021E5B00: .word ov62_021E5B04 - thumb_func_end ov62_021E5A9C - - thumb_func_start ov62_021E5B04 -ov62_021E5B04: ; 0x021E5B04 - push {r3, r4, r5, lr} - add r4, r1, #0 - add r5, r0, #0 - bl ov62_021E5A8C - ldr r1, [r4] - cmp r1, #3 - bhi _021E5B5E - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_021E5B20: ; jump table - .short _021E5B28 - _021E5B20 - 2 ; case 0 - .short _021E5B34 - _021E5B20 - 2 ; case 1 - .short _021E5B48 - _021E5B20 - 2 ; case 2 - .short _021E5B54 - _021E5B20 - 2 ; case 3 -_021E5B28: - add r0, #0xf0 - bl ov62_021E625C - mov r0, #1 - str r0, [r4] - pop {r3, r4, r5, pc} -_021E5B34: - bl ov62_021E6630 - cmp r0, #0 - beq _021E5B62 - ldr r0, _021E5B64 ; =0x000005DC - bl PlaySE - mov r0, #2 - str r0, [r4] - pop {r3, r4, r5, pc} -_021E5B48: - add r0, #0xf0 - bl ov62_021E6278 - mov r0, #3 - str r0, [r4] - pop {r3, r4, r5, pc} -_021E5B54: - ldr r1, _021E5B68 ; =ov62_021E5B6C - add r0, r5, #0 - bl ov62_021E5A84 - pop {r3, r4, r5, pc} -_021E5B5E: - bl GF_AssertFail -_021E5B62: - pop {r3, r4, r5, pc} - .balign 4, 0 -_021E5B64: .word 0x000005DC -_021E5B68: .word ov62_021E5B6C - thumb_func_end ov62_021E5B04 - - thumb_func_start ov62_021E5B6C -ov62_021E5B6C: ; 0x021E5B6C - push {r3, r4, r5, lr} - add r4, r1, #0 - add r5, r0, #0 - bl ov62_021E5A8C - ldr r1, [r4] - cmp r1, #0 - beq _021E5B86 - cmp r1, #1 - beq _021E5B94 - cmp r1, #2 - beq _021E5BA4 - b _021E5BAE -_021E5B86: - ldr r0, [r0, #0x14] - mov r1, #1 - bl UnkImageStruct_SetSpriteAnimSeqNo - mov r0, #1 - str r0, [r4] - pop {r3, r4, r5, pc} -_021E5B94: - ldr r0, [r0, #0x14] - bl sub_0200DCA0 - cmp r0, #0 - bne _021E5BB2 - mov r0, #2 - str r0, [r4] - pop {r3, r4, r5, pc} -_021E5BA4: - ldr r1, _021E5BB4 ; =ov62_021E5BB8 - add r0, r5, #0 - bl ov62_021E5A84 - pop {r3, r4, r5, pc} -_021E5BAE: - bl GF_AssertFail -_021E5BB2: - pop {r3, r4, r5, pc} - .balign 4, 0 -_021E5BB4: .word ov62_021E5BB8 - thumb_func_end ov62_021E5B6C - - thumb_func_start ov62_021E5BB8 -ov62_021E5BB8: ; 0x021E5BB8 - push {r4, r5, lr} - sub sp, #0xc - add r4, r1, #0 - add r5, r0, #0 - bl ov62_021E5A8C - ldr r1, [r4] - cmp r1, #0 - beq _021E5BD4 - cmp r1, #1 - beq _021E5BF8 - cmp r1, #2 - beq _021E5C08 - b _021E5C14 -_021E5BD4: - mov r1, #6 - str r1, [sp] - mov r1, #1 - str r1, [sp, #4] - mov r1, #0x4e - lsl r1, r1, #2 - ldr r0, [r0, r1] - str r0, [sp, #8] - mov r0, #0 - add r1, r0, #0 - add r2, r0, #0 - add r3, r0, #0 - bl BeginNormalPaletteFade - mov r0, #1 - add sp, #0xc - str r0, [r4] - pop {r4, r5, pc} -_021E5BF8: - bl IsPaletteFadeFinished - cmp r0, #0 - beq _021E5C18 - mov r0, #2 - add sp, #0xc - str r0, [r4] - pop {r4, r5, pc} -_021E5C08: - ldr r1, _021E5C1C ; =ov62_021E5C20 - add r0, r5, #0 - bl ov62_021E5A84 - add sp, #0xc - pop {r4, r5, pc} -_021E5C14: - bl GF_AssertFail -_021E5C18: - add sp, #0xc - pop {r4, r5, pc} - .balign 4, 0 -_021E5C1C: .word ov62_021E5C20 - thumb_func_end ov62_021E5BB8 - - thumb_func_start ov62_021E5C20 -ov62_021E5C20: ; 0x021E5C20 - push {r4, lr} - add r4, r0, #0 - bl ov62_021E5A8C - bl ov62_021E6600 - add r0, r4, #0 - bl ov62_021E5A94 - pop {r4, pc} - thumb_func_end ov62_021E5C20 - - thumb_func_start ov62_021E5C34 -ov62_021E5C34: ; 0x021E5C34 - push {r4, lr} - add r4, r0, #0 - mov r0, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - bl HBlankInterruptDisable - bl GfGfx_DisableEngineAPlanes - bl GfGfx_DisableEngineBPlanes - mov r2, #1 - lsl r2, r2, #0x1a - ldr r1, [r2] - ldr r0, _021E5C78 ; =0xFFFFE0FF - and r1, r0 - str r1, [r2] - ldr r2, _021E5C7C ; =0x04001000 - ldr r1, [r2] - and r0, r1 - str r0, [r2] - mov r0, #0 - bl sub_0200FBDC - mov r0, #1 - bl sub_0200FBDC - mov r0, #0x20 - add r1, r4, #0 - bl GF_CreateVramTransferManager - pop {r4, pc} - nop -_021E5C78: .word 0xFFFFE0FF -_021E5C7C: .word 0x04001000 - thumb_func_end ov62_021E5C34 - - thumb_func_start ov62_021E5C80 -ov62_021E5C80: ; 0x021E5C80 - push {r3, lr} - bl GF_DestroyVramTransferManager - mov r0, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - bl HBlankInterruptDisable - bl GfGfx_DisableEngineAPlanes - bl GfGfx_DisableEngineBPlanes - mov r2, #1 - lsl r2, r2, #0x1a - ldr r1, [r2] - ldr r0, _021E5CB0 ; =0xFFFFE0FF - and r1, r0 - str r1, [r2] - ldr r2, _021E5CB4 ; =0x04001000 - ldr r1, [r2] - and r0, r1 - str r0, [r2] - pop {r3, pc} - .balign 4, 0 -_021E5CB0: .word 0xFFFFE0FF -_021E5CB4: .word 0x04001000 - thumb_func_end ov62_021E5C80 - - thumb_func_start ov62_021E5CB8 -ov62_021E5CB8: ; 0x021E5CB8 - ldr r3, _021E5CC0 ; =GfGfx_SetBanks - ldr r0, _021E5CC4 ; =ov62_021E66D0 - bx r3 - nop -_021E5CC0: .word GfGfx_SetBanks -_021E5CC4: .word ov62_021E66D0 - thumb_func_end ov62_021E5CB8 - - thumb_func_start ov62_021E5CC8 -ov62_021E5CC8: ; 0x021E5CC8 - push {r4, lr} - add r4, r0, #0 - bl NNS_GfdDoVramTransfer - add r0, r4, #0 - bl ov62_021E5FC4 - add r4, #0xb8 - add r0, r4, #0 - bl ov62_021E60D4 - ldr r3, _021E5CEC ; =0x027E0000 - ldr r1, _021E5CF0 ; =0x00003FF8 - mov r0, #1 - ldr r2, [r3, r1] - orr r0, r2 - str r0, [r3, r1] - pop {r4, pc} - .balign 4, 0 -_021E5CEC: .word 0x027E0000 -_021E5CF0: .word 0x00003FF8 - thumb_func_end ov62_021E5CC8 - - thumb_func_start ov62_021E5CF4 -ov62_021E5CF4: ; 0x021E5CF4 - push {r3, r4, r5, lr} - add r4, r1, #0 - add r5, r0, #0 - add r0, r4, #0 - bl SpriteRenderer_Create - ldr r1, _021E5D48 ; =ov62_021E66B0 - ldr r2, _021E5D4C ; =ov62_021E6668 - mov r3, #0x20 - str r0, [r5] - bl sub_0200CF70 - add r0, r4, #0 - bl sub_0200B2E0 - add r0, r4, #0 - bl sub_0200B2E8 - ldr r0, [r5] - bl SpriteRenderer_CreateGfxHandler - str r0, [r5, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r2, #7 - bl sub_0200CFF4 - ldr r0, [r5] - ldr r1, [r5, #4] - ldr r2, _021E5D50 ; =ov62_021E667C - bl SpriteRenderer_Init2DGfxResManagersFromCountsArray - mov r0, #0x10 - mov r1, #1 - bl GfGfx_EngineATogglePlanes - mov r0, #0x10 - mov r1, #1 - bl GfGfx_EngineBTogglePlanes - pop {r3, r4, r5, pc} - nop -_021E5D48: .word ov62_021E66B0 -_021E5D4C: .word ov62_021E6668 -_021E5D50: .word ov62_021E667C - thumb_func_end ov62_021E5CF4 - - thumb_func_start ov62_021E5D54 -ov62_021E5D54: ; 0x021E5D54 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4] - bl SpriteRenderer_Delete - mov r0, #0 - str r0, [r4] - pop {r4, pc} - thumb_func_end ov62_021E5D54 - - thumb_func_start ov62_021E5D64 -ov62_021E5D64: ; 0x021E5D64 - push {r3, r4, r5, lr} - add r5, r0, #0 - mov r4, #0 -_021E5D6A: - lsl r0, r4, #2 - add r0, r5, r0 - ldr r0, [r0, #8] - bl UnkImageStruct_TickSpriteAnimation1Frame - add r0, r4, #1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - cmp r4, #7 - blo _021E5D6A - ldr r0, [r5, #4] - bl sub_0200D020 - pop {r3, r4, r5, pc} - .balign 4, 0 - thumb_func_end ov62_021E5D64 - - thumb_func_start ov62_021E5D88 -ov62_021E5D88: ; 0x021E5D88 - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x10 - add r5, r0, #0 - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - str r0, [sp, #8] - ldr r0, _021E5F58 ; =0x00000A03 - mov r2, #0xb0 - str r0, [sp, #0xc] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #6 - bl SpriteRenderer_LoadPlttResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F5C ; =0x00000A02 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #8 - bl SpriteRenderer_LoadCellResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F60 ; =0x00000A04 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #9 - bl SpriteRenderer_LoadAnimResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, _021E5F64 ; =0x00000A01 - mov r2, #0xb0 - str r0, [sp, #8] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #7 - bl SpriteRenderer_LoadCharResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - str r0, [sp, #8] - ldr r0, _021E5F68 ; =0x00000B03 - mov r2, #0xb0 - str r0, [sp, #0xc] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xa - bl SpriteRenderer_LoadPlttResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F6C ; =0x00000B02 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xc - bl SpriteRenderer_LoadCellResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F70 ; =0x00000B04 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xd - bl SpriteRenderer_LoadAnimResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, _021E5F74 ; =0x00000B01 - mov r2, #0xb0 - str r0, [sp, #8] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xb - bl SpriteRenderer_LoadCharResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - mov r0, #2 - str r0, [sp, #8] - ldr r0, _021E5F78 ; =0x00000D03 - mov r2, #0xb0 - str r0, [sp, #0xc] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x12 - bl SpriteRenderer_LoadPlttResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F7C ; =0x00000D02 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x14 - bl SpriteRenderer_LoadCellResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F80 ; =0x00000D04 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x15 - bl SpriteRenderer_LoadAnimResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #2 - str r0, [sp, #4] - ldr r0, _021E5F84 ; =0x00000D01 - mov r2, #0xb0 - str r0, [sp, #8] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x13 - bl SpriteRenderer_LoadCharResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - str r0, [sp, #8] - ldr r0, _021E5F88 ; =0x00000C03 - mov r2, #0xb0 - str r0, [sp, #0xc] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xe - bl SpriteRenderer_LoadPlttResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F8C ; =0x00000C02 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x10 - bl SpriteRenderer_LoadCellResObjFromNarcId - mov r0, #0 - str r0, [sp] - ldr r0, _021E5F90 ; =0x00000C04 - mov r2, #0xb0 - str r0, [sp, #4] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0x11 - bl SpriteRenderer_LoadAnimResObjFromNarcId - mov r0, #0 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, _021E5F94 ; =0x00000C01 - mov r2, #0xb0 - str r0, [sp, #8] - ldr r0, [r5] - ldr r1, [r5, #4] - mov r3, #0xf - bl SpriteRenderer_LoadCharResObjFromNarcId - ldr r7, _021E5F98 ; =ov62_021E67C8 - mov r4, #0 -_021E5EFC: - ldr r2, _021E5F9C ; =ov62_021E6694 - lsl r3, r4, #2 - add r6, r5, r3 - ldr r3, [r2, r3] - mov r2, #0x34 - mul r2, r3 - ldr r0, [r5] - ldr r1, [r5, #4] - add r2, r7, r2 - bl SpriteRenderer_LoadResourcesAndCreateSprite - mov r1, #1 - str r0, [r6, #8] - bl UnkImageStruct_SetSpriteAnimActiveFlag - add r0, r4, #1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - cmp r4, #7 - blo _021E5EFC - mov r4, #0 - add r6, r4, #0 -_021E5F28: - lsl r0, r4, #2 - add r0, r5, r0 - ldr r0, [r0, #0x18] - add r1, r6, #0 - bl UnkImageStruct_SetSpriteVisibleFlag - add r0, r4, #1 - lsl r0, r0, #0x10 - lsr r4, r0, #0x10 - cmp r4, #3 - blo _021E5F28 - ldr r0, [r5, #8] - mov r1, #1 - bl sub_0200E0C0 - ldr r0, [r5, #0x14] - mov r1, #1 - bl UnkImageStruct_SetSpritePriority - mov r0, #0xa - add r5, #0xb4 - str r0, [r5] - add sp, #0x10 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_021E5F58: .word 0x00000A03 -_021E5F5C: .word 0x00000A02 -_021E5F60: .word 0x00000A04 -_021E5F64: .word 0x00000A01 -_021E5F68: .word 0x00000B03 -_021E5F6C: .word 0x00000B02 -_021E5F70: .word 0x00000B04 -_021E5F74: .word 0x00000B01 -_021E5F78: .word 0x00000D03 -_021E5F7C: .word 0x00000D02 -_021E5F80: .word 0x00000D04 -_021E5F84: .word 0x00000D01 -_021E5F88: .word 0x00000C03 -_021E5F8C: .word 0x00000C02 -_021E5F90: .word 0x00000C04 -_021E5F94: .word 0x00000C01 -_021E5F98: .word ov62_021E67C8 -_021E5F9C: .word ov62_021E6694 - thumb_func_end ov62_021E5D88 - - thumb_func_start ov62_021E5FA0 -ov62_021E5FA0: ; 0x021E5FA0 - push {r4, r5, r6, lr} - add r6, r0, #0 - mov r4, #0 - add r5, r6, #0 -_021E5FA8: - ldr r0, [r5, #8] - cmp r0, #0 - beq _021E5FB2 - bl sub_0200D9DC -_021E5FB2: - add r4, r4, #1 - add r5, r5, #4 - cmp r4, #7 - blt _021E5FA8 - ldr r0, [r6] - ldr r1, [r6, #4] - bl SpriteRenderer_UnloadResourcesAndRemoveGfxHandler - pop {r4, r5, r6, pc} - thumb_func_end ov62_021E5FA0 - - thumb_func_start ov62_021E5FC4 -ov62_021E5FC4: ; 0x021E5FC4 - push {r3, lr} - ldr r0, [r0] - cmp r0, #0 - beq _021E5FD0 - bl thunk_OamManager_ApplyAndResetBuffers -_021E5FD0: - pop {r3, pc} - .balign 4, 0 - thumb_func_end ov62_021E5FC4 - - thumb_func_start ov62_021E5FD4 -ov62_021E5FD4: ; 0x021E5FD4 - push {r3, r4, r5, r6, r7, lr} - add r6, r0, #0 - add r0, r1, #0 - str r1, [sp] - bl BgConfig_Alloc - str r0, [r6] - ldr r0, _021E601C ; =ov62_021E6658 - bl SetBothScreensModesAndDisable - ldr r4, _021E6020 ; =ov62_021E6728 - mov r7, #0 - add r5, r4, #0 -_021E5FEE: - ldrb r1, [r4, #0x1c] - ldrb r3, [r4, #0x1d] - ldr r0, [r6] - add r2, r5, #0 - bl InitBgFromTemplate - ldrb r1, [r4, #0x1c] - ldr r0, [r6] - bl BgClearTilemapBufferAndCommit - ldrb r0, [r4, #0x1c] - ldr r3, [sp] - mov r1, #0x20 - mov r2, #0 - bl BG_ClearCharDataRange - add r7, r7, #1 - add r4, #0x20 - add r5, #0x20 - cmp r7, #5 - blo _021E5FEE - pop {r3, r4, r5, r6, r7, pc} - nop -_021E601C: .word ov62_021E6658 -_021E6020: .word ov62_021E6728 - thumb_func_end ov62_021E5FD4 - - thumb_func_start ov62_021E6024 -ov62_021E6024: ; 0x021E6024 - push {r4, r5, r6, lr} - ldr r5, _021E6044 ; =ov62_021E6728 - add r6, r0, #0 - mov r4, #0 -_021E602C: - ldrb r1, [r5, #0x1c] - ldr r0, [r6] - bl FreeBgTilemapBuffer - add r4, r4, #1 - add r5, #0x20 - cmp r4, #5 - blo _021E602C - ldr r0, [r6] - bl FreeToHeap - pop {r4, r5, r6, pc} - .balign 4, 0 -_021E6044: .word ov62_021E6728 - thumb_func_end ov62_021E6024 - - thumb_func_start ov62_021E6048 -ov62_021E6048: ; 0x021E6048 - bx lr - .balign 4, 0 - thumb_func_end ov62_021E6048 - - thumb_func_start ov62_021E604C -ov62_021E604C: ; 0x021E604C - push {r3, r4, r5, lr} - sub sp, #0x10 - add r5, r0, #0 - add r4, r1, #0 - mov r1, #0 - mov r0, #0x20 - str r0, [sp] - mov r0, #0xb0 - add r2, r1, #0 - add r3, r1, #0 - str r4, [sp, #4] - bl GfGfxLoader_GXLoadPal - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - str r4, [sp, #0xc] - ldr r2, [r5] - mov r0, #0xb0 - mov r1, #4 - mov r3, #5 - bl GfGfxLoader_LoadCharData - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - str r4, [sp, #0xc] - mov r1, #5 - ldr r2, [r5] - mov r0, #0xb0 - add r3, r1, #0 - bl GfGfxLoader_LoadScrnData - mov r0, #0x20 - str r0, [sp] - mov r0, #0xb0 - mov r1, #1 - mov r2, #4 - mov r3, #0 - str r4, [sp, #4] - bl GfGfxLoader_GXLoadPal - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - str r4, [sp, #0xc] - ldr r2, [r5] - mov r0, #0xb0 - mov r1, #2 - mov r3, #1 - bl GfGfxLoader_LoadCharData - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - str r4, [sp, #0xc] - ldr r2, [r5] - mov r0, #0xb0 - mov r1, #3 - mov r3, #1 - bl GfGfxLoader_LoadScrnData - add sp, #0x10 - pop {r3, r4, r5, pc} - thumb_func_end ov62_021E604C - - thumb_func_start ov62_021E60D4 -ov62_021E60D4: ; 0x021E60D4 - push {r3, lr} - ldr r0, [r0] - cmp r0, #0 - beq _021E60E0 - bl DoScheduledBgGpuUpdates -_021E60E0: - pop {r3, pc} - .balign 4, 0 - thumb_func_end ov62_021E60D4 - - thumb_func_start ov62_021E60E4 -ov62_021E60E4: ; 0x021E60E4 - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x18 - str r0, [sp, #0x14] - add r3, r1, #0 - mov r0, #1 - mov r1, #0x1b - mov r2, #0xea - bl NewMsgDataFromNarc - ldr r1, [sp, #0x14] - ldr r4, _021E6174 ; =ov62_021E66F8 - str r0, [r1, #0x34] - add r0, r1, #0 - mov r6, #0 - add r5, r0, #4 -_021E6102: - ldrb r0, [r4, #2] - add r1, r5, #0 - str r0, [sp] - ldrb r0, [r4, #3] - str r0, [sp, #4] - ldrb r0, [r4, #4] - str r0, [sp, #8] - ldrb r0, [r4, #5] - str r0, [sp, #0xc] - ldrh r0, [r4, #6] - str r0, [sp, #0x10] - ldr r0, [sp, #0x14] - ldrb r2, [r4] - ldrb r3, [r4, #1] - ldr r0, [r0] - bl AddWindowParameterized - add r0, r5, #0 - mov r1, #0 - bl FillWindowPixelBuffer - add r0, r5, #0 - bl ClearWindowTilemap - ldr r0, [sp, #0x14] - add r1, r6, #0 - ldr r0, [r0, #0x34] - bl NewString_ReadMsgData - add r7, r0, #0 - mov r0, #0 - str r0, [sp] - mov r0, #0xff - str r0, [sp, #4] - ldr r0, [r4, #0xc] - add r2, r7, #0 - str r0, [sp, #8] - mov r0, #0 - str r0, [sp, #0xc] - ldrb r1, [r4, #8] - add r0, r5, #0 - mov r3, #0 - bl AddTextPrinterParameterizedWithColor - add r0, r7, #0 - bl String_Delete - add r0, r5, #0 - bl CopyWindowToVram - add r6, r6, #1 - add r4, #0x10 - add r5, #0x10 - cmp r6, #3 - blt _021E6102 - add sp, #0x18 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_021E6174: .word ov62_021E66F8 - thumb_func_end ov62_021E60E4 - - thumb_func_start ov62_021E6178 -ov62_021E6178: ; 0x021E6178 - push {r3, r4, r5, r6, r7, lr} - add r7, r0, #0 - mov r4, #0 - add r5, r7, #4 - add r6, r4, #0 -_021E6182: - add r0, r5, #0 - bl ClearWindowTilemapAndCopyToVram - add r0, r5, #0 - add r1, r6, #0 - bl FillWindowPixelBuffer - add r0, r5, #0 - bl ClearWindowTilemap - add r0, r5, #0 - bl RemoveWindow - add r4, r4, #1 - add r5, #0x10 - cmp r4, #3 - blt _021E6182 - ldr r0, [r7, #0x34] - bl DestroyMsgData - pop {r3, r4, r5, r6, r7, pc} - thumb_func_end ov62_021E6178 - - thumb_func_start ov62_021E61AC -ov62_021E61AC: ; 0x021E61AC - push {r3, r4, r5, r6, r7, lr} - add r5, r0, #0 - mov r0, #8 - add r4, r1, #0 - add r6, r2, #0 - add r7, r3, #0 - bl Sys_SetSleepDisableFlag - mov r1, #0x12 - add r0, r4, #0 - lsl r1, r1, #4 - bl AllocFromHeap - mov r2, #0x12 - add r4, r0, #0 - mov r1, #0 - lsl r2, r2, #4 - bl MI_CpuFill8 - str r4, [r5, #0x1c] - mov r0, #0 - str r0, [r5] - add r4, #0x1f - mov r0, #0x1f - bic r4, r0 - mov r0, #1 - str r4, [r5, #4] - lsl r0, r0, #8 - str r0, [r5, #8] - mov r0, #0x41 - lsl r0, r0, #6 - str r0, [r5, #0xc] - mov r0, #1 - str r0, [r5, #0x10] - str r6, [r5, #0x14] - str r7, [r5, #0x18] - bl sub_02005518 - str r0, [r5, #0x34] - pop {r3, r4, r5, r6, r7, pc} - thumb_func_end ov62_021E61AC - - thumb_func_start ov62_021E61FC -ov62_021E61FC: ; 0x021E61FC - push {r3, lr} - ldr r0, [r0, #0x1c] - bl FreeToHeap - mov r0, #8 - bl Sys_ClearSleepDisableFlag - pop {r3, pc} - thumb_func_end ov62_021E61FC - - thumb_func_start ov62_021E620C -ov62_021E620C: ; 0x021E620C - push {r3, r4, r5, lr} - add r5, r0, #0 - bl sub_02005518 - add r4, r0, #0 - beq _021E621E - ldr r0, [r5, #0x34] - cmp r0, #0 - bne _021E6256 -_021E621E: - ldr r0, [r5, #0x30] - cmp r0, #0 - bne _021E6238 - ldr r0, [r5, #0x28] - cmp r0, #0 - beq _021E6234 - add r0, r5, #0 - bl ov62_021E6278 - mov r0, #1 - str r0, [r5, #0x2c] -_021E6234: - mov r0, #1 - str r0, [r5, #0x30] -_021E6238: - cmp r4, #0 - beq _021E6256 - ldr r0, [r5, #0x34] - cmp r0, #0 - bne _021E6256 - mov r0, #0 - str r0, [r5, #0x30] - ldr r0, [r5, #0x2c] - cmp r0, #0 - beq _021E6256 - add r0, r5, #0 - bl ov62_021E625C - mov r0, #0 - str r0, [r5, #0x2c] -_021E6256: - str r4, [r5, #0x34] - pop {r3, r4, r5, pc} - .balign 4, 0 - thumb_func_end ov62_021E620C - - thumb_func_start ov62_021E625C -ov62_021E625C: ; 0x021E625C - push {r4, lr} - add r4, r0, #0 - ldr r1, [r4, #0x30] - cmp r1, #0 - bne _021E6270 - bl GF_MIC_StartAutoSampling - mov r0, #1 - str r0, [r4, #0x28] - pop {r4, pc} -_021E6270: - mov r0, #1 - str r0, [r4, #0x2c] - pop {r4, pc} - .balign 4, 0 - thumb_func_end ov62_021E625C - - thumb_func_start ov62_021E6278 -ov62_021E6278: ; 0x021E6278 - push {r4, lr} - add r4, r0, #0 - bl GF_MIC_StopAutoSampling - mov r0, #0 - str r0, [r4, #0x28] - pop {r4, pc} - .balign 4, 0 - thumb_func_end ov62_021E6278 - - thumb_func_start ov62_021E6288 -ov62_021E6288: ; 0x021E6288 - push {r3, r4, r5, lr} - ldr r1, [r0, #8] - mov r2, #0 - sub r1, r1, #1 - add r4, r2, #0 - ldr r5, [r0, #4] - cmp r1, #0 - ble _021E62AE - mov r0, #1 - lsl r0, r0, #8 -_021E629C: - ldrb r3, [r5, r4] - cmp r3, #0x80 - bhs _021E62A6 - sub r3, r0, r3 - b _021E62A6 -_021E62A6: - add r4, r4, #1 - add r2, r2, r3 - cmp r4, r1 - blt _021E629C -_021E62AE: - add r0, r2, #0 - bl _s32_div_f - pop {r3, r4, r5, pc} - .balign 4, 0 - thumb_func_end ov62_021E6288 - - thumb_func_start ov62_021E62B8 -ov62_021E62B8: ; 0x021E62B8 - push {r3, r4, r5, r6, r7, lr} - add r5, r1, #0 - cmp r0, #0 - bne _021E638A - add r4, r5, #0 - add r4, #0xf0 - add r0, r4, #0 - bl ov62_021E6288 - add r7, r0, #0 - ldr r0, [r4, #0x20] - cmp r0, r7 - bge _021E62E4 - lsl r0, r7, #0x18 - lsr r0, r0, #0x18 - bl ov62_021E6390 - add r6, r0, #0 - str r7, [r4, #0x20] - mov r0, #1 - str r0, [r4, #0x24] - b _021E62F4 -_021E62E4: - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - bl ov62_021E6390 - add r6, r0, #0 - ldr r0, [r4, #0x20] - sub r0, r0, #2 - str r0, [r4, #0x20] -_021E62F4: - cmp r6, #0 - beq _021E6368 - ldr r0, [r4, #0x24] - cmp r0, #0 - beq _021E630A - ldr r0, [r5, #0x10] - mov r1, #1 - bl UnkImageStruct_SetSpriteAnimSeqNo - mov r0, #0 - str r0, [r4, #0x24] -_021E630A: - add r0, r5, #0 - bl ov62_021E63D0 - cmp r0, #0 - beq _021E6326 - mov r1, #0x4e - lsl r1, r1, #2 - ldr r1, [r5, r1] - add r0, r5, #0 - mov r2, #0x80 - mov r3, #0x40 - bl ov62_021E63E8 - b _021E6356 -_021E6326: - add r0, r5, #0 - add r0, #0xb4 - ldr r0, [r0] - sub r1, r0, #1 - add r0, r5, #0 - add r0, #0xb4 - str r1, [r0] - add r0, r5, #0 - add r0, #0xb4 - ldr r0, [r0] - cmp r0, #0 - bne _021E6356 - mov r1, #0x4e - lsl r1, r1, #2 - ldr r1, [r5, r1] - add r0, r5, #0 - mov r2, #0x80 - mov r3, #0x40 - bl ov62_021E63E8 - add r0, r5, #0 - mov r1, #0xa - add r0, #0xb4 - str r1, [r0] -_021E6356: - ldr r0, [r5, #8] - add r1, r6, #0 - bl UnkImageStruct_SetSpriteAnimSeqNo - ldr r0, [r5, #0xc] - add r1, r6, #0 - bl UnkImageStruct_SetSpriteAnimSeqNo - b _021E6382 -_021E6368: - bne _021E6382 - ldr r0, [r5, #0x10] - mov r1, #0 - bl UnkImageStruct_SetSpriteAnimSeqNo - ldr r0, [r5, #8] - mov r1, #0 - bl UnkImageStruct_SetSpriteAnimSeqNo - ldr r0, [r5, #0xc] - mov r1, #0 - bl UnkImageStruct_SetSpriteAnimSeqNo -_021E6382: - ldr r0, _021E638C ; =_021E68E0 - ldr r1, [r0] - add r1, r1, #1 - str r1, [r0] -_021E638A: - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_021E638C: .word _021E68E0 - thumb_func_end ov62_021E62B8 - - thumb_func_start ov62_021E6390 -ov62_021E6390: ; 0x021E6390 - push {r4, lr} - cmp r0, #0x8c - bhi _021E639A - mov r4, #0 - b _021E63CA -_021E639A: - cmp r0, #0x8d - blo _021E63A6 - cmp r0, #0x98 - bhi _021E63A6 - mov r4, #1 - b _021E63CA -_021E63A6: - cmp r0, #0x99 - blo _021E63B2 - cmp r0, #0xa6 - bhi _021E63B2 - mov r4, #2 - b _021E63CA -_021E63B2: - cmp r0, #0xa7 - blo _021E63BE - cmp r0, #0xbb - bhi _021E63BE - mov r4, #3 - b _021E63CA -_021E63BE: - cmp r0, #0xbc - blo _021E63C6 - mov r4, #4 - b _021E63CA -_021E63C6: - bl GF_AssertFail -_021E63CA: - add r0, r4, #0 - pop {r4, pc} - .balign 4, 0 - thumb_func_end ov62_021E6390 - - thumb_func_start ov62_021E63D0 -ov62_021E63D0: ; 0x021E63D0 - mov r2, #0 -_021E63D2: - ldr r1, [r0, #0x50] - cmp r1, #0 - beq _021E63DC - mov r0, #0 - bx lr -_021E63DC: - add r2, r2, #1 - add r0, #0x30 - cmp r2, #3 - blt _021E63D2 - mov r0, #1 - bx lr - thumb_func_end ov62_021E63D0 + .public ov62_021E5900 + .public ov62_021E59C0 + .public ov62_021E5A1C + .public ov62_021E5A84 + .public ov62_021E5A8C + .public ov62_021E5A94 + .public ov62_021E6288 thumb_func_start ov62_021E63E8 ov62_021E63E8: ; 0x021E63E8 @@ -1745,38 +334,46 @@ _021E664C: .word gSystem _021E6650: .byte 0xA0, 0xC0, 0xB8, 0xF8, 0xFF, 0x00, 0x00, 0x00 +.public ov62_021E6658 ov62_021E6658: ; 0x021E6658 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.public ov62_021E6668 ov62_021E6668: ; 0x021E6668 .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00 .byte 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 +.public ov62_021E667C ov62_021E667C: ; 0x021E667C .byte 0x20, 0x00, 0x00, 0x00 .byte 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 +.public ov62_021E6694 ov62_021E6694: ; 0x021E6694 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 +.public ov62_021E66B0 ov62_021E66B0: ; 0x021E66B0 .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 +.public ov62_021E66D0 ov62_021E66D0: ; 0x021E66D0 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +.public ov62_021E66F8 ov62_021E66F8: ; 0x021E66F8 .byte 0x00, 0x01, 0x01, 0x09, 0x03, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0F, 0x00, 0x04, 0x05, 0x08, 0x16, 0x05, 0x00, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0F, 0x00, 0x04, 0x18, 0x15, 0x06, 0x02, 0x00, 0x6F, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0E, 0x00 +.public ov62_021E6728 ov62_021E6728: ; 0x021E6728 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -1790,6 +387,7 @@ ov62_021E6728: ; 0x021E6728 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 +.public ov62_021E67C8 ov62_021E67C8: ; 0x021E67C8 .byte 0x40, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00 @@ -1814,5 +412,6 @@ gApplication_MicTest: .bss +.public _021E68E0 _021E68E0: .space 0x20 diff --git a/include/heap.h b/include/heap.h index 11440a6f06..be86105965 100644 --- a/include/heap.h +++ b/include/heap.h @@ -30,6 +30,7 @@ typedef enum HeapID { HEAP_ID_CERTIFICATES = 82, HEAP_ID_89 = 89, HEAP_ID_ALPH_PUZZLE = 97, + HEAP_ID_MIC_TEST = 98, HEAP_ID_GAME_BOARD = 110, HEAP_ID_BERRY_POTS = 130, HEAP_ID_BERRY_POTS_APP = 131, diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h new file mode 100644 index 0000000000..b270ce213a --- /dev/null +++ b/include/overlay_mic_test.h @@ -0,0 +1,102 @@ +#ifndef POKEHEARTGOLD_MIC_TEST_H +#define POKEHEARTGOLD_MIC_TEST_H + +#include "msgdata.h" +#include "overlay_manager.h" +#include "system.h" +#include "unk_0200CF18.h" + +//Should be static, but not fully decompiled yet +typedef struct MicTestData MicTestData; +typedef struct MicTestSub_12C MicTestSub_12C; + +typedef void (*MicTestFuncPtr_12C)(MicTestSub_12C *, u32 *); + +typedef struct MicTestSub_F0 { + MICAutoParam mic; + void *unk1C; + s32 unk20; + u32 unk24; + u32 unk28; + u32 unk2C; + u32 unk30; + u32 unk34; +} MicTestSub_F0; + +typedef struct MicTestSub_B8 { + BgConfig *bgConfig; + Window window[3]; + MsgData *msgData; +} MicTestSub_B8; + +struct MicTestSub_12C { + MicTestData *micTest; + MicTestFuncPtr_12C unk4; + u32 unk8; + u32 unkC; +}; + +struct MicTestData { + SpriteRenderer *unk0; + SpriteGfxHandler *unk4; + UnkImageStruct *unk8[7]; + struct { + u8 unk0[0x2C]; + u32 unk2C; + } unk24[3]; + u32 unkB4; + MicTestSub_B8 unkB8; + MicTestSub_F0 unkF0; + MicTestSub_12C unk12C; + HeapID heapId; +}; + +BOOL ov62_021E5900(OVY_MANAGER *overlayMan); +BOOL ov62_021E59C0(OVY_MANAGER *overlayMan); +BOOL ov62_021E5A1C(OVY_MANAGER *overlayMan); +void ov62_021E5A5C(MicTestSub_12C *a0, MicTestData *data, MicTestFuncPtr_12C a2); +void ov62_021E5A6C(MicTestSub_12C *a0); +void ov62_021E5A84(MicTestSub_12C *a0, MicTestFuncPtr_12C a1); +MicTestData *ov62_021E5A8C(MicTestSub_12C *a0); +u32 ov62_021E5A90(MicTestSub_12C *a0); +void ov62_021E5A94(MicTestSub_12C *a0); +void ov62_021E5A9C(MicTestSub_12C *a0, u32 *state); +void ov62_021E5B04(MicTestSub_12C *a0, u32 *state); +void ov62_021E5B6C(MicTestSub_12C *a0, u32 *state); +void ov62_021E5BB8(MicTestSub_12C *a0, u32 *state); +void ov62_021E5C20(MicTestSub_12C *a0, u32 *state); +void ov62_021E5C34(HeapID heapId); +void ov62_021E5C80(); +void ov62_021E5CB8(); +void ov62_021E5CC8(void *data); +void ov62_021E5CF4(MicTestData *micTest, HeapID heapId); +void ov62_021E5D54(MicTestData *micTest); +void ov62_021E5D64(MicTestData *micTest); +void ov62_021E5D88(MicTestData *micTest); +void ov62_021E5FA0(MicTestData *micTest); +void ov62_021E5FC4(MicTestData *micTest); +void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId); +void ov62_021E6024(MicTestSub_B8 *a0); +void ov62_021E6048(MicTestSub_B8 *a0); +void ov62_021E60D4(MicTestSub_B8 *a0); +void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId); +void ov62_021E6178(MicTestSub_B8 *a0); +void ov62_021E61AC(MicTestSub_F0 *a0, HeapID heapId, MICCallback a2, MicTestData *micTest); +void ov62_021E61FC(MicTestSub_F0 *a0); +void ov62_021E620C(MicTestSub_F0 *a0); +void ov62_021E625C(MicTestSub_F0 *a0); +void ov62_021E6278(MicTestSub_F0 *a0); +s32 ov62_021E6288(MicTestSub_F0 *a0); +void ov62_021E62B8(MICResult result, void *data); +u32 ov62_021E6390(u8); +u32 ov62_021E63D0(MicTestData *micTest); + +//Still in asm +void ov62_021E604C(MicTestSub_B8 *a0, HeapID heapId); +BOOL ov62_021E6630(MicTestData *micTest); +void ov62_021E6600(MicTestData *micTest); + + +void ov62_021E63E8(MicTestData *micTest, HeapID heapId, u32 a2, u32 a3); + +#endif //POKEHEARTGOLD_MIC_TEST_H diff --git a/include/unk_0200CF18.h b/include/unk_0200CF18.h index c675f1b0de..be7215c799 100644 --- a/include/unk_0200CF18.h +++ b/include/unk_0200CF18.h @@ -101,8 +101,8 @@ Sprite* SpriteRenderer_CreateSprite(SpriteRenderer* renderer, SpriteGfxHandler* BOOL SpriteRenderer_Init2DGfxResManagersFromCountsArray(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, SpriteResourceCountsListUnion*); BOOL SpriteRenderer_LoadCharResObjFromNarcId(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NarcId narcId, int fileId, BOOL compressed, NNS_G2D_VRAM_TYPE vram, int resId); BOOL SpriteRenderer_LoadCharResObjFromOpenNarc(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NARC* narc, int fileId, BOOL compressed, NNS_G2D_VRAM_TYPE vram, int resId); -s8 SpriteRenderer_LoadPlttResObjFromNarcId(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NarcId SpriteRenderer_LoadPlttResObjFromNarcId, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); -s8 SpriteRenderer_LoadPlttResObjFromOpenNarc(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NARC* SpriteRenderer_LoadPlttResObjFromNarcId, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); +s8 SpriteRenderer_LoadPlttResObjFromNarcId(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NarcId narcId, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); +s8 SpriteRenderer_LoadPlttResObjFromOpenNarc(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NARC* narc, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); u8 sub_0200D644(PaletteData* plttData, PaletteBufferId bufferId, SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NarcId narcId, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); u8 sub_0200D68C(PaletteData* plttData, PaletteBufferId bufferId, SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NARC* narc, int fileId, BOOL compressed, int pltt_num, NNS_G2D_VRAM_TYPE vram, int resId); BOOL SpriteRenderer_LoadCellResObjFromNarcId(SpriteRenderer* renderer, SpriteGfxHandler* gfxHandler, NarcId narcId, int fileId, BOOL compressed, int resId); diff --git a/main.lsf b/main.lsf index c2e9e7e6de..422437232c 100644 --- a/main.lsf +++ b/main.lsf @@ -853,6 +853,7 @@ Overlay OVY_61 Overlay OVY_62 { After main + Object src/overlay_mic_test.o Object asm/overlay_62.o } Overlay OVY_63 diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c new file mode 100644 index 0000000000..0ed38f5464 --- /dev/null +++ b/src/overlay_mic_test.c @@ -0,0 +1,554 @@ +#include "font.h" +#include "gf_gfx_loader.h" +#include "main.h" +#include "overlay_mic_test.h" +#include "sound.h" +#include "sound_02004A44.h" +#include "system.h" +#include "text.h" +#include "title_screen.h" +#include "unk_0200FA24.h" +#include "unk_02005D10.h" +#include "unk_0200B150.h" +#include "vram_transfer_manager.h" + +BOOL ov62_021E5900(OVY_MANAGER *overlayMan) { + CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 3 << 0x10); + MicTestData *micTest = OverlayManager_CreateAndGetData(overlayMan, sizeof(MicTestData), HEAP_ID_MIC_TEST); + MI_CpuFill8(micTest, 0, sizeof(MicTestData)); + micTest->heapId = HEAP_ID_MIC_TEST; + ov62_021E5C34(micTest->heapId); + ov62_021E5CB8(); + Main_SetVBlankIntrCB(ov62_021E5CC8, micTest); + FontID_Alloc(4, HEAP_ID_MIC_TEST); + ov62_021E5FD4(&micTest->unkB8, micTest->heapId); + ov62_021E604C(&micTest->unkB8, micTest->heapId); + ov62_021E60E4(&micTest->unkB8, micTest->heapId); + ov62_021E5CF4(micTest, micTest->heapId); + ov62_021E5D88(micTest); + ov62_021E61AC(&micTest->unkF0, micTest->heapId, ov62_021E62B8, micTest); + ov62_021E5A5C(&micTest->unk12C, micTest, ov62_021E5A9C); + GF_SndStartFadeOutBGM(0, 10); + return TRUE; +} + +BOOL ov62_021E59C0(OVY_MANAGER *overlayMan) { + MicTestData *micTest = OverlayManager_GetData(overlayMan); + ov62_021E61FC(&micTest->unkF0); + ov62_021E5FA0(micTest); + ov62_021E5D54(micTest); + ov62_021E6178(&micTest->unkB8); + ov62_021E6024(&micTest->unkB8); + ov62_021E5C80(); + FontID_Release(4); + OverlayManager_FreeData(overlayMan); + DestroyHeap(micTest->heapId); + RegisterMainOverlay(FS_OVERLAY_ID(intro_title), &gApplication_TitleScreen); + return TRUE; +} + +BOOL ov62_021E5A1C(OVY_MANAGER *overlayMan) { + MicTestData *micTest = OverlayManager_GetData(overlayMan); + if (ov62_021E5A90(&micTest->unk12C)) { + return TRUE; + } + ov62_021E5A6C(&micTest->unk12C); + ov62_021E5D64(micTest); + ov62_021E6048(&micTest->unkB8); + ov62_021E620C(&micTest->unkF0); + return FALSE; +} + +void ov62_021E5A5C(MicTestSub_12C *a0, MicTestData *micTest, MicTestFuncPtr_12C a2) { + a0->micTest = micTest; + a0->unkC = 0; + ov62_021E5A84(a0, a2); +} + +void ov62_021E5A6C(MicTestSub_12C *a0) { + if (ov62_021E5A90(a0) == 0) { + a0->unk4(a0, &a0->unk8); + } +} + +void ov62_021E5A84(MicTestSub_12C *a0, MicTestFuncPtr_12C a1) { + a0->unk4 = a1; + a0->unk8 = 0; +} + +MicTestData *ov62_021E5A8C(MicTestSub_12C *a0) { + return a0->micTest; +} + +u32 ov62_021E5A90(MicTestSub_12C *a0) { + return a0->unkC; +} + +void ov62_021E5A94(MicTestSub_12C *a0) { + a0->unkC = 1; +} + +void ov62_021E5A9C(MicTestSub_12C *a0, u32 *state) { + MicTestData *micTest = ov62_021E5A8C(a0); + + switch (*state) { + case 0: + BeginNormalPaletteFade(0, 1, 1, 0, 6, 1, micTest->heapId); + *state = 1; + break; + case 1: + if (IsPaletteFadeFinished()) { + *state = 2; + } + break; + case 2: + ov62_021E5A84(a0, ov62_021E5B04); + break; + default: + GF_ASSERT(FALSE); + } +} + +void ov62_021E5B04(MicTestSub_12C *a0, u32 *state) { + MicTestData *micTest = ov62_021E5A8C(a0); + + switch (*state) { + case 0: + ov62_021E625C(&micTest->unkF0); + (*state) = 1; + break; + case 1: + if (ov62_021E6630(micTest)) { + PlaySE(0x5DC); + (*state) = 2; + } + break; + case 2: + ov62_021E6278(&micTest->unkF0); + (*state) = 3; + break; + case 3: + ov62_021E5A84(a0, ov62_021E5B6C); + break; + default: + GF_ASSERT(FALSE); + break; + } +} + +void ov62_021E5B6C(MicTestSub_12C *a0, u32 *state) { + MicTestData *micTest = ov62_021E5A8C(a0); + + switch (*state) { + case 0: + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[3], 1); + (*state) = 1; + break; + case 1: + if (!sub_0200DCA0(micTest->unk8[3])) { + (*state) = 2; + } + break; + case 2: + ov62_021E5A84(a0, ov62_021E5BB8); + break; + default: + GF_ASSERT(FALSE); + } +} + +void ov62_021E5BB8(MicTestSub_12C *a0, u32 *state) { + MicTestData *micTest = ov62_021E5A8C(a0); + + switch (*state) { + case 0: + BeginNormalPaletteFade(0, 0, 0, 0, 6, 1, micTest->heapId); + (*state) = 1; + break; + case 1: + if (IsPaletteFadeFinished()) { + (*state) = 2; + } + break; + case 2: + ov62_021E5A84(a0, ov62_021E5C20); + break; + default: + GF_ASSERT(FALSE); + } +} + +void ov62_021E5C20(MicTestSub_12C *a0, u32 *state) { + MicTestData *micTest = ov62_021E5A8C(a0); + ov62_021E6600(micTest); + ov62_021E5A94(a0); +} + +void ov62_021E5C34(HeapID heapId) { + Main_SetVBlankIntrCB(NULL, NULL); + HBlankInterruptDisable(); + GfGfx_DisableEngineAPlanes(); + GfGfx_DisableEngineBPlanes(); + GX_SetVisiblePlane(0); + GXS_SetVisiblePlane(0); + sub_0200FBDC(0); + sub_0200FBDC(1); + GF_CreateVramTransferManager(0x20, heapId); +} + +void ov62_021E5C80() { + GF_DestroyVramTransferManager(); + Main_SetVBlankIntrCB(NULL, NULL); + HBlankInterruptDisable(); + GfGfx_DisableEngineAPlanes(); + GfGfx_DisableEngineBPlanes(); + GX_SetVisiblePlane(0); + GXS_SetVisiblePlane(0); +} + +extern GraphicsBanks ov62_021E66D0; + +void ov62_021E5CB8() { + GfGfx_SetBanks(&ov62_021E66D0); +} + +//TODO: Is this a library struct? +typedef struct UnkStruct_27E0000 { + u8 unk_0000[0x3FF8]; + u32 unk_3FF8; +} UnkStruct_27E0000; + +void ov62_021E5CC8(void *data){ + MicTestData *micTest = data; + NNS_GfdDoVramTransfer(); + ov62_021E5FC4(micTest); + ov62_021E60D4(&micTest->unkB8); + UnkStruct_27E0000 *unkStruct = (UnkStruct_27E0000 *)(0x27e0000); + unkStruct->unk_3FF8 |= 1; +} + +extern Unk122_021E92FC ov62_021E66B0; +extern Unk122_021E92D0 ov62_021E6668; +extern SpriteResourceCountsListUnion ov62_021E667C; + +void ov62_021E5CF4(MicTestData *micTest, HeapID heapId) { + SpriteRenderer *spriteRender = SpriteRenderer_Create(heapId); + micTest->unk0 = spriteRender; + sub_0200CF70(spriteRender, &ov62_021E66B0, &ov62_021E6668, 0x20); + sub_0200B2E0(heapId); + sub_0200B2E8(heapId); + micTest->unk4 = SpriteRenderer_CreateGfxHandler(micTest->unk0); + sub_0200CFF4(micTest->unk0, micTest->unk4, 7); + SpriteRenderer_Init2DGfxResManagersFromCountsArray(micTest->unk0, micTest->unk4, &ov62_021E667C); + GfGfx_EngineATogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); + GfGfx_EngineBTogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); +} + +void ov62_021E5D54(MicTestData *micTest) { + SpriteRenderer_Delete(micTest->unk0); + micTest->unk0 = NULL; +} + +void ov62_021E5D64(MicTestData *micTest) { + for (u16 i = 0; i < 7; i++) { + UnkImageStruct_TickSpriteAnimation1Frame(micTest->unk8[i]); + } + sub_0200D020(micTest->unk4); +} + +extern UnkTemplate_0200D748 ov62_021E67C8[7]; +extern u32 ov62_021E6694[7]; + +void ov62_021E5D88(MicTestData *micTest) { + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 8, 0, 0xA02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 9, 0, 0xA04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 7, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xa01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 10, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 12, 0, 0xB02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 13, 0, 0xB04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 11, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 18, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 0xD03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 20, 0, 0xD02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 21, 0, 0xD04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 19, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0xD01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 16, 0, 0xC02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 17, 0, 0xC04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC01); + + for (u16 i = 0; i < 7; i++) { + micTest->unk8[i] = SpriteRenderer_LoadResourcesAndCreateSprite(micTest->unk0, micTest->unk4, &ov62_021E67C8[ov62_021E6694[i]]); + UnkImageStruct_SetSpriteAnimActiveFlag(micTest->unk8[i], TRUE); + } + + for (u16 i = 0; i < 3; i++) { + UnkImageStruct_SetSpriteVisibleFlag(micTest->unk8[4 + i], 0); + } + + sub_0200E0C0(micTest->unk8[0], 1); + UnkImageStruct_SetSpritePriority(micTest->unk8[3], 1); + micTest->unkB4 = 10; +} + +void ov62_021E5FA0(MicTestData *micTest) { + for (int i = 0; i < 7; i++) { + if (micTest->unk8[i] != NULL) { + sub_0200D9DC(micTest->unk8[i]); + } + } + SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->unk0, micTest->unk4); +} + +void ov62_021E5FC4(MicTestData *micTest) { + if (micTest->unk0 != NULL) { + thunk_OamManager_ApplyAndResetBuffers(); + } +} + +extern GraphicsModes ov62_021E6658; +extern struct { + BgTemplate bgTemplate; + u8 unk1C; + u8 unk1D; + u8 unk1E; + u8 unk1F; +} ov62_021E6728[5]; + +void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { + a0->bgConfig = BgConfig_Alloc(heapId); + SetBothScreensModesAndDisable(&ov62_021E6658); + + for (u32 i = 0; i < 5; i++) { + InitBgFromTemplate(a0->bgConfig, ov62_021E6728[i].unk1C, &ov62_021E6728[i].bgTemplate, ov62_021E6728[i].unk1D); + BgClearTilemapBufferAndCommit(a0->bgConfig, ov62_021E6728[i].unk1C); + BG_ClearCharDataRange(ov62_021E6728[i].unk1C, 32, 0, heapId); + } +} + +void ov62_021E6024(MicTestSub_B8 *a0) { + for (u32 i = 0; i < 5; i++) { + FreeBgTilemapBuffer(a0->bgConfig, ov62_021E6728[i].unk1C); + } + FreeToHeap(a0->bgConfig); +} + +void ov62_021E6048(MicTestSub_B8 *a0) { + +} + +void ov62_021E604C(MicTestSub_B8 *a0, HeapID heapId) { + GfGfxLoader_GXLoadPal(NARC_a_1_7_6, 0, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 32, heapId); + GfGfxLoader_LoadCharData(NARC_a_1_7_6, 4, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); + GfGfxLoader_LoadScrnData(NARC_a_1_7_6, 5, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); + + GfGfxLoader_GXLoadPal(NARC_a_1_7_6, 1, GF_PAL_LOCATION_SUB_BG, GF_PAL_SLOT_0_OFFSET, 32, heapId); + GfGfxLoader_LoadCharData(NARC_a_1_7_6, 2, a0->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, 0, heapId); + GfGfxLoader_LoadScrnData(NARC_a_1_7_6, 3, a0->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, 0, heapId); +} + +void ov62_021E60D4(MicTestSub_B8 *a0) { + if (a0->bgConfig != NULL) { + DoScheduledBgGpuUpdates(a0->bgConfig); + } +} + +extern struct { + u8 bgId; + u8 x; + u8 y; + u8 width; + u8 height; + u8 palNum; + u16 baseTile; + u8 fontId; + u32 color; +} ov62_021E66F8[3]; + +void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { + a0->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, 0xea, heapId); + + for (int i = 0; i < 3; i++) { + AddWindowParameterized(a0->bgConfig, &a0->window[i], ov62_021E66F8[i].bgId, ov62_021E66F8[i].x, ov62_021E66F8[i].y, ov62_021E66F8[i].width, ov62_021E66F8[i].height, ov62_021E66F8[i].palNum, ov62_021E66F8[i].baseTile); + FillWindowPixelBuffer(&a0->window[i], 0); + ClearWindowTilemap(&a0->window[i]); + String *str = NewString_ReadMsgData(a0->msgData, i); + AddTextPrinterParameterizedWithColor(&a0->window[i], ov62_021E66F8[i].fontId, str, 0, 0, 0xFF, ov62_021E66F8[i].color, 0); + String_Delete(str); + CopyWindowToVram(&a0->window[i]); + } +} + +void ov62_021E6178(MicTestSub_B8 *a0) { + for (int i = 0; i < 3; i++) { + ClearWindowTilemapAndCopyToVram(&a0->window[i]); + FillWindowPixelBuffer(&a0->window[i], 0); + ClearWindowTilemap(&a0->window[i]); + RemoveWindow(&a0->window[i]); + } + DestroyMsgData(a0->msgData); +} + +void ov62_021E61AC(MicTestSub_F0 *a0, HeapID heapId, MICCallback a2, MicTestData *micTest) { + Sys_SetSleepDisableFlag(8); + + void *data = AllocFromHeap(heapId, 0x120); + MI_CpuFill8(data, 0, 0x120); + a0->unk1C = data; + + a0->mic.type = MIC_SAMPLING_TYPE_8BIT; + a0->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? + a0->mic.size = (1 << 8); + a0->mic.rate = 0x1040; + a0->mic.loop_enable = TRUE; + a0->mic.full_callback = a2; + a0->mic.full_arg = micTest; + + a0->unk34 = sub_02005518(); +} + +void ov62_021E61FC(MicTestSub_F0 *a0) { + FreeToHeap(a0->unk1C); + Sys_ClearSleepDisableFlag(8); +} + +void ov62_021E620C(MicTestSub_F0 *a0) { + u32 next = sub_02005518(); + + if (next == 0 || a0->unk34 == 0) { + if (a0->unk30 == 0) { + if (a0->unk28) { + ov62_021E6278(a0); + a0->unk2C = 1; + } + a0->unk30 = 1; + } + + if (next != 0 && a0->unk34 == 0) { + a0->unk30 = 0; + + if (a0->unk2C) { + ov62_021E625C(a0); + a0->unk2C = 0; + } + } + } + + a0->unk34 = next; +} + +void ov62_021E625C(MicTestSub_F0 *a0) { + if (a0->unk30 == 0) { + GF_MIC_StartAutoSampling(&a0->mic); + a0->unk28 = 1; + } else { + a0->unk2C = 1; + } +} + +void ov62_021E6278(MicTestSub_F0 *a0) { + GF_MIC_StopAutoSampling(); + a0->unk28 = 0; +} + +s32 ov62_021E6288(MicTestSub_F0 *a0) { + int i; + u8 *buffer; + + int cnt = 0; + int size = a0->mic.size - 1; + buffer = a0->mic.buffer; + + for (i = 0; i < size; i++) { + if (buffer[i] < 0x80) { + cnt += 0x100 - buffer[i]; + } else { + cnt += buffer[i]; + } + } + return cnt / size; +} + +extern struct { + u32 unk0; +} _021E68E0; + +void ov62_021E62B8(MICResult result, void *data) { + MicTestData *micTest = data; + + if (result != MIC_RESULT_SUCCESS) { + return; + } + + MicTestSub_F0 *unkF0 = &micTest->unkF0; + + s32 var = ov62_021E6288(unkF0); + u32 unk; + + if (unkF0->unk20 < var) { + unk = ov62_021E6390(var); + unkF0->unk20 = var; + unkF0->unk24 = 1; + } else { + unk = ov62_021E6390(unkF0->unk20); + unkF0->unk20 -= 2; + } + + if (unk) { + if (unkF0->unk24) { + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[2], 1); + unkF0->unk24 = 0; + } + + if (ov62_021E63D0(micTest)) { + ov62_021E63E8(micTest, micTest->heapId, 0x80, 0x40); + } else { + micTest->unkB4--; + if (micTest->unkB4 == 0) { + ov62_021E63E8(micTest, micTest->heapId, 0x80, 0x40); + micTest->unkB4 = 10; + } + } + + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], unk); + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], unk); + } else if (unk == 0) { + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[2], 0); + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], 0); + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], 0); + } + + _021E68E0.unk0++; +} + +u32 ov62_021E6390(u8 a0) { + u32 ret; + + if (a0 <= 0x8C) { + ret = 0; + } else if (a0 >= 0x8D && a0 <= 0x98) { + ret = 1; + } else if (a0 >= 0x99 && a0 <= 0xA6) { + ret = 2; + } else if (a0 >= 0xA7 && a0 <= 0xBB) { + ret = 3; + } else if (a0 >= 0xBC) { + ret = 4; + } else { + GF_ASSERT(FALSE); + } + + return ret; +} + +u32 ov62_021E63D0(MicTestData *micTest) { + for (int i = 0; i < 3; i++) { + if (micTest->unk24[i].unk2C) { + return 0; + } + } + return 1; +} \ No newline at end of file From 1c18fd52f96da798cae3a934941535a19ac4c86b Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:19:27 -0400 Subject: [PATCH 02/15] Obvious function names --- asm/overlay_62.s | 10 ++--- include/overlay_mic_test.h | 16 +++---- src/overlay_mic_test.c | 86 +++++++++++++++++++------------------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/asm/overlay_62.s b/asm/overlay_62.s index 54184925cc..a0aa5919d6 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -5,13 +5,13 @@ .text - .public ov62_021E5900 - .public ov62_021E59C0 - .public ov62_021E5A1C + .public MicTest_Init + .public MicTest_Main + .public MicTest_Exit .public ov62_021E5A84 .public ov62_021E5A8C .public ov62_021E5A94 - .public ov62_021E6288 + .public MicTest_AverageMicInput thumb_func_start ov62_021E63E8 ov62_021E63E8: ; 0x021E63E8 @@ -408,7 +408,7 @@ ov62_021E67C8: ; 0x021E67C8 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .public gApplication_MicTest gApplication_MicTest: - .word ov62_021E5900, ov62_021E5A1C, ov62_021E59C0, 0xFFFFFFFF + .word MicTest_Init, MicTest_Exit, MicTest_Main, 0xFFFFFFFF .bss diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index b270ce213a..53faebc68a 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -15,7 +15,7 @@ typedef void (*MicTestFuncPtr_12C)(MicTestSub_12C *, u32 *); typedef struct MicTestSub_F0 { MICAutoParam mic; void *unk1C; - s32 unk20; + s32 curVolume; u32 unk24; u32 unk28; u32 unk2C; @@ -37,7 +37,7 @@ struct MicTestSub_12C { }; struct MicTestData { - SpriteRenderer *unk0; + SpriteRenderer *spriteRenderer; SpriteGfxHandler *unk4; UnkImageStruct *unk8[7]; struct { @@ -51,9 +51,9 @@ struct MicTestData { HeapID heapId; }; -BOOL ov62_021E5900(OVY_MANAGER *overlayMan); -BOOL ov62_021E59C0(OVY_MANAGER *overlayMan); -BOOL ov62_021E5A1C(OVY_MANAGER *overlayMan); +BOOL MicTest_Init(OVY_MANAGER *overlayMan); +BOOL MicTest_Main(OVY_MANAGER *overlayMan); +BOOL MicTest_Exit(OVY_MANAGER *overlayMan); void ov62_021E5A5C(MicTestSub_12C *a0, MicTestData *data, MicTestFuncPtr_12C a2); void ov62_021E5A6C(MicTestSub_12C *a0); void ov62_021E5A84(MicTestSub_12C *a0, MicTestFuncPtr_12C a1); @@ -72,7 +72,7 @@ void ov62_021E5CC8(void *data); void ov62_021E5CF4(MicTestData *micTest, HeapID heapId); void ov62_021E5D54(MicTestData *micTest); void ov62_021E5D64(MicTestData *micTest); -void ov62_021E5D88(MicTestData *micTest); +void MicTest_LoadResources(MicTestData *micTest); void ov62_021E5FA0(MicTestData *micTest); void ov62_021E5FC4(MicTestData *micTest); void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId); @@ -86,9 +86,9 @@ void ov62_021E61FC(MicTestSub_F0 *a0); void ov62_021E620C(MicTestSub_F0 *a0); void ov62_021E625C(MicTestSub_F0 *a0); void ov62_021E6278(MicTestSub_F0 *a0); -s32 ov62_021E6288(MicTestSub_F0 *a0); +s32 MicTest_AverageMicInput(MicTestSub_F0 *a0); void ov62_021E62B8(MICResult result, void *data); -u32 ov62_021E6390(u8); +u32 MicTest_GetVolumeBracket(u8); u32 ov62_021E63D0(MicTestData *micTest); //Still in asm diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 0ed38f5464..37cc911ee6 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -12,7 +12,7 @@ #include "unk_0200B150.h" #include "vram_transfer_manager.h" -BOOL ov62_021E5900(OVY_MANAGER *overlayMan) { +BOOL MicTest_Init(OVY_MANAGER *overlayMan) { CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 3 << 0x10); MicTestData *micTest = OverlayManager_CreateAndGetData(overlayMan, sizeof(MicTestData), HEAP_ID_MIC_TEST); MI_CpuFill8(micTest, 0, sizeof(MicTestData)); @@ -25,14 +25,14 @@ BOOL ov62_021E5900(OVY_MANAGER *overlayMan) { ov62_021E604C(&micTest->unkB8, micTest->heapId); ov62_021E60E4(&micTest->unkB8, micTest->heapId); ov62_021E5CF4(micTest, micTest->heapId); - ov62_021E5D88(micTest); + MicTest_LoadResources(micTest); ov62_021E61AC(&micTest->unkF0, micTest->heapId, ov62_021E62B8, micTest); ov62_021E5A5C(&micTest->unk12C, micTest, ov62_021E5A9C); GF_SndStartFadeOutBGM(0, 10); return TRUE; } -BOOL ov62_021E59C0(OVY_MANAGER *overlayMan) { +BOOL MicTest_Main(OVY_MANAGER *overlayMan) { MicTestData *micTest = OverlayManager_GetData(overlayMan); ov62_021E61FC(&micTest->unkF0); ov62_021E5FA0(micTest); @@ -47,7 +47,7 @@ BOOL ov62_021E59C0(OVY_MANAGER *overlayMan) { return TRUE; } -BOOL ov62_021E5A1C(OVY_MANAGER *overlayMan) { +BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { MicTestData *micTest = OverlayManager_GetData(overlayMan); if (ov62_021E5A90(&micTest->unk12C)) { return TRUE; @@ -233,20 +233,20 @@ extern SpriteResourceCountsListUnion ov62_021E667C; void ov62_021E5CF4(MicTestData *micTest, HeapID heapId) { SpriteRenderer *spriteRender = SpriteRenderer_Create(heapId); - micTest->unk0 = spriteRender; + micTest->spriteRenderer = spriteRender; sub_0200CF70(spriteRender, &ov62_021E66B0, &ov62_021E6668, 0x20); sub_0200B2E0(heapId); sub_0200B2E8(heapId); - micTest->unk4 = SpriteRenderer_CreateGfxHandler(micTest->unk0); - sub_0200CFF4(micTest->unk0, micTest->unk4, 7); - SpriteRenderer_Init2DGfxResManagersFromCountsArray(micTest->unk0, micTest->unk4, &ov62_021E667C); + micTest->unk4 = SpriteRenderer_CreateGfxHandler(micTest->spriteRenderer); + sub_0200CFF4(micTest->spriteRenderer, micTest->unk4, 7); + SpriteRenderer_Init2DGfxResManagersFromCountsArray(micTest->spriteRenderer, micTest->unk4, &ov62_021E667C); GfGfx_EngineATogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); GfGfx_EngineBTogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); } void ov62_021E5D54(MicTestData *micTest) { - SpriteRenderer_Delete(micTest->unk0); - micTest->unk0 = NULL; + SpriteRenderer_Delete(micTest->spriteRenderer); + micTest->spriteRenderer = NULL; } void ov62_021E5D64(MicTestData *micTest) { @@ -259,29 +259,29 @@ void ov62_021E5D64(MicTestData *micTest) { extern UnkTemplate_0200D748 ov62_021E67C8[7]; extern u32 ov62_021E6694[7]; -void ov62_021E5D88(MicTestData *micTest) { - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 8, 0, 0xA02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 9, 0, 0xA04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 7, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xa01); +void MicTest_LoadResources(MicTestData *micTest) { + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 8, 0, 0xA02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 9, 0, 0xA04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 7, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xa01); - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 10, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 12, 0, 0xB02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 13, 0, 0xB04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 11, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB01); + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 10, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 12, 0, 0xB02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 13, 0, 0xB04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 11, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB01); - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 18, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 0xD03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 20, 0, 0xD02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 21, 0, 0xD04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 19, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0xD01); + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 18, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 0xD03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 20, 0, 0xD02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 21, 0, 0xD04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 19, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0xD01); - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 16, 0, 0xC02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 17, 0, 0xC04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->unk0, micTest->unk4, NARC_a_1_7_6, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC01); + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 16, 0, 0xC02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 17, 0, 0xC04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC01); for (u16 i = 0; i < 7; i++) { - micTest->unk8[i] = SpriteRenderer_LoadResourcesAndCreateSprite(micTest->unk0, micTest->unk4, &ov62_021E67C8[ov62_021E6694[i]]); + micTest->unk8[i] = SpriteRenderer_LoadResourcesAndCreateSprite(micTest->spriteRenderer, micTest->unk4, &ov62_021E67C8[ov62_021E6694[i]]); UnkImageStruct_SetSpriteAnimActiveFlag(micTest->unk8[i], TRUE); } @@ -300,11 +300,11 @@ void ov62_021E5FA0(MicTestData *micTest) { sub_0200D9DC(micTest->unk8[i]); } } - SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->unk0, micTest->unk4); + SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->spriteRenderer, micTest->unk4); } void ov62_021E5FC4(MicTestData *micTest) { - if (micTest->unk0 != NULL) { + if (micTest->spriteRenderer != NULL) { thunk_OamManager_ApplyAndResetBuffers(); } } @@ -454,7 +454,7 @@ void ov62_021E6278(MicTestSub_F0 *a0) { a0->unk28 = 0; } -s32 ov62_021E6288(MicTestSub_F0 *a0) { +s32 MicTest_AverageMicInput(MicTestSub_F0 *a0) { int i; u8 *buffer; @@ -485,19 +485,19 @@ void ov62_021E62B8(MICResult result, void *data) { MicTestSub_F0 *unkF0 = &micTest->unkF0; - s32 var = ov62_021E6288(unkF0); - u32 unk; + s32 volumeAvg = MicTest_AverageMicInput(unkF0); + u32 volume; - if (unkF0->unk20 < var) { - unk = ov62_021E6390(var); - unkF0->unk20 = var; + if (unkF0->curVolume < volumeAvg) { + volume = MicTest_GetVolumeBracket(volumeAvg); + unkF0->curVolume = volumeAvg; unkF0->unk24 = 1; } else { - unk = ov62_021E6390(unkF0->unk20); - unkF0->unk20 -= 2; + volume = MicTest_GetVolumeBracket(unkF0->curVolume); + unkF0->curVolume -= 2; } - if (unk) { + if (volume) { if (unkF0->unk24) { UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[2], 1); unkF0->unk24 = 0; @@ -513,9 +513,9 @@ void ov62_021E62B8(MICResult result, void *data) { } } - UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], unk); - UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], unk); - } else if (unk == 0) { + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], volume); + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], volume); + } else if (volume == 0) { UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[2], 0); UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], 0); UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], 0); @@ -524,7 +524,7 @@ void ov62_021E62B8(MICResult result, void *data) { _021E68E0.unk0++; } -u32 ov62_021E6390(u8 a0) { +u32 MicTest_GetVolumeBracket(u8 a0) { u32 ret; if (a0 <= 0x8C) { From c8bb106260f88a33d26ee1e64797a7dd9c7f9723 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Tue, 4 Jun 2024 12:09:38 -0400 Subject: [PATCH 03/15] MicTestTaskMan --- asm/overlay_62.s | 8 ++-- include/overlay_mic_test.h | 40 ++++++++--------- src/overlay_mic_test.c | 90 +++++++++++++++++++------------------- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/asm/overlay_62.s b/asm/overlay_62.s index a0aa5919d6..903ab14a02 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -8,8 +8,8 @@ .public MicTest_Init .public MicTest_Main .public MicTest_Exit - .public ov62_021E5A84 - .public ov62_021E5A8C + .public MicTest_SetTask + .public MicTestTaskMan_GetMicTestData .public ov62_021E5A94 .public MicTest_AverageMicInput @@ -360,8 +360,8 @@ ov62_021E66B0: ; 0x021E66B0 .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 -.public ov62_021E66D0 -ov62_021E66D0: ; 0x021E66D0 +.public sMicTestGraphicsBanks +sMicTestGraphicsBanks: ; 0x021E66D0 .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index 53faebc68a..7dc2edf887 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -8,9 +8,9 @@ //Should be static, but not fully decompiled yet typedef struct MicTestData MicTestData; -typedef struct MicTestSub_12C MicTestSub_12C; +typedef struct MicTestTaskManager MicTestTaskManager; -typedef void (*MicTestFuncPtr_12C)(MicTestSub_12C *, u32 *); +typedef void (*MicTestTask)(MicTestTaskManager *, u32 *); typedef struct MicTestSub_F0 { MICAutoParam mic; @@ -29,9 +29,9 @@ typedef struct MicTestSub_B8 { MsgData *msgData; } MicTestSub_B8; -struct MicTestSub_12C { +struct MicTestTaskManager { MicTestData *micTest; - MicTestFuncPtr_12C unk4; + MicTestTask task; u32 unk8; u32 unkC; }; @@ -47,28 +47,28 @@ struct MicTestData { u32 unkB4; MicTestSub_B8 unkB8; MicTestSub_F0 unkF0; - MicTestSub_12C unk12C; + MicTestTaskManager taskMan; HeapID heapId; }; BOOL MicTest_Init(OVY_MANAGER *overlayMan); BOOL MicTest_Main(OVY_MANAGER *overlayMan); BOOL MicTest_Exit(OVY_MANAGER *overlayMan); -void ov62_021E5A5C(MicTestSub_12C *a0, MicTestData *data, MicTestFuncPtr_12C a2); -void ov62_021E5A6C(MicTestSub_12C *a0); -void ov62_021E5A84(MicTestSub_12C *a0, MicTestFuncPtr_12C a1); -MicTestData *ov62_021E5A8C(MicTestSub_12C *a0); -u32 ov62_021E5A90(MicTestSub_12C *a0); -void ov62_021E5A94(MicTestSub_12C *a0); -void ov62_021E5A9C(MicTestSub_12C *a0, u32 *state); -void ov62_021E5B04(MicTestSub_12C *a0, u32 *state); -void ov62_021E5B6C(MicTestSub_12C *a0, u32 *state); -void ov62_021E5BB8(MicTestSub_12C *a0, u32 *state); -void ov62_021E5C20(MicTestSub_12C *a0, u32 *state); +void MicTest_StartTask(MicTestTaskManager *a0, MicTestData *data, MicTestTask a2); +void ov62_021E5A6C(MicTestTaskManager *a0); +void MicTest_SetTask(MicTestTaskManager *a0, MicTestTask a1); +MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *a0); +u32 ov62_021E5A90(MicTestTaskManager *a0); +void ov62_021E5A94(MicTestTaskManager *a0); +void MicTestTask_FadeIn(MicTestTaskManager *a0, u32 *state); +void ov62_021E5B04(MicTestTaskManager *a0, u32 *state); +void ov62_021E5B6C(MicTestTaskManager *a0, u32 *state); +void ov62_021E5BB8(MicTestTaskManager *a0, u32 *state); +void ov62_021E5C20(MicTestTaskManager *a0, u32 *state); void ov62_021E5C34(HeapID heapId); void ov62_021E5C80(); -void ov62_021E5CB8(); -void ov62_021E5CC8(void *data); +void MicTest_SetBanks(); +void MicTest_VBlankIntrCB(void *data); void ov62_021E5CF4(MicTestData *micTest, HeapID heapId); void ov62_021E5D54(MicTestData *micTest); void ov62_021E5D64(MicTestData *micTest); @@ -87,12 +87,12 @@ void ov62_021E620C(MicTestSub_F0 *a0); void ov62_021E625C(MicTestSub_F0 *a0); void ov62_021E6278(MicTestSub_F0 *a0); s32 MicTest_AverageMicInput(MicTestSub_F0 *a0); -void ov62_021E62B8(MICResult result, void *data); +void MicTest_MicrophoneCallback(MICResult result, void *data); u32 MicTest_GetVolumeBracket(u8); u32 ov62_021E63D0(MicTestData *micTest); //Still in asm -void ov62_021E604C(MicTestSub_B8 *a0, HeapID heapId); +void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId); BOOL ov62_021E6630(MicTestData *micTest); void ov62_021E6600(MicTestData *micTest); diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 37cc911ee6..93e544d87d 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -18,16 +18,16 @@ BOOL MicTest_Init(OVY_MANAGER *overlayMan) { MI_CpuFill8(micTest, 0, sizeof(MicTestData)); micTest->heapId = HEAP_ID_MIC_TEST; ov62_021E5C34(micTest->heapId); - ov62_021E5CB8(); - Main_SetVBlankIntrCB(ov62_021E5CC8, micTest); + MicTest_SetBanks(); + Main_SetVBlankIntrCB(MicTest_VBlankIntrCB, micTest); FontID_Alloc(4, HEAP_ID_MIC_TEST); ov62_021E5FD4(&micTest->unkB8, micTest->heapId); - ov62_021E604C(&micTest->unkB8, micTest->heapId); + MicTest_LoadTextResources(&micTest->unkB8, micTest->heapId); ov62_021E60E4(&micTest->unkB8, micTest->heapId); ov62_021E5CF4(micTest, micTest->heapId); MicTest_LoadResources(micTest); - ov62_021E61AC(&micTest->unkF0, micTest->heapId, ov62_021E62B8, micTest); - ov62_021E5A5C(&micTest->unk12C, micTest, ov62_021E5A9C); + ov62_021E61AC(&micTest->unkF0, micTest->heapId, MicTest_MicrophoneCallback, micTest); + MicTest_StartTask(&micTest->taskMan, micTest, MicTestTask_FadeIn); GF_SndStartFadeOutBGM(0, 10); return TRUE; } @@ -49,47 +49,47 @@ BOOL MicTest_Main(OVY_MANAGER *overlayMan) { BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { MicTestData *micTest = OverlayManager_GetData(overlayMan); - if (ov62_021E5A90(&micTest->unk12C)) { + if (ov62_021E5A90(&micTest->taskMan)) { return TRUE; } - ov62_021E5A6C(&micTest->unk12C); + ov62_021E5A6C(&micTest->taskMan); ov62_021E5D64(micTest); ov62_021E6048(&micTest->unkB8); ov62_021E620C(&micTest->unkF0); return FALSE; } -void ov62_021E5A5C(MicTestSub_12C *a0, MicTestData *micTest, MicTestFuncPtr_12C a2) { - a0->micTest = micTest; - a0->unkC = 0; - ov62_021E5A84(a0, a2); +void MicTest_StartTask(MicTestTaskManager *taskMan, MicTestData *micTest, MicTestTask task) { + taskMan->micTest = micTest; + taskMan->unkC = 0; + MicTest_SetTask(taskMan, task); } -void ov62_021E5A6C(MicTestSub_12C *a0) { - if (ov62_021E5A90(a0) == 0) { - a0->unk4(a0, &a0->unk8); +void ov62_021E5A6C(MicTestTaskManager *taskMan) { + if (ov62_021E5A90(taskMan) == 0) { + taskMan->task(taskMan, &taskMan->unk8); } } -void ov62_021E5A84(MicTestSub_12C *a0, MicTestFuncPtr_12C a1) { - a0->unk4 = a1; - a0->unk8 = 0; +void MicTest_SetTask(MicTestTaskManager *taskMan, MicTestTask task) { + taskMan->task = task; + taskMan->unk8 = 0; } -MicTestData *ov62_021E5A8C(MicTestSub_12C *a0) { - return a0->micTest; +MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *taskMan) { + return taskMan->micTest; } -u32 ov62_021E5A90(MicTestSub_12C *a0) { - return a0->unkC; +u32 ov62_021E5A90(MicTestTaskManager *taskMan) { + return taskMan->unkC; } -void ov62_021E5A94(MicTestSub_12C *a0) { - a0->unkC = 1; +void ov62_021E5A94(MicTestTaskManager *taskMan) { + taskMan->unkC = 1; } -void ov62_021E5A9C(MicTestSub_12C *a0, u32 *state) { - MicTestData *micTest = ov62_021E5A8C(a0); +void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { + MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { case 0: @@ -102,15 +102,15 @@ void ov62_021E5A9C(MicTestSub_12C *a0, u32 *state) { } break; case 2: - ov62_021E5A84(a0, ov62_021E5B04); + MicTest_SetTask(taskMan, ov62_021E5B04); break; default: GF_ASSERT(FALSE); } } -void ov62_021E5B04(MicTestSub_12C *a0, u32 *state) { - MicTestData *micTest = ov62_021E5A8C(a0); +void ov62_021E5B04(MicTestTaskManager *taskMan, u32 *state) { + MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { case 0: @@ -119,7 +119,7 @@ void ov62_021E5B04(MicTestSub_12C *a0, u32 *state) { break; case 1: if (ov62_021E6630(micTest)) { - PlaySE(0x5DC); + PlaySE(SEQ_SE_DP_SELECT); (*state) = 2; } break; @@ -128,7 +128,7 @@ void ov62_021E5B04(MicTestSub_12C *a0, u32 *state) { (*state) = 3; break; case 3: - ov62_021E5A84(a0, ov62_021E5B6C); + MicTest_SetTask(taskMan, ov62_021E5B6C); break; default: GF_ASSERT(FALSE); @@ -136,8 +136,8 @@ void ov62_021E5B04(MicTestSub_12C *a0, u32 *state) { } } -void ov62_021E5B6C(MicTestSub_12C *a0, u32 *state) { - MicTestData *micTest = ov62_021E5A8C(a0); +void ov62_021E5B6C(MicTestTaskManager *taskMan, u32 *state) { + MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { case 0: @@ -150,15 +150,15 @@ void ov62_021E5B6C(MicTestSub_12C *a0, u32 *state) { } break; case 2: - ov62_021E5A84(a0, ov62_021E5BB8); + MicTest_SetTask(taskMan, ov62_021E5BB8); break; default: GF_ASSERT(FALSE); } } -void ov62_021E5BB8(MicTestSub_12C *a0, u32 *state) { - MicTestData *micTest = ov62_021E5A8C(a0); +void ov62_021E5BB8(MicTestTaskManager *taskMan, u32 *state) { + MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { case 0: @@ -171,17 +171,17 @@ void ov62_021E5BB8(MicTestSub_12C *a0, u32 *state) { } break; case 2: - ov62_021E5A84(a0, ov62_021E5C20); + MicTest_SetTask(taskMan, ov62_021E5C20); break; default: GF_ASSERT(FALSE); } } -void ov62_021E5C20(MicTestSub_12C *a0, u32 *state) { - MicTestData *micTest = ov62_021E5A8C(a0); +void ov62_021E5C20(MicTestTaskManager *taskMan, u32 *state) { + MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); ov62_021E6600(micTest); - ov62_021E5A94(a0); + ov62_021E5A94(taskMan); } void ov62_021E5C34(HeapID heapId) { @@ -206,10 +206,10 @@ void ov62_021E5C80() { GXS_SetVisiblePlane(0); } -extern GraphicsBanks ov62_021E66D0; +extern GraphicsBanks sMicTestGraphicsBanks; -void ov62_021E5CB8() { - GfGfx_SetBanks(&ov62_021E66D0); +void MicTest_SetBanks() { + GfGfx_SetBanks(&sMicTestGraphicsBanks); } //TODO: Is this a library struct? @@ -218,7 +218,7 @@ typedef struct UnkStruct_27E0000 { u32 unk_3FF8; } UnkStruct_27E0000; -void ov62_021E5CC8(void *data){ +void MicTest_VBlankIntrCB(void *data){ MicTestData *micTest = data; NNS_GfdDoVramTransfer(); ov62_021E5FC4(micTest); @@ -340,7 +340,7 @@ void ov62_021E6048(MicTestSub_B8 *a0) { } -void ov62_021E604C(MicTestSub_B8 *a0, HeapID heapId) { +void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId) { GfGfxLoader_GXLoadPal(NARC_a_1_7_6, 0, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 32, heapId); GfGfxLoader_LoadCharData(NARC_a_1_7_6, 4, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); GfGfxLoader_LoadScrnData(NARC_a_1_7_6, 5, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); @@ -476,7 +476,7 @@ extern struct { u32 unk0; } _021E68E0; -void ov62_021E62B8(MICResult result, void *data) { +void MicTest_MicrophoneCallback(MICResult result, void *data) { MicTestData *micTest = data; if (result != MIC_RESULT_SUCCESS) { From 8387a537a4095a07d2c0f913c2a863dc956e9aca Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:34:32 -0400 Subject: [PATCH 04/15] More MicTestManager functions --- asm/overlay_62.s | 6 +++--- include/overlay_mic_test.h | 14 +++++++------- src/overlay_mic_test.c | 32 ++++++++++++++++---------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/asm/overlay_62.s b/asm/overlay_62.s index 903ab14a02..7bf6b22c6f 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -6,11 +6,11 @@ .text .public MicTest_Init - .public MicTest_Main .public MicTest_Exit + .public MicTest_Main .public MicTest_SetTask .public MicTestTaskMan_GetMicTestData - .public ov62_021E5A94 + .public MicTestTaskMan_Finish .public MicTest_AverageMicInput thumb_func_start ov62_021E63E8 @@ -408,7 +408,7 @@ ov62_021E67C8: ; 0x021E67C8 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .public gApplication_MicTest gApplication_MicTest: - .word MicTest_Init, MicTest_Exit, MicTest_Main, 0xFFFFFFFF + .word MicTest_Init, MicTest_Main, MicTest_Exit, 0xFFFFFFFF .bss diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index 7dc2edf887..b798ce1efd 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -32,8 +32,8 @@ typedef struct MicTestSub_B8 { struct MicTestTaskManager { MicTestData *micTest; MicTestTask task; - u32 unk8; - u32 unkC; + u32 state; + u32 isFinished; }; struct MicTestData { @@ -52,14 +52,14 @@ struct MicTestData { }; BOOL MicTest_Init(OVY_MANAGER *overlayMan); -BOOL MicTest_Main(OVY_MANAGER *overlayMan); BOOL MicTest_Exit(OVY_MANAGER *overlayMan); +BOOL MicTest_Main(OVY_MANAGER *overlayMan); void MicTest_StartTask(MicTestTaskManager *a0, MicTestData *data, MicTestTask a2); -void ov62_021E5A6C(MicTestTaskManager *a0); +void MicTestTaskMan_Run(MicTestTaskManager *a0); void MicTest_SetTask(MicTestTaskManager *a0, MicTestTask a1); MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *a0); -u32 ov62_021E5A90(MicTestTaskManager *a0); -void ov62_021E5A94(MicTestTaskManager *a0); +u32 MicTestTaskMan_IsFinished(MicTestTaskManager *a0); +void MicTestTaskMan_Finish(MicTestTaskManager *a0); void MicTestTask_FadeIn(MicTestTaskManager *a0, u32 *state); void ov62_021E5B04(MicTestTaskManager *a0, u32 *state); void ov62_021E5B6C(MicTestTaskManager *a0, u32 *state); @@ -71,7 +71,7 @@ void MicTest_SetBanks(); void MicTest_VBlankIntrCB(void *data); void ov62_021E5CF4(MicTestData *micTest, HeapID heapId); void ov62_021E5D54(MicTestData *micTest); -void ov62_021E5D64(MicTestData *micTest); +void MicTest_UpdateAnimations(MicTestData *micTest); void MicTest_LoadResources(MicTestData *micTest); void ov62_021E5FA0(MicTestData *micTest); void ov62_021E5FC4(MicTestData *micTest); diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 93e544d87d..8b7bc2f2f3 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -32,7 +32,7 @@ BOOL MicTest_Init(OVY_MANAGER *overlayMan) { return TRUE; } -BOOL MicTest_Main(OVY_MANAGER *overlayMan) { +BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { MicTestData *micTest = OverlayManager_GetData(overlayMan); ov62_021E61FC(&micTest->unkF0); ov62_021E5FA0(micTest); @@ -47,13 +47,13 @@ BOOL MicTest_Main(OVY_MANAGER *overlayMan) { return TRUE; } -BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { +BOOL MicTest_Main(OVY_MANAGER *overlayMan) { MicTestData *micTest = OverlayManager_GetData(overlayMan); - if (ov62_021E5A90(&micTest->taskMan)) { + if (MicTestTaskMan_IsFinished(&micTest->taskMan)) { return TRUE; } - ov62_021E5A6C(&micTest->taskMan); - ov62_021E5D64(micTest); + MicTestTaskMan_Run(&micTest->taskMan); + MicTest_UpdateAnimations(micTest); ov62_021E6048(&micTest->unkB8); ov62_021E620C(&micTest->unkF0); return FALSE; @@ -61,31 +61,31 @@ BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { void MicTest_StartTask(MicTestTaskManager *taskMan, MicTestData *micTest, MicTestTask task) { taskMan->micTest = micTest; - taskMan->unkC = 0; + taskMan->isFinished = FALSE; MicTest_SetTask(taskMan, task); } -void ov62_021E5A6C(MicTestTaskManager *taskMan) { - if (ov62_021E5A90(taskMan) == 0) { - taskMan->task(taskMan, &taskMan->unk8); +void MicTestTaskMan_Run(MicTestTaskManager *taskMan) { + if (MicTestTaskMan_IsFinished(taskMan) == 0) { + taskMan->task(taskMan, &taskMan->state); } } void MicTest_SetTask(MicTestTaskManager *taskMan, MicTestTask task) { taskMan->task = task; - taskMan->unk8 = 0; + taskMan->state = 0; } MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *taskMan) { return taskMan->micTest; } -u32 ov62_021E5A90(MicTestTaskManager *taskMan) { - return taskMan->unkC; +u32 MicTestTaskMan_IsFinished(MicTestTaskManager *taskMan) { + return taskMan->isFinished; } -void ov62_021E5A94(MicTestTaskManager *taskMan) { - taskMan->unkC = 1; +void MicTestTaskMan_Finish(MicTestTaskManager *taskMan) { + taskMan->isFinished = TRUE; } void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { @@ -181,7 +181,7 @@ void ov62_021E5BB8(MicTestTaskManager *taskMan, u32 *state) { void ov62_021E5C20(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); ov62_021E6600(micTest); - ov62_021E5A94(taskMan); + MicTestTaskMan_Finish(taskMan); } void ov62_021E5C34(HeapID heapId) { @@ -249,7 +249,7 @@ void ov62_021E5D54(MicTestData *micTest) { micTest->spriteRenderer = NULL; } -void ov62_021E5D64(MicTestData *micTest) { +void MicTest_UpdateAnimations(MicTestData *micTest) { for (u16 i = 0; i < 7; i++) { UnkImageStruct_TickSpriteAnimation1Frame(micTest->unk8[i]); } From 755598b7f2cd97215f0bfc2ee026d437f9d97558 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:40:07 -0400 Subject: [PATCH 05/15] Finish decomp of functions --- asm/overlay_62.s | 318 +------------------------------------ include/overlay_mic_test.h | 22 ++- src/overlay_mic_test.c | 105 +++++++++++- 3 files changed, 122 insertions(+), 323 deletions(-) diff --git a/asm/overlay_62.s b/asm/overlay_62.s index 7bf6b22c6f..f45e35dcae 100644 --- a/asm/overlay_62.s +++ b/asm/overlay_62.s @@ -12,325 +12,11 @@ .public MicTestTaskMan_GetMicTestData .public MicTestTaskMan_Finish .public MicTest_AverageMicInput - - thumb_func_start ov62_021E63E8 -ov62_021E63E8: ; 0x021E63E8 - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x18 - mov r4, #0 - str r3, [sp, #0x10] - add r7, r2, #0 - str r4, [sp, #0x14] - add r1, r4, #0 - add r3, r0, #0 -_021E63F8: - ldr r2, [r3, #0x50] - cmp r2, #0 - bne _021E6414 - mov r2, #0x30 - mul r2, r1 - add r1, r1, #4 - add r3, r0, #0 - lsl r1, r1, #2 - add r0, r0, r1 - ldr r0, [r0, #8] - add r3, #0x24 - add r4, r3, r2 - str r0, [sp, #0x14] - b _021E641C -_021E6414: - add r1, r1, #1 - add r3, #0x30 - cmp r1, #3 - blt _021E63F8 -_021E641C: - cmp r4, #0 - beq _021E6472 - bl LCRandom - ldr r1, _021E6478 ; =0x00001002 - mul r1, r0 - asr r0, r1, #0xf - lsr r0, r0, #0x10 - add r0, r1, r0 - asr r1, r0, #0x10 - ldr r0, _021E647C ; =0x00001333 - add r6, r1, r0 - bl LCRandom - mov r1, #0x3e - mul r1, r0 - asr r0, r1, #0xf - lsr r0, r0, #0x10 - add r0, r1, r0 - asr r5, r0, #0x10 - add r5, #0x3c - bl LCRandom - lsl r1, r0, #4 - asr r0, r1, #0xf - lsr r0, r0, #0x10 - add r0, r1, r0 - asr r0, r0, #0x10 - str r6, [sp] - add r0, r0, #6 - str r5, [sp, #4] - str r0, [sp, #8] - mov r0, #1 - str r0, [sp, #0xc] - ldr r0, [sp, #0x14] - ldr r3, [sp, #0x10] - add r1, r4, #0 - add r2, r7, #0 - bl ov62_021E6480 - add sp, #0x18 - mov r0, #1 - pop {r3, r4, r5, r6, r7, pc} -_021E6472: - mov r0, #0 - add sp, #0x18 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_021E6478: .word 0x00001002 -_021E647C: .word 0x00001333 - thumb_func_end ov62_021E63E8 - - thumb_func_start ov62_021E6480 -ov62_021E6480: ; 0x021E6480 - push {r3, r4, r5, r6, r7, lr} - add r7, r0, #0 - add r5, r2, #0 - ldr r0, _021E656C ; =ov62_021E6570 - add r4, r1, #0 - mov r2, #0 - add r6, r3, #0 - bl SysTask_CreateOnMainQueue - str r0, [r4, #0x2c] - bl SysTask_GetData - add r4, r0, #0 - ldr r0, [sp, #0x24] - str r7, [r4] - str r0, [r4, #4] - cmp r5, #0 - ble _021E64B6 - lsl r0, r5, #0xc - bl _fflt - add r1, r0, #0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _021E64C4 -_021E64B6: - lsl r0, r5, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_021E64C4: - bl _ffix - str r0, [r4, #8] - cmp r6, #0 - ble _021E64E0 - lsl r0, r6, #0xc - bl _fflt - add r1, r0, #0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _021E64EE -_021E64E0: - lsl r0, r6, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_021E64EE: - bl _ffix - str r0, [r4, #0xc] - mov r0, #0 - str r0, [r4, #0x10] - ldr r0, [sp, #0x1c] - add r0, #0x5a - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - bl GF_SinDegNoWrap - add r2, r0, #0 - ldr r0, [sp, #0x18] - asr r3, r2, #0x1f - asr r7, r0, #0x1f - add r1, r7, #0 - str r0, [sp] - bl _ll_mul - add r2, r0, #0 - mov r0, #2 - mov r3, #0 - lsl r0, r0, #0xa - add r0, r2, r0 - adc r1, r3 - lsl r1, r1, #0x14 - lsr r0, r0, #0xc - orr r0, r1 - str r0, [r4, #0x14] - ldr r0, [sp, #0x1c] - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - bl GF_SinDegNoWrap - add r2, r0, #0 - ldr r0, [sp] - add r1, r7, #0 - asr r3, r2, #0x1f - bl _ll_mul - mov r3, #2 - mov r2, #0 - lsl r3, r3, #0xa - add r3, r0, r3 - adc r1, r2 - lsl r0, r1, #0x14 - lsr r1, r3, #0xc - orr r1, r0 - neg r0, r1 - str r0, [r4, #0x18] - str r2, [r4, #0x1c] - mov r0, #6 - str r2, [r4, #0x20] - lsl r0, r0, #0xc - str r0, [r4, #0x24] - ldr r0, [sp, #0x20] - add r1, r5, #0 - str r0, [r4, #0x28] - ldr r0, [r4] - add r2, r6, #0 - bl UnkImageStruct_SetSpritePositionXY - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_021E656C: .word ov62_021E6570 - thumb_func_end ov62_021E6480 - - thumb_func_start ov62_021E6570 -ov62_021E6570: ; 0x021E6570 - push {r3, r4, r5, r6, r7, lr} - add r5, r1, #0 - add r7, r0, #0 - ldr r0, [r5, #4] - cmp r0, #0 - beq _021E658C - sub r0, r0, #1 - str r0, [r5, #4] - bne _021E65FC - ldr r0, [r5] - mov r1, #1 - bl UnkImageStruct_SetSpriteVisibleFlag - pop {r3, r4, r5, r6, r7, pc} -_021E658C: - add r0, r5, #0 - add r0, #8 - add r1, #0x14 - add r2, r0, #0 - bl VEC_Add - ldr r0, [r5, #8] - ldr r2, [r5, #0x20] - lsl r0, r0, #4 - asr r6, r0, #0x10 - ldr r0, [r5, #0xc] - ldr r1, [r5, #0x24] - lsl r0, r0, #4 - add r3, r2, r1 - mov r1, #0x5a - asr r4, r0, #0x10 - add r0, r5, #0 - lsl r1, r1, #0xe - add r0, #0x20 - str r3, [r5, #0x20] - cmp r3, r1 - ble _021E65C6 - add r2, r1, #0 -_021E65BA: - ldr r3, [r0] - sub r3, r3, r1 - str r3, [r0] - ldr r3, [r5, #0x20] - cmp r3, r2 - bgt _021E65BA -_021E65C6: - lsl r0, r3, #4 - lsr r0, r0, #0x10 - bl GF_SinDegNoWrap - ldr r1, [r5, #0x28] - add r2, r4, #0 - mul r0, r1 - asr r0, r0, #0xc - add r0, r6, r0 - lsl r0, r0, #0x10 - asr r1, r0, #0x10 - ldr r0, [r5] - bl UnkImageStruct_SetSpritePositionXY - mov r0, #0xf - mvn r0, r0 - cmp r4, r0 - bge _021E65FC - ldr r0, [r5] - mov r1, #0 - bl UnkImageStruct_SetSpriteVisibleFlag - add r0, r7, #0 - bl SysTask_Destroy - mov r0, #0 - str r0, [r5, #0x2c] -_021E65FC: - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 - thumb_func_end ov62_021E6570 - - thumb_func_start ov62_021E6600 -ov62_021E6600: ; 0x021E6600 - push {r4, r5, r6, lr} - mov r4, #0 - add r5, r0, #0 - add r6, r4, #0 -_021E6608: - ldr r0, [r5, #0x50] - cmp r0, #0 - beq _021E6614 - bl SysTask_Destroy - str r6, [r5, #0x50] -_021E6614: - add r4, r4, #1 - add r5, #0x30 - cmp r4, #3 - blt _021E6608 - pop {r4, r5, r6, pc} - .balign 4, 0 - thumb_func_end ov62_021E6600 - - thumb_func_start ov62_021E6620 -ov62_021E6620: ; 0x021E6620 - ldr r3, _021E6628 ; =TouchscreenHitbox_FindRectAtTouchNew - ldr r0, _021E662C ; =_021E6650 - bx r3 - nop -_021E6628: .word TouchscreenHitbox_FindRectAtTouchNew -_021E662C: .word _021E6650 - thumb_func_end ov62_021E6620 - - thumb_func_start ov62_021E6630 -ov62_021E6630: ; 0x021E6630 - push {r3, lr} - bl ov62_021E6620 - cmp r0, #0 - beq _021E6644 - ldr r0, _021E664C ; =gSystem - ldr r1, [r0, #0x48] - mov r0, #2 - tst r0, r1 - beq _021E6648 -_021E6644: - mov r0, #1 - pop {r3, pc} -_021E6648: - mov r0, #0 - pop {r3, pc} - .balign 4, 0 -_021E664C: .word gSystem - thumb_func_end ov62_021E6630 + .public ov62_021E6620 .rodata +.public _021E6650 _021E6650: .byte 0xA0, 0xC0, 0xB8, 0xF8, 0xFF, 0x00, 0x00, 0x00 diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index b798ce1efd..f36cb73a30 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -36,14 +36,22 @@ struct MicTestTaskManager { u32 isFinished; }; +typedef struct MicTestSub_24 { + UnkImageStruct *unk0; + u32 unk4; + VecFx32 unk8; + VecFx32 unk14; + fx32 unk20;//angle? + fx32 unk24;//dTheta? + fx32 unk28;//magnitude? + SysTask *task; +} MicTestSub_24; + struct MicTestData { SpriteRenderer *spriteRenderer; SpriteGfxHandler *unk4; UnkImageStruct *unk8[7]; - struct { - u8 unk0[0x2C]; - u32 unk2C; - } unk24[3]; + MicTestSub_24 unk24[3]; u32 unkB4; MicTestSub_B8 unkB8; MicTestSub_F0 unkF0; @@ -90,6 +98,10 @@ s32 MicTest_AverageMicInput(MicTestSub_F0 *a0); void MicTest_MicrophoneCallback(MICResult result, void *data); u32 MicTest_GetVolumeBracket(u8); u32 ov62_021E63D0(MicTestData *micTest); +BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y); +void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7); +void ov62_021E6570(SysTask *, void *); +int ov62_021E6620(); //Still in asm void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId); @@ -97,6 +109,6 @@ BOOL ov62_021E6630(MicTestData *micTest); void ov62_021E6600(MicTestData *micTest); -void ov62_021E63E8(MicTestData *micTest, HeapID heapId, u32 a2, u32 a3); + #endif //POKEHEARTGOLD_MIC_TEST_H diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 8b7bc2f2f3..a1e6280089 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -1,12 +1,14 @@ #include "font.h" #include "gf_gfx_loader.h" #include "main.h" +#include "math_util.h" #include "overlay_mic_test.h" #include "sound.h" #include "sound_02004A44.h" #include "system.h" #include "text.h" #include "title_screen.h" +#include "touchscreen.h" #include "unk_0200FA24.h" #include "unk_02005D10.h" #include "unk_0200B150.h" @@ -297,7 +299,7 @@ void MicTest_LoadResources(MicTestData *micTest) { void ov62_021E5FA0(MicTestData *micTest) { for (int i = 0; i < 7; i++) { if (micTest->unk8[i] != NULL) { - sub_0200D9DC(micTest->unk8[i]); + UnkImageStruct_Delete(micTest->unk8[i]); } } SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->spriteRenderer, micTest->unk4); @@ -546,9 +548,108 @@ u32 MicTest_GetVolumeBracket(u8 a0) { u32 ov62_021E63D0(MicTestData *micTest) { for (int i = 0; i < 3; i++) { - if (micTest->unk24[i].unk2C) { + if (micTest->unk24[i].task) { return 0; } } return 1; +} + +BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { + UnkImageStruct *flag = 0; + MicTestSub_24 *args = NULL; + for (int i = 0; i < 3; i++) { + if (micTest->unk24[i].task == NULL) { + args = &micTest->unk24[i]; + flag = micTest->unk8[i + 4]; + break; + } + } + + if (args != NULL) { + s32 rand1 = (LCRandom() * 0x1002 / 0x10000) + 0x1333; + s32 rand2 = (LCRandom() * 0x3E / 0x10000) + 0x3C; + s32 rand3 = (LCRandom() * 0x10 / 0x10000) + 6; + ov62_021E6480(flag, args, x, y, rand1, rand2, rand3, 1); + return TRUE; + } + + return FALSE; +} + +void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7) { + args->task = SysTask_CreateOnMainQueue(ov62_021E6570, args, 0); + MicTestSub_24 *data = SysTask_GetData(args->task); + + data->unk0 = a0; + data->unk4 = a7; + + data->unk8.x = FX32_CONST(x); + data->unk8.y = FX32_CONST(y); + data->unk8.z = 0; + + s32 sine = GF_SinDegNoWrap(r1 + 90); + data->unk14.x = FX_MUL(z, sine); + sine = GF_SinDegNoWrap(r1); + data->unk14.y = -FX_MUL(z, sine); + data->unk14.z = 0; + + data->unk20 = 0; + data->unk24 = FX32_CONST(6); + data->unk28 = r2; + + UnkImageStruct_SetSpritePositionXY(data->unk0, x, y); +} + +void ov62_021E6570(SysTask *task, void *_data) { + MicTestSub_24 *data = _data; + + if (data->unk4) { + if (--data->unk4 == 0) { + UnkImageStruct_SetSpriteVisibleFlag(data->unk0, TRUE); + } + return; + } + + VEC_Add(&data->unk8, &data->unk14, &data->unk8); + + s16 x = data->unk8.x >> 12; + s16 y = data->unk8.y >> 12; + data->unk20 = data->unk20 + data->unk24; + + while (data->unk20 > FX32_CONST(360)) { + data->unk20 -= FX32_CONST(360); + } + + x += GF_SinDegNoWrap(data->unk20 >> 12) * data->unk28 >> 12; + + UnkImageStruct_SetSpritePositionXY(data->unk0, x, y); + + if (y < -16) { + UnkImageStruct_SetSpriteVisibleFlag(data->unk0, FALSE); + SysTask_Destroy(task); + data->task = NULL; + } +} + +void ov62_021E6600(MicTestData *micTest) { + for (int i = 0; i < 3; i++) { + if (micTest->unk24[i].task != NULL) { + SysTask_Destroy(micTest->unk24[i].task); + micTest->unk24[i].task = NULL; + } + } +} + +extern TouchscreenHitbox _021E6650; + +int ov62_021E6620() { + return TouchscreenHitbox_FindRectAtTouchNew(&_021E6650); +} + +int ov62_021E6630(MicTestData *data) { + if (ov62_021E6620() == 0 || (gSystem.newKeys & 2)) { + return TRUE; + } + return FALSE; } \ No newline at end of file From 37fb29902eb693f0cd8befd4f346881105317b66 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 26 Sep 2024 13:10:23 -0400 Subject: [PATCH 06/15] Data Decompiled --- .githooks/pre-commit | 9 - asm/include/overlay_62.inc | 96 --- asm/overlay_62.s | 103 --- include/constants/items.h | 4 +- include/constants/std_script.h | 4 +- include/credits/data.h | 676 ++++++++-------- include/overlay_mic_test.h | 24 +- include/pokedex.h | 4 +- main.lsf | 1 - src/alph_puzzle.c | 34 +- src/application/view_photo.c | 6 +- src/application/view_rankings.c | 8 +- src/battle/battle_controller_player.c | 26 +- src/battle/battle_cursor.c | 2 +- src/battle/battle_finger.c | 2 +- src/battle/overlay_12_0224E4FC.c | 316 ++++---- src/berry_pots_app.c | 26 +- src/berry_pots_app_tasks.c | 2 +- src/bg_window.c | 4 +- src/certificates_app.c | 10 +- src/credits/data1.c | 8 +- src/data/fieldmap/hidden_items.h | 462 +++++------ src/easy_chat.c | 36 +- src/field/headbutt.c | 80 +- src/field/legend_cutscene_camera.c | 18 +- src/field/scrcmd_pokemon_misc.c | 10 +- src/field_move.c | 28 +- src/field_roamer.c | 86 +- src/field_system_rtc_weather.c | 16 +- src/field_take_photo.c | 12 +- src/field_use_item.c | 60 +- src/field_warp_tasks.c | 12 +- src/fieldmap.c | 60 +- src/font.c | 26 +- src/font_data.c | 4 +- src/get_egg.c | 18 +- src/gymmick_init.c | 30 +- src/intro_movie_scene_3.c | 10 +- src/intro_movie_scene_4.c | 6 +- src/item.c | 1074 ++++++++++++------------- src/mail.c | 14 +- src/map_preview_graphic.c | 50 +- src/message_printer.c | 14 +- src/oaks_speech.c | 20 +- src/options_app.c | 54 +- src/overlay_25.c | 43 +- src/overlay_26_022598C0.c | 126 +-- src/overlay_94.c | 12 +- src/overlay_mic_test.c | 356 +++++--- src/party_context_menu.c | 172 ++-- src/party_menu.c | 84 +- src/pokemon.c | 244 +++--- src/pokepic.c | 474 +++++------ src/register_hall_of_fame.c | 96 +-- src/ribbon.c | 160 ++-- src/safari_zone.c | 20 +- src/save_misc.c | 6 +- src/save_rankings.c | 6 +- src/save_wifi_history.c | 2 +- src/scrcmd_20.c | 94 +-- src/scrcmd_c.c | 20 +- src/scrcmd_dppl_prizes.c | 38 +- src/scrcmd_fossils.c | 14 +- src/scrcmd_mart.c | 382 ++++----- src/scrcmd_move_tutor.c | 104 +-- src/scrcmd_mystery_gift.c | 30 +- src/scrcmd_size_record.c | 32 +- src/start_menu.c | 30 +- src/sys_flags.c | 26 +- src/system.c | 8 +- src/trainer_memo.c | 12 +- src/unk_02013FDC.c | 24 +- src/unk_0204B538.c | 158 ++-- src/unk_0205B3DC.c | 52 +- src/unk_02091054.c | 162 ++-- src/unk_02097F6C.c | 40 +- src/voltorb_flip/voltorb_flip.c | 2 +- src/voltorb_flip/voltorb_flip_data2.c | 20 +- src/voltorb_flip/voltorb_flip_data3.c | 32 +- src/voltorb_flip/voltorb_flip_data4.c | 208 ++--- src/voltorb_flip/voltorb_flip_data5.c | 10 +- src/yes_no_prompt.c | 4 +- 82 files changed, 3387 insertions(+), 3481 deletions(-) delete mode 100755 .githooks/pre-commit delete mode 100644 asm/include/overlay_62.inc delete mode 100644 asm/overlay_62.s diff --git a/.githooks/pre-commit b/.githooks/pre-commit deleted file mode 100755 index c065e57542..0000000000 --- a/.githooks/pre-commit +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# Redirect output to stderr. -exec 1>&2 - -# Run clang-format on staged files; abort the commit if any files are changed -if ! git clang-format --extensions c,cpp,h,hpp ; then - echo "linting made changes to source files; aborting commit" - exit 1 -fi diff --git a/asm/include/overlay_62.inc b/asm/include/overlay_62.inc deleted file mode 100644 index 4d8bed5bdd..0000000000 --- a/asm/include/overlay_62.inc +++ /dev/null @@ -1,96 +0,0 @@ -#include -#pragma once -.public RegisterMainOverlay -.public FontID_Alloc -.public FontID_Release -.public sub_02005518 -.public GF_MIC_StartAutoSampling -.public GF_MIC_StopAutoSampling -.public GF_SndStartFadeOutBGM -.public PlaySE -.public OverlayManager_CreateAndGetData -.public OverlayManager_GetData -.public OverlayManager_FreeData -.public GfGfxLoader_LoadCharData -.public GfGfxLoader_LoadScrnData -.public GfGfxLoader_GXLoadPal -.public sub_0200B2E0 -.public sub_0200B2E8 -.public NewMsgDataFromNarc -.public DestroyMsgData -.public NewString_ReadMsgData -.public SpriteRenderer_Create -.public SpriteRenderer_CreateGfxHandler -.public SpriteRenderer_CreateOamCharPlttManagers -.public SpriteRenderer_CreateSpriteList -.public SpriteGfxHandler_RenderAndAnimateSprites -.public thunk_OamManager_ApplyAndResetBuffers -.public SpriteRenderer_Delete -.public SpriteRenderer_Init2DGfxResManagersFromCountsArray -.public SpriteRenderer_LoadCharResObjFromNarcId -.public SpriteRenderer_LoadPlttResObjFromNarcId -.public SpriteRenderer_LoadCellResObjFromNarcId -.public SpriteRenderer_LoadAnimResObjFromNarcId -.public SpriteRenderer_LoadResourcesAndCreateSprite -.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler -.public UnkImageStruct_Delete -.public UnkImageStruct_TickSpriteAnimation1Frame -.public UnkImageStruct_SetSpriteAnimSeqNo -.public UnkImageStruct_SetSpriteAnimActiveFlag -.public sub_0200DCA0 -.public UnkImageStruct_SetSpriteVisibleFlag -.public UnkImageStruct_SetSpritePriority -.public UnkImageStruct_SetSpritePositionXY -.public sub_0200E0C0 -.public SysTask_CreateOnMainQueue -.public SysTask_Destroy -.public BeginNormalPaletteFade -.public IsPaletteFadeFinished -.public sub_0200FBDC -.public Main_SetVBlankIntrCB -.public HBlankInterruptDisable -.public Sys_SetSleepDisableFlag -.public Sys_ClearSleepDisableFlag -.public CreateHeap -.public DestroyHeap -.public AllocFromHeap -.public FreeToHeap -.public BgConfig_Alloc -.public SetBothScreensModesAndDisable -.public InitBgFromTemplate -.public FreeBgTilemapBuffer -.public BG_ClearCharDataRange -.public BgClearTilemapBufferAndCommit -.public AddWindowParameterized -.public RemoveWindow -.public CopyWindowToVram -.public ClearWindowTilemap -.public ClearWindowTilemapAndCopyToVram -.public FillWindowPixelBuffer -.public DoScheduledBgGpuUpdates -.public SysTask_GetData -.public GF_SinDegNoWrap -.public LCRandom -.public AddTextPrinterParameterizedWithColor -.public GF_CreateVramTransferManager -.public GF_DestroyVramTransferManager -.public GfGfx_SetBanks -.public GfGfx_DisableEngineAPlanes -.public GfGfx_EngineATogglePlanes -.public GfGfx_DisableEngineBPlanes -.public GfGfx_EngineBTogglePlanes -.public TouchscreenHitbox_FindRectAtTouchNew -.public GF_AssertFail -.public String_Delete -.public NNS_GfdDoVramTransfer -.public VEC_Add -.public MI_CpuFill8 -.public _fadd -.public _ffix -.public _fflt -.public _fsub -.public _ll_mul -.public _s32_div_f -.public gSystem -.public gApplication_TitleScreen -.public gApplication_MicTest diff --git a/asm/overlay_62.s b/asm/overlay_62.s deleted file mode 100644 index f45e35dcae..0000000000 --- a/asm/overlay_62.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "asm/macros.inc" - .include "overlay_62.inc" - .include "global.inc" - .public gApplication_TitleScreen - - .text - - .public MicTest_Init - .public MicTest_Exit - .public MicTest_Main - .public MicTest_SetTask - .public MicTestTaskMan_GetMicTestData - .public MicTestTaskMan_Finish - .public MicTest_AverageMicInput - .public ov62_021E6620 - - .rodata - -.public _021E6650 -_021E6650: - .byte 0xA0, 0xC0, 0xB8, 0xF8, 0xFF, 0x00, 0x00, 0x00 - -.public ov62_021E6658 -ov62_021E6658: ; 0x021E6658 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.public ov62_021E6668 -ov62_021E6668: ; 0x021E6668 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00 - .byte 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 - -.public ov62_021E667C -ov62_021E667C: ; 0x021E667C - .byte 0x20, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 - -.public ov62_021E6694 -ov62_021E6694: ; 0x021E6694 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - -.public ov62_021E66B0 -ov62_021E66B0: ; 0x021E66B0 - .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 - -.public sMicTestGraphicsBanks -sMicTestGraphicsBanks: ; 0x021E66D0 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -.public ov62_021E66F8 -ov62_021E66F8: ; 0x021E66F8 - .byte 0x00, 0x01, 0x01, 0x09, 0x03, 0x00, 0x01, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0F, 0x00, 0x04, 0x05, 0x08, 0x16, 0x05, 0x00, 0x01, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0F, 0x00, 0x04, 0x18, 0x15, 0x06, 0x02, 0x00, 0x6F, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x0E, 0x00 - -.public ov62_021E6728 -ov62_021E6728: ; 0x021E6728 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x00, 0x01, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1D, 0x02, 0x00, 0x02, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1E, 0x01, 0x00, 0x01, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - -.public ov62_021E67C8 -ov62_021E67C8: ; 0x021E67C8 - .byte 0x40, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x00, 0x00 - .byte 0x03, 0x0A, 0x00, 0x00, 0x02, 0x0A, 0x00, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x60, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x01, 0x0A, 0x00, 0x00, 0x03, 0x0A, 0x00, 0x00, 0x02, 0x0A, 0x00, 0x00, 0x04, 0x0A, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x80, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x0B, 0x00, 0x00, 0x03, 0x0B, 0x00, 0x00, 0x02, 0x0B, 0x00, 0x00 - .byte 0x04, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0xD8, 0x00, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x0D, 0x00, 0x00, 0x03, 0x0D, 0x00, 0x00 - .byte 0x02, 0x0D, 0x00, 0x00, 0x04, 0x0D, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x0C, 0x00, 0x00 - .byte 0x03, 0x0C, 0x00, 0x00, 0x02, 0x0C, 0x00, 0x00, 0x04, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .public gApplication_MicTest -gApplication_MicTest: - .word MicTest_Init, MicTest_Main, MicTest_Exit, 0xFFFFFFFF - - .bss - -.public _021E68E0 -_021E68E0: - .space 0x20 diff --git a/include/constants/items.h b/include/constants/items.h index d2fa30797d..b6237ef68b 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -389,7 +389,7 @@ #define FIRST_MULCH_IDX ITEM_GROWTH_MULCH #define LAST_MULCH_IDX ITEM_GOOEY_MULCH #define NUM_MULCHES (LAST_MULCH_IDX - FIRST_MULCH_IDX + 1) -#define MULCH_IDX(mulch) ((mulch) - FIRST_MULCH_IDX + 1) +#define MULCH_IDX(mulch) ((mulch)-FIRST_MULCH_IDX + 1) #define MULCH_NONE 0 // Unused @@ -506,7 +506,7 @@ #define FIRST_BERRY_IDX ITEM_CHERI_BERRY #define LAST_BERRY_IDX ITEM_ROWAP_BERRY #define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) -#define BERRY_IDX(berry) ((berry) - FIRST_BERRY_IDX + 1) +#define BERRY_IDX(berry) ((berry)-FIRST_BERRY_IDX + 1) #define BERRY_NONE 0 // Battle Held items diff --git a/include/constants/std_script.h b/include/constants/std_script.h index c94521a925..d171a336a4 100644 --- a/include/constants/std_script.h +++ b/include/constants/std_script.h @@ -79,11 +79,11 @@ #define std_apricorn_tree 2800 #define _std_npc_trainer 3000 -#define std_trainer(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer) +#define std_trainer(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer) #define std_trainer_approach std_trainer(LAST_TRAINER_INDEX) #define _std_npc_trainer_2 5000 -#define std_trainer_2(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer_2) +#define std_trainer_2(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer_2) #define _std_item_ball 7000 #define std_itemball_r29_potion 7000 diff --git a/include/credits/data.h b/include/credits/data.h index c58c51cf2f..87cdd7310a 100644 --- a/include/credits/data.h +++ b/include/credits/data.h @@ -72,11 +72,11 @@ static const int sSceneTransitionTimings[5] = { 890, 1780, 2615, 3030, 4295 }; static const int sScreenFlipTimings[5] = { 890, 1780, 2615, 3030, 4295 }; static const ScrnFileIds ov76_021E6F00 = { - { 0x08, 0x12, 0x0A, 0x10, 0x0E, 0x0C }, + {0x08, 0x12, 0x0A, 0x10, 0x0E, 0x0C}, }; static const ScrnFileIds ov76_021E6EE8 = { - { 0x07, 0x11, 0x09, 0x0F, 0x0D, 0x0B }, + {0x07, 0x11, 0x09, 0x0F, 0x0D, 0x0B}, }; static const BgTemplate ov76_021E6F50 = { @@ -189,348 +189,348 @@ static const GraphicsBanks sCreditsGraphicsBanks = { }; static const PageTiming sPageTimings[NUM_CREDIT_PAGES] = { - { 0, 105 }, - { 110, 105 }, - { 220, 105 }, - { 330, 105 }, - { 440, 105 }, - { 550, 105 }, - { 660, 115 }, - { 779, 109 }, - { 894, 115 }, - { 1012, 109 }, - { 1125, 102 }, - { 1232, 102 }, - { 1339, 110 }, - { 1454, 105 }, - { 1565, 105 }, - { 1676, 100 }, - { 1787, 105 }, - { 1898, 105 }, - { 2009, 105 }, - { 2120, 120 }, - { 2245, 120 }, - { 2370, 120 }, - { 2495, 110 }, - { 2620, 125 }, - { 2750, 110 }, - { 2865, 160 }, - { 3035, 100 }, - { 3140, 100 }, - { 3245, 125 }, - { 3375, 100 }, - { 3480, 115 }, - { 3598, 115 }, - { 3716, 115 }, - { 3834, 115 }, - { 3952, 115 }, - { 4070, 115 }, - { 4188, 105 }, - { 4300, 110 }, - { 4415, 110 }, - { 4530, 127 }, - { 4660, 107 }, - { 4770, 107 }, - { 4880, 107 }, + {0, 105}, + { 110, 105}, + { 220, 105}, + { 330, 105}, + { 440, 105}, + { 550, 105}, + { 660, 115}, + { 779, 109}, + { 894, 115}, + { 1012, 109}, + { 1125, 102}, + { 1232, 102}, + { 1339, 110}, + { 1454, 105}, + { 1565, 105}, + { 1676, 100}, + { 1787, 105}, + { 1898, 105}, + { 2009, 105}, + { 2120, 120}, + { 2245, 120}, + { 2370, 120}, + { 2495, 110}, + { 2620, 125}, + { 2750, 110}, + { 2865, 160}, + { 3035, 100}, + { 3140, 100}, + { 3245, 125}, + { 3375, 100}, + { 3480, 115}, + { 3598, 115}, + { 3716, 115}, + { 3834, 115}, + { 3952, 115}, + { 4070, 115}, + { 4188, 105}, + { 4300, 110}, + { 4415, 110}, + { 4530, 127}, + { 4660, 107}, + { 4770, 107}, + { 4880, 107}, }; static const GfGfxFileIds sCutsceneSpriteGfxFileIds[42] = { - { 0x96, 0x17, 0x18, 0x19 }, - { 0x97, 0x1A, 0x1B, 0x1C }, - { 0x98, 0x1D, 0x1E, 0x1F }, - { 0x99, 0x20, 0x21, 0x22 }, - { 0x9A, 0x23, 0x24, 0x25 }, - { 0x9B, 0x26, 0x27, 0x28 }, - { 0x9C, 0x29, 0x2A, 0x2B }, - { 0x9D, 0x2C, 0x2D, 0x2E }, - { 0x9E, 0x2F, 0x30, 0x31 }, - { 0x9F, 0x32, 0x33, 0x34 }, - { 0xA0, 0x35, 0x36, 0x37 }, - { 0xA1, 0x38, 0x39, 0x3A }, - { 0xA2, 0x3B, 0x3C, 0x3D }, - { 0xA3, 0x3E, 0x3F, 0x40 }, - { 0xA4, 0x41, 0x42, 0x43 }, - { 0xA5, 0x44, 0x45, 0x46 }, - { 0xA6, 0x47, 0x48, 0x49 }, - { 0xA7, 0x4A, 0x4B, 0x4C }, - { 0xA8, 0x4D, 0x4E, 0x4F }, - { 0xA9, 0x50, 0x51, 0x52 }, - { 0xAA, 0x53, 0x54, 0x55 }, - { 0xAB, 0x56, 0x57, 0x58 }, - { 0xAC, 0x59, 0x5A, 0x5B }, - { 0xAD, 0x5C, 0x5D, 0x5E }, - { 0xAE, 0x5F, 0x60, 0x61 }, - { 0xAF, 0x62, 0x63, 0x64 }, - { 0xB0, 0x65, 0x66, 0x67 }, - { 0xB1, 0x68, 0x69, 0x6A }, - { 0xB2, 0x6B, 0x6C, 0x6D }, - { 0xB3, 0x6E, 0x6F, 0x70 }, - { 0xB4, 0x71, 0x72, 0x73 }, - { 0xB5, 0x74, 0x75, 0x76 }, - { 0xB6, 0x77, 0x78, 0x79 }, - { 0xB7, 0x7A, 0x7B, 0x7C }, - { 0xB8, 0x7D, 0x7E, 0x7F }, - { 0xB9, 0x80, 0x81, 0x82 }, - { 0xBA, 0x83, 0x84, 0x85 }, - { 0xBB, 0x86, 0x87, 0x88 }, - { 0xBC, 0x89, 0x8A, 0x8B }, - { 0xBD, 0x8C, 0x8D, 0x8E }, - { 0xBE, 0x8F, 0x90, 0x91 }, - { 0xBF, 0x92, 0x93, 0x94 }, + {0x96, 0x17, 0x18, 0x19}, + { 0x97, 0x1A, 0x1B, 0x1C}, + { 0x98, 0x1D, 0x1E, 0x1F}, + { 0x99, 0x20, 0x21, 0x22}, + { 0x9A, 0x23, 0x24, 0x25}, + { 0x9B, 0x26, 0x27, 0x28}, + { 0x9C, 0x29, 0x2A, 0x2B}, + { 0x9D, 0x2C, 0x2D, 0x2E}, + { 0x9E, 0x2F, 0x30, 0x31}, + { 0x9F, 0x32, 0x33, 0x34}, + { 0xA0, 0x35, 0x36, 0x37}, + { 0xA1, 0x38, 0x39, 0x3A}, + { 0xA2, 0x3B, 0x3C, 0x3D}, + { 0xA3, 0x3E, 0x3F, 0x40}, + { 0xA4, 0x41, 0x42, 0x43}, + { 0xA5, 0x44, 0x45, 0x46}, + { 0xA6, 0x47, 0x48, 0x49}, + { 0xA7, 0x4A, 0x4B, 0x4C}, + { 0xA8, 0x4D, 0x4E, 0x4F}, + { 0xA9, 0x50, 0x51, 0x52}, + { 0xAA, 0x53, 0x54, 0x55}, + { 0xAB, 0x56, 0x57, 0x58}, + { 0xAC, 0x59, 0x5A, 0x5B}, + { 0xAD, 0x5C, 0x5D, 0x5E}, + { 0xAE, 0x5F, 0x60, 0x61}, + { 0xAF, 0x62, 0x63, 0x64}, + { 0xB0, 0x65, 0x66, 0x67}, + { 0xB1, 0x68, 0x69, 0x6A}, + { 0xB2, 0x6B, 0x6C, 0x6D}, + { 0xB3, 0x6E, 0x6F, 0x70}, + { 0xB4, 0x71, 0x72, 0x73}, + { 0xB5, 0x74, 0x75, 0x76}, + { 0xB6, 0x77, 0x78, 0x79}, + { 0xB7, 0x7A, 0x7B, 0x7C}, + { 0xB8, 0x7D, 0x7E, 0x7F}, + { 0xB9, 0x80, 0x81, 0x82}, + { 0xBA, 0x83, 0x84, 0x85}, + { 0xBB, 0x86, 0x87, 0x88}, + { 0xBC, 0x89, 0x8A, 0x8B}, + { 0xBD, 0x8C, 0x8D, 0x8E}, + { 0xBE, 0x8F, 0x90, 0x91}, + { 0xBF, 0x92, 0x93, 0x94}, }; static const CreditMsgLine sCreditMsgLines[251] = { - { 0x0000, 0x00, 0x46, 0x00 }, - { 0x0001, 0x14, 0x50, 0x03 }, - { 0x0001, 0x28, 0x60, 0x04 }, - { 0x0002, 0x14, 0x14, 0x05 }, - { 0x0002, 0x28, 0x24, 0x06 }, - { 0x0002, 0x14, 0x3C, 0x07 }, - { 0x0002, 0x28, 0x4C, 0x08 }, - { 0x0002, 0x14, 0x64, 0x09 }, - { 0x0002, 0x28, 0x74, 0x0A }, - { 0x0002, 0x14, 0x8C, 0x0B }, - { 0x0002, 0x28, 0x9C, 0x0C }, - { 0x0003, 0x14, 0x28, 0x0D }, - { 0x0003, 0x28, 0x38, 0x0E }, - { 0x0003, 0x28, 0x48, 0x0F }, - { 0x0003, 0x28, 0x58, 0x10 }, - { 0x0003, 0x28, 0x68, 0x11 }, - { 0x0003, 0x28, 0x78, 0x12 }, - { 0x0003, 0x28, 0x88, 0x13 }, - { 0x0004, 0x14, 0x20, 0x14 }, - { 0x0004, 0x14, 0x30, 0x15 }, - { 0x0004, 0x14, 0x40, 0x16 }, - { 0x0004, 0x28, 0x50, 0x17 }, - { 0x0004, 0x28, 0x60, 0x18 }, - { 0x0004, 0x28, 0x70, 0x19 }, - { 0x0004, 0x28, 0x80, 0x1A }, - { 0x0004, 0x28, 0x90, 0x1B }, - { 0x0005, 0x28, 0x20, 0x1C }, - { 0x0005, 0x28, 0x30, 0x1D }, - { 0x0005, 0x28, 0x40, 0x1E }, - { 0x0005, 0x28, 0x50, 0x1F }, - { 0x0005, 0x28, 0x60, 0x20 }, - { 0x0005, 0x28, 0x70, 0x21 }, - { 0x0005, 0x28, 0x80, 0x22 }, - { 0x0005, 0x28, 0x90, 0x23 }, - { 0x0006, 0x14, 0x18, 0x24 }, - { 0x0006, 0x28, 0x28, 0x25 }, - { 0x0006, 0x28, 0x38, 0x26 }, - { 0x0006, 0x28, 0x48, 0x27 }, - { 0x0006, 0x28, 0x58, 0x28 }, - { 0x0006, 0x28, 0x68, 0x29 }, - { 0x0006, 0x28, 0x78, 0x2A }, - { 0x0006, 0x28, 0x88, 0x2B }, - { 0x0006, 0x28, 0x98, 0x2C }, - { 0x0007, 0x14, 0x08, 0x2D }, - { 0x0007, 0x28, 0x18, 0x2E }, - { 0x0007, 0x28, 0x28, 0x2F }, - { 0x0007, 0x28, 0x38, 0x30 }, - { 0x0007, 0x28, 0x48, 0x31 }, - { 0x0007, 0x14, 0x60, 0x32 }, - { 0x0007, 0x28, 0x70, 0x33 }, - { 0x0007, 0x28, 0x80, 0x34 }, - { 0x0007, 0x14, 0x98, 0x35 }, - { 0x0007, 0x28, 0xA8, 0x36 }, - { 0x0008, 0x14, 0x30, 0x37 }, - { 0x0008, 0x28, 0x40, 0x38 }, - { 0x0008, 0x28, 0x50, 0x39 }, - { 0x0008, 0x28, 0x60, 0x3A }, - { 0x0008, 0x28, 0x70, 0x3B }, - { 0x0008, 0x28, 0x80, 0x3C }, - { 0x0009, 0x28, 0x28, 0x3D }, - { 0x0009, 0x28, 0x38, 0x3E }, - { 0x0009, 0x28, 0x48, 0x3F }, - { 0x0009, 0x28, 0x58, 0x40 }, - { 0x0009, 0x28, 0x68, 0x41 }, - { 0x0009, 0x28, 0x78, 0x42 }, - { 0x0009, 0x28, 0x88, 0x43 }, - { 0x000A, 0x14, 0x40, 0x44 }, - { 0x000A, 0x28, 0x50, 0x45 }, - { 0x000A, 0x28, 0x60, 0x46 }, - { 0x000A, 0x28, 0x70, 0x47 }, - { 0x000B, 0x14, 0x40, 0x48 }, - { 0x000B, 0x28, 0x50, 0x49 }, - { 0x000B, 0x28, 0x60, 0x4A }, - { 0x000B, 0x28, 0x70, 0x4B }, - { 0x000C, 0x14, 0x48, 0x4C }, - { 0x000C, 0x28, 0x58, 0x4D }, - { 0x000C, 0x28, 0x68, 0x4E }, - { 0x000D, 0x14, 0x30, 0x4F }, - { 0x000D, 0x28, 0x40, 0x50 }, - { 0x000D, 0x28, 0x50, 0x51 }, - { 0x000D, 0x28, 0x60, 0x52 }, - { 0x000D, 0x28, 0x70, 0x53 }, - { 0x000D, 0x28, 0x80, 0x54 }, - { 0x000E, 0x14, 0x38, 0x55 }, - { 0x000E, 0x28, 0x48, 0x56 }, - { 0x000E, 0x28, 0x58, 0x57 }, - { 0x000E, 0x28, 0x68, 0x58 }, - { 0x000E, 0x28, 0x78, 0x59 }, - { 0x000F, 0x14, 0x28, 0x5A }, - { 0x000F, 0x28, 0x38, 0x5B }, - { 0x000F, 0x28, 0x48, 0x5C }, - { 0x000F, 0x28, 0x58, 0x5D }, - { 0x000F, 0x28, 0x68, 0x5E }, - { 0x000F, 0x28, 0x78, 0x5F }, - { 0x000F, 0x28, 0x88, 0x60 }, - { 0x0010, 0x28, 0x28, 0x61 }, - { 0x0010, 0x28, 0x38, 0x62 }, - { 0x0010, 0x28, 0x48, 0x63 }, - { 0x0010, 0x28, 0x58, 0x64 }, - { 0x0010, 0x28, 0x68, 0x65 }, - { 0x0010, 0x28, 0x78, 0x66 }, - { 0x0010, 0x28, 0x88, 0x67 }, - { 0x0011, 0x28, 0x28, 0x68 }, - { 0x0011, 0x28, 0x38, 0x69 }, - { 0x0011, 0x28, 0x48, 0x6A }, - { 0x0011, 0x28, 0x58, 0x6B }, - { 0x0011, 0x28, 0x68, 0x6C }, - { 0x0011, 0x28, 0x78, 0x6D }, - { 0x0011, 0x28, 0x88, 0x6E }, - { 0x0012, 0x14, 0x50, 0x6F }, - { 0x0012, 0x28, 0x60, 0x70 }, - { 0x0013, 0x14, 0x48, 0x71 }, - { 0x0013, 0x28, 0x58, 0x72 }, - { 0x0013, 0x28, 0x68, 0x73 }, - { 0x0014, 0x14, 0x24, 0x74 }, - { 0x0014, 0x28, 0x34, 0x75 }, - { 0x0014, 0x28, 0x44, 0x76 }, - { 0x0014, 0x14, 0x5C, 0x77 }, - { 0x0014, 0x28, 0x6C, 0x78 }, - { 0x0014, 0x28, 0x7C, 0x79 }, - { 0x0014, 0x28, 0x8C, 0x7A }, - { 0x0015, 0x14, 0x40, 0x7B }, - { 0x0015, 0x28, 0x50, 0x7C }, - { 0x0015, 0x28, 0x60, 0x7D }, - { 0x0015, 0x28, 0x70, 0x7E }, - { 0x0016, 0x14, 0x40, 0x7F }, - { 0x0016, 0x28, 0x50, 0x80 }, - { 0x0016, 0x28, 0x60, 0x81 }, - { 0x0016, 0x28, 0x70, 0x82 }, - { 0x0017, 0x14, 0x30, 0x83 }, - { 0x0017, 0x28, 0x40, 0x84 }, - { 0x0017, 0x28, 0x50, 0x85 }, - { 0x0017, 0x28, 0x60, 0x86 }, - { 0x0017, 0x28, 0x70, 0x87 }, - { 0x0017, 0x28, 0x80, 0x88 }, - { 0x0018, 0x28, 0x30, 0x89 }, - { 0x0018, 0x28, 0x40, 0x8A }, - { 0x0018, 0x28, 0x50, 0x8B }, - { 0x0018, 0x28, 0x60, 0x8C }, - { 0x0018, 0x28, 0x70, 0x8D }, - { 0x0018, 0x28, 0x80, 0x8E }, - { 0x0019, 0x14, 0x40, 0x8F }, - { 0x0019, 0x28, 0x50, 0x90 }, - { 0x0019, 0x28, 0x60, 0x91 }, - { 0x0019, 0x28, 0x70, 0x92 }, - { 0x001A, 0x14, 0x10, 0x93 }, - { 0x001A, 0x28, 0x20, 0x94 }, - { 0x001A, 0x28, 0x30, 0x95 }, - { 0x001A, 0x28, 0x40, 0x96 }, - { 0x001A, 0x28, 0x50, 0x97 }, - { 0x001A, 0x28, 0x60, 0x98 }, - { 0x001A, 0x28, 0x70, 0x99 }, - { 0x001A, 0x28, 0x80, 0x9A }, - { 0x001A, 0x28, 0x90, 0x9B }, - { 0x001A, 0x28, 0xA0, 0x9C }, - { 0x001B, 0x14, 0x3C, 0x9D }, - { 0x001B, 0x14, 0x54, 0x9E }, - { 0x001B, 0x28, 0x64, 0x9F }, - { 0x001B, 0x28, 0x74, 0xA0 }, - { 0x001C, 0x14, 0x50, 0xA1 }, - { 0x001C, 0x28, 0x60, 0xA2 }, - { 0x001D, 0x14, 0x18, 0xA3 }, - { 0x001D, 0x28, 0x28, 0xA4 }, - { 0x001D, 0x28, 0x38, 0xA5 }, - { 0x001D, 0x28, 0x48, 0xA6 }, - { 0x001D, 0x28, 0x58, 0xA7 }, - { 0x001D, 0x28, 0x68, 0xA8 }, - { 0x001D, 0x28, 0x78, 0xA9 }, - { 0x001D, 0x28, 0x88, 0xAA }, - { 0x001D, 0x28, 0x98, 0xAB }, - { 0x001E, 0x14, 0x14, 0xAC }, - { 0x001E, 0x28, 0x24, 0xAD }, - { 0x001E, 0x14, 0x3C, 0xAE }, - { 0x001E, 0x28, 0x4C, 0xAF }, - { 0x001E, 0x14, 0x64, 0xB0 }, - { 0x001E, 0x28, 0x74, 0xB1 }, - { 0x001E, 0x14, 0x8C, 0xB2 }, - { 0x001E, 0x28, 0x9C, 0xB3 }, - { 0x001F, 0x14, 0x0C, 0xB4 }, - { 0x001F, 0x28, 0x1C, 0xB5 }, - { 0x001F, 0x28, 0x2C, 0xB6 }, - { 0x001F, 0x28, 0x3C, 0xB7 }, - { 0x001F, 0x28, 0x4C, 0xB8 }, - { 0x001F, 0x28, 0x5C, 0xB9 }, - { 0x001F, 0x28, 0x6C, 0xBA }, - { 0x001F, 0x28, 0x7C, 0xBB }, - { 0x001F, 0x14, 0x94, 0xBC }, - { 0x001F, 0x28, 0xA4, 0xBD }, - { 0x0020, 0x14, 0x10, 0xBE }, - { 0x0020, 0x28, 0x20, 0xBF }, - { 0x0020, 0x28, 0x30, 0xC0 }, - { 0x0020, 0x28, 0x40, 0xC1 }, - { 0x0020, 0x28, 0x50, 0xC2 }, - { 0x0020, 0x28, 0x60, 0xC3 }, - { 0x0020, 0x28, 0x70, 0xC4 }, - { 0x0020, 0x28, 0x80, 0xC5 }, - { 0x0020, 0x28, 0x90, 0xC6 }, - { 0x0020, 0x28, 0xA0, 0xC7 }, - { 0x0021, 0x28, 0x10, 0xC8 }, - { 0x0021, 0x28, 0x20, 0xC9 }, - { 0x0021, 0x28, 0x30, 0xCA }, - { 0x0021, 0x28, 0x40, 0xCB }, - { 0x0021, 0x28, 0x50, 0xCC }, - { 0x0021, 0x28, 0x60, 0xCD }, - { 0x0021, 0x28, 0x70, 0xCE }, - { 0x0021, 0x28, 0x80, 0xCF }, - { 0x0021, 0x28, 0x90, 0xD0 }, - { 0x0021, 0x28, 0xA0, 0xD1 }, - { 0x0022, 0x28, 0x10, 0xD2 }, - { 0x0022, 0x28, 0x20, 0xD3 }, - { 0x0022, 0x28, 0x30, 0xD4 }, - { 0x0022, 0x28, 0x40, 0xD5 }, - { 0x0022, 0x28, 0x50, 0xD6 }, - { 0x0022, 0x28, 0x60, 0xD7 }, - { 0x0022, 0x28, 0x70, 0xD8 }, - { 0x0022, 0x28, 0x80, 0xD9 }, - { 0x0022, 0x28, 0x90, 0xDA }, - { 0x0022, 0x28, 0xA0, 0xDB }, - { 0x0023, 0x28, 0x28, 0xDC }, - { 0x0023, 0x28, 0x38, 0xDD }, - { 0x0023, 0x28, 0x48, 0xDE }, - { 0x0023, 0x28, 0x58, 0xDF }, - { 0x0023, 0x28, 0x68, 0xE0 }, - { 0x0023, 0x28, 0x78, 0xE1 }, - { 0x0023, 0x28, 0x88, 0xE2 }, - { 0x0024, 0x14, 0x38, 0xE3 }, - { 0x0024, 0x28, 0x48, 0xE4 }, - { 0x0024, 0x28, 0x58, 0xE5 }, - { 0x0024, 0x28, 0x68, 0xE6 }, - { 0x0024, 0x28, 0x78, 0xE7 }, - { 0x0025, 0x14, 0x38, 0xE8 }, - { 0x0025, 0x28, 0x48, 0xE9 }, - { 0x0025, 0x28, 0x58, 0xEA }, - { 0x0025, 0x28, 0x68, 0xEB }, - { 0x0025, 0x28, 0x78, 0xEC }, - { 0x0026, 0x14, 0x38, 0xED }, - { 0x0026, 0x28, 0x48, 0xEE }, - { 0x0026, 0x28, 0x58, 0xEF }, - { 0x0026, 0x28, 0x68, 0xF0 }, - { 0x0026, 0x28, 0x78, 0xF1 }, - { 0x0027, 0x14, 0x38, 0xF2 }, - { 0x0027, 0x28, 0x48, 0xF3 }, - { 0x0027, 0x28, 0x58, 0xF4 }, - { 0x0027, 0x28, 0x68, 0xF5 }, - { 0x0027, 0x28, 0x78, 0xF6 }, - { 0x0028, 0x14, 0x50, 0xF7 }, - { 0x0028, 0x28, 0x60, 0xF8 }, - { 0x0029, 0x14, 0x50, 0xF9 }, - { 0x0029, 0x28, 0x60, 0xFA }, - { 0x002A, 0x14, 0x50, 0xFB }, - { 0x002A, 0x28, 0x60, 0xFC }, + {0x0000, 0x00, 0x46, 0x00}, + { 0x0001, 0x14, 0x50, 0x03}, + { 0x0001, 0x28, 0x60, 0x04}, + { 0x0002, 0x14, 0x14, 0x05}, + { 0x0002, 0x28, 0x24, 0x06}, + { 0x0002, 0x14, 0x3C, 0x07}, + { 0x0002, 0x28, 0x4C, 0x08}, + { 0x0002, 0x14, 0x64, 0x09}, + { 0x0002, 0x28, 0x74, 0x0A}, + { 0x0002, 0x14, 0x8C, 0x0B}, + { 0x0002, 0x28, 0x9C, 0x0C}, + { 0x0003, 0x14, 0x28, 0x0D}, + { 0x0003, 0x28, 0x38, 0x0E}, + { 0x0003, 0x28, 0x48, 0x0F}, + { 0x0003, 0x28, 0x58, 0x10}, + { 0x0003, 0x28, 0x68, 0x11}, + { 0x0003, 0x28, 0x78, 0x12}, + { 0x0003, 0x28, 0x88, 0x13}, + { 0x0004, 0x14, 0x20, 0x14}, + { 0x0004, 0x14, 0x30, 0x15}, + { 0x0004, 0x14, 0x40, 0x16}, + { 0x0004, 0x28, 0x50, 0x17}, + { 0x0004, 0x28, 0x60, 0x18}, + { 0x0004, 0x28, 0x70, 0x19}, + { 0x0004, 0x28, 0x80, 0x1A}, + { 0x0004, 0x28, 0x90, 0x1B}, + { 0x0005, 0x28, 0x20, 0x1C}, + { 0x0005, 0x28, 0x30, 0x1D}, + { 0x0005, 0x28, 0x40, 0x1E}, + { 0x0005, 0x28, 0x50, 0x1F}, + { 0x0005, 0x28, 0x60, 0x20}, + { 0x0005, 0x28, 0x70, 0x21}, + { 0x0005, 0x28, 0x80, 0x22}, + { 0x0005, 0x28, 0x90, 0x23}, + { 0x0006, 0x14, 0x18, 0x24}, + { 0x0006, 0x28, 0x28, 0x25}, + { 0x0006, 0x28, 0x38, 0x26}, + { 0x0006, 0x28, 0x48, 0x27}, + { 0x0006, 0x28, 0x58, 0x28}, + { 0x0006, 0x28, 0x68, 0x29}, + { 0x0006, 0x28, 0x78, 0x2A}, + { 0x0006, 0x28, 0x88, 0x2B}, + { 0x0006, 0x28, 0x98, 0x2C}, + { 0x0007, 0x14, 0x08, 0x2D}, + { 0x0007, 0x28, 0x18, 0x2E}, + { 0x0007, 0x28, 0x28, 0x2F}, + { 0x0007, 0x28, 0x38, 0x30}, + { 0x0007, 0x28, 0x48, 0x31}, + { 0x0007, 0x14, 0x60, 0x32}, + { 0x0007, 0x28, 0x70, 0x33}, + { 0x0007, 0x28, 0x80, 0x34}, + { 0x0007, 0x14, 0x98, 0x35}, + { 0x0007, 0x28, 0xA8, 0x36}, + { 0x0008, 0x14, 0x30, 0x37}, + { 0x0008, 0x28, 0x40, 0x38}, + { 0x0008, 0x28, 0x50, 0x39}, + { 0x0008, 0x28, 0x60, 0x3A}, + { 0x0008, 0x28, 0x70, 0x3B}, + { 0x0008, 0x28, 0x80, 0x3C}, + { 0x0009, 0x28, 0x28, 0x3D}, + { 0x0009, 0x28, 0x38, 0x3E}, + { 0x0009, 0x28, 0x48, 0x3F}, + { 0x0009, 0x28, 0x58, 0x40}, + { 0x0009, 0x28, 0x68, 0x41}, + { 0x0009, 0x28, 0x78, 0x42}, + { 0x0009, 0x28, 0x88, 0x43}, + { 0x000A, 0x14, 0x40, 0x44}, + { 0x000A, 0x28, 0x50, 0x45}, + { 0x000A, 0x28, 0x60, 0x46}, + { 0x000A, 0x28, 0x70, 0x47}, + { 0x000B, 0x14, 0x40, 0x48}, + { 0x000B, 0x28, 0x50, 0x49}, + { 0x000B, 0x28, 0x60, 0x4A}, + { 0x000B, 0x28, 0x70, 0x4B}, + { 0x000C, 0x14, 0x48, 0x4C}, + { 0x000C, 0x28, 0x58, 0x4D}, + { 0x000C, 0x28, 0x68, 0x4E}, + { 0x000D, 0x14, 0x30, 0x4F}, + { 0x000D, 0x28, 0x40, 0x50}, + { 0x000D, 0x28, 0x50, 0x51}, + { 0x000D, 0x28, 0x60, 0x52}, + { 0x000D, 0x28, 0x70, 0x53}, + { 0x000D, 0x28, 0x80, 0x54}, + { 0x000E, 0x14, 0x38, 0x55}, + { 0x000E, 0x28, 0x48, 0x56}, + { 0x000E, 0x28, 0x58, 0x57}, + { 0x000E, 0x28, 0x68, 0x58}, + { 0x000E, 0x28, 0x78, 0x59}, + { 0x000F, 0x14, 0x28, 0x5A}, + { 0x000F, 0x28, 0x38, 0x5B}, + { 0x000F, 0x28, 0x48, 0x5C}, + { 0x000F, 0x28, 0x58, 0x5D}, + { 0x000F, 0x28, 0x68, 0x5E}, + { 0x000F, 0x28, 0x78, 0x5F}, + { 0x000F, 0x28, 0x88, 0x60}, + { 0x0010, 0x28, 0x28, 0x61}, + { 0x0010, 0x28, 0x38, 0x62}, + { 0x0010, 0x28, 0x48, 0x63}, + { 0x0010, 0x28, 0x58, 0x64}, + { 0x0010, 0x28, 0x68, 0x65}, + { 0x0010, 0x28, 0x78, 0x66}, + { 0x0010, 0x28, 0x88, 0x67}, + { 0x0011, 0x28, 0x28, 0x68}, + { 0x0011, 0x28, 0x38, 0x69}, + { 0x0011, 0x28, 0x48, 0x6A}, + { 0x0011, 0x28, 0x58, 0x6B}, + { 0x0011, 0x28, 0x68, 0x6C}, + { 0x0011, 0x28, 0x78, 0x6D}, + { 0x0011, 0x28, 0x88, 0x6E}, + { 0x0012, 0x14, 0x50, 0x6F}, + { 0x0012, 0x28, 0x60, 0x70}, + { 0x0013, 0x14, 0x48, 0x71}, + { 0x0013, 0x28, 0x58, 0x72}, + { 0x0013, 0x28, 0x68, 0x73}, + { 0x0014, 0x14, 0x24, 0x74}, + { 0x0014, 0x28, 0x34, 0x75}, + { 0x0014, 0x28, 0x44, 0x76}, + { 0x0014, 0x14, 0x5C, 0x77}, + { 0x0014, 0x28, 0x6C, 0x78}, + { 0x0014, 0x28, 0x7C, 0x79}, + { 0x0014, 0x28, 0x8C, 0x7A}, + { 0x0015, 0x14, 0x40, 0x7B}, + { 0x0015, 0x28, 0x50, 0x7C}, + { 0x0015, 0x28, 0x60, 0x7D}, + { 0x0015, 0x28, 0x70, 0x7E}, + { 0x0016, 0x14, 0x40, 0x7F}, + { 0x0016, 0x28, 0x50, 0x80}, + { 0x0016, 0x28, 0x60, 0x81}, + { 0x0016, 0x28, 0x70, 0x82}, + { 0x0017, 0x14, 0x30, 0x83}, + { 0x0017, 0x28, 0x40, 0x84}, + { 0x0017, 0x28, 0x50, 0x85}, + { 0x0017, 0x28, 0x60, 0x86}, + { 0x0017, 0x28, 0x70, 0x87}, + { 0x0017, 0x28, 0x80, 0x88}, + { 0x0018, 0x28, 0x30, 0x89}, + { 0x0018, 0x28, 0x40, 0x8A}, + { 0x0018, 0x28, 0x50, 0x8B}, + { 0x0018, 0x28, 0x60, 0x8C}, + { 0x0018, 0x28, 0x70, 0x8D}, + { 0x0018, 0x28, 0x80, 0x8E}, + { 0x0019, 0x14, 0x40, 0x8F}, + { 0x0019, 0x28, 0x50, 0x90}, + { 0x0019, 0x28, 0x60, 0x91}, + { 0x0019, 0x28, 0x70, 0x92}, + { 0x001A, 0x14, 0x10, 0x93}, + { 0x001A, 0x28, 0x20, 0x94}, + { 0x001A, 0x28, 0x30, 0x95}, + { 0x001A, 0x28, 0x40, 0x96}, + { 0x001A, 0x28, 0x50, 0x97}, + { 0x001A, 0x28, 0x60, 0x98}, + { 0x001A, 0x28, 0x70, 0x99}, + { 0x001A, 0x28, 0x80, 0x9A}, + { 0x001A, 0x28, 0x90, 0x9B}, + { 0x001A, 0x28, 0xA0, 0x9C}, + { 0x001B, 0x14, 0x3C, 0x9D}, + { 0x001B, 0x14, 0x54, 0x9E}, + { 0x001B, 0x28, 0x64, 0x9F}, + { 0x001B, 0x28, 0x74, 0xA0}, + { 0x001C, 0x14, 0x50, 0xA1}, + { 0x001C, 0x28, 0x60, 0xA2}, + { 0x001D, 0x14, 0x18, 0xA3}, + { 0x001D, 0x28, 0x28, 0xA4}, + { 0x001D, 0x28, 0x38, 0xA5}, + { 0x001D, 0x28, 0x48, 0xA6}, + { 0x001D, 0x28, 0x58, 0xA7}, + { 0x001D, 0x28, 0x68, 0xA8}, + { 0x001D, 0x28, 0x78, 0xA9}, + { 0x001D, 0x28, 0x88, 0xAA}, + { 0x001D, 0x28, 0x98, 0xAB}, + { 0x001E, 0x14, 0x14, 0xAC}, + { 0x001E, 0x28, 0x24, 0xAD}, + { 0x001E, 0x14, 0x3C, 0xAE}, + { 0x001E, 0x28, 0x4C, 0xAF}, + { 0x001E, 0x14, 0x64, 0xB0}, + { 0x001E, 0x28, 0x74, 0xB1}, + { 0x001E, 0x14, 0x8C, 0xB2}, + { 0x001E, 0x28, 0x9C, 0xB3}, + { 0x001F, 0x14, 0x0C, 0xB4}, + { 0x001F, 0x28, 0x1C, 0xB5}, + { 0x001F, 0x28, 0x2C, 0xB6}, + { 0x001F, 0x28, 0x3C, 0xB7}, + { 0x001F, 0x28, 0x4C, 0xB8}, + { 0x001F, 0x28, 0x5C, 0xB9}, + { 0x001F, 0x28, 0x6C, 0xBA}, + { 0x001F, 0x28, 0x7C, 0xBB}, + { 0x001F, 0x14, 0x94, 0xBC}, + { 0x001F, 0x28, 0xA4, 0xBD}, + { 0x0020, 0x14, 0x10, 0xBE}, + { 0x0020, 0x28, 0x20, 0xBF}, + { 0x0020, 0x28, 0x30, 0xC0}, + { 0x0020, 0x28, 0x40, 0xC1}, + { 0x0020, 0x28, 0x50, 0xC2}, + { 0x0020, 0x28, 0x60, 0xC3}, + { 0x0020, 0x28, 0x70, 0xC4}, + { 0x0020, 0x28, 0x80, 0xC5}, + { 0x0020, 0x28, 0x90, 0xC6}, + { 0x0020, 0x28, 0xA0, 0xC7}, + { 0x0021, 0x28, 0x10, 0xC8}, + { 0x0021, 0x28, 0x20, 0xC9}, + { 0x0021, 0x28, 0x30, 0xCA}, + { 0x0021, 0x28, 0x40, 0xCB}, + { 0x0021, 0x28, 0x50, 0xCC}, + { 0x0021, 0x28, 0x60, 0xCD}, + { 0x0021, 0x28, 0x70, 0xCE}, + { 0x0021, 0x28, 0x80, 0xCF}, + { 0x0021, 0x28, 0x90, 0xD0}, + { 0x0021, 0x28, 0xA0, 0xD1}, + { 0x0022, 0x28, 0x10, 0xD2}, + { 0x0022, 0x28, 0x20, 0xD3}, + { 0x0022, 0x28, 0x30, 0xD4}, + { 0x0022, 0x28, 0x40, 0xD5}, + { 0x0022, 0x28, 0x50, 0xD6}, + { 0x0022, 0x28, 0x60, 0xD7}, + { 0x0022, 0x28, 0x70, 0xD8}, + { 0x0022, 0x28, 0x80, 0xD9}, + { 0x0022, 0x28, 0x90, 0xDA}, + { 0x0022, 0x28, 0xA0, 0xDB}, + { 0x0023, 0x28, 0x28, 0xDC}, + { 0x0023, 0x28, 0x38, 0xDD}, + { 0x0023, 0x28, 0x48, 0xDE}, + { 0x0023, 0x28, 0x58, 0xDF}, + { 0x0023, 0x28, 0x68, 0xE0}, + { 0x0023, 0x28, 0x78, 0xE1}, + { 0x0023, 0x28, 0x88, 0xE2}, + { 0x0024, 0x14, 0x38, 0xE3}, + { 0x0024, 0x28, 0x48, 0xE4}, + { 0x0024, 0x28, 0x58, 0xE5}, + { 0x0024, 0x28, 0x68, 0xE6}, + { 0x0024, 0x28, 0x78, 0xE7}, + { 0x0025, 0x14, 0x38, 0xE8}, + { 0x0025, 0x28, 0x48, 0xE9}, + { 0x0025, 0x28, 0x58, 0xEA}, + { 0x0025, 0x28, 0x68, 0xEB}, + { 0x0025, 0x28, 0x78, 0xEC}, + { 0x0026, 0x14, 0x38, 0xED}, + { 0x0026, 0x28, 0x48, 0xEE}, + { 0x0026, 0x28, 0x58, 0xEF}, + { 0x0026, 0x28, 0x68, 0xF0}, + { 0x0026, 0x28, 0x78, 0xF1}, + { 0x0027, 0x14, 0x38, 0xF2}, + { 0x0027, 0x28, 0x48, 0xF3}, + { 0x0027, 0x28, 0x58, 0xF4}, + { 0x0027, 0x28, 0x68, 0xF5}, + { 0x0027, 0x28, 0x78, 0xF6}, + { 0x0028, 0x14, 0x50, 0xF7}, + { 0x0028, 0x28, 0x60, 0xF8}, + { 0x0029, 0x14, 0x50, 0xF9}, + { 0x0029, 0x28, 0x60, 0xFA}, + { 0x002A, 0x14, 0x50, 0xFB}, + { 0x002A, 0x28, 0x60, 0xFC}, }; static const Cutscene sCutscenes[NUM_CUTSCENES] = { diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index f36cb73a30..8287596f9f 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -1,12 +1,13 @@ #ifndef POKEHEARTGOLD_MIC_TEST_H #define POKEHEARTGOLD_MIC_TEST_H +#include "bg_window.h" #include "msgdata.h" #include "overlay_manager.h" #include "system.h" #include "unk_0200CF18.h" -//Should be static, but not fully decompiled yet +// Should be static, but not fully decompiled yet typedef struct MicTestData MicTestData; typedef struct MicTestTaskManager MicTestTaskManager; @@ -41,15 +42,15 @@ typedef struct MicTestSub_24 { u32 unk4; VecFx32 unk8; VecFx32 unk14; - fx32 unk20;//angle? - fx32 unk24;//dTheta? - fx32 unk28;//magnitude? + fx32 unk20; // angle? + fx32 unk24; // dTheta? + fx32 unk28; // magnitude? SysTask *task; } MicTestSub_24; struct MicTestData { SpriteRenderer *spriteRenderer; - SpriteGfxHandler *unk4; + SpriteGfxHandler *gfxHandler; UnkImageStruct *unk8[7]; MicTestSub_24 unk24[3]; u32 unkB4; @@ -59,9 +60,9 @@ struct MicTestData { HeapID heapId; }; -BOOL MicTest_Init(OVY_MANAGER *overlayMan); -BOOL MicTest_Exit(OVY_MANAGER *overlayMan); -BOOL MicTest_Main(OVY_MANAGER *overlayMan); +BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state); +BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state); +BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state); void MicTest_StartTask(MicTestTaskManager *a0, MicTestData *data, MicTestTask a2); void MicTestTaskMan_Run(MicTestTaskManager *a0); void MicTest_SetTask(MicTestTaskManager *a0, MicTestTask a1); @@ -103,12 +104,11 @@ void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, void ov62_021E6570(SysTask *, void *); int ov62_021E6620(); -//Still in asm +// Still in asm void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId); BOOL ov62_021E6630(MicTestData *micTest); void ov62_021E6600(MicTestData *micTest); +extern const OVY_MGR_TEMPLATE gApplication_MicTest; - - -#endif //POKEHEARTGOLD_MIC_TEST_H +#endif // POKEHEARTGOLD_MIC_TEST_H diff --git a/include/pokedex.h b/include/pokedex.h index ce0565932c..2571818d27 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -8,8 +8,8 @@ #include "pokemon_types_def.h" #include "save.h" -#define ROUND_UP(x, n) (((x) + (n) - 1) & ~((n) - 1)) -#define CEILDIV(x, n) (((x) + (n) - 1) / (n)) +#define ROUND_UP(x, n) (((x) + (n)-1) & ~((n)-1)) +#define CEILDIV(x, n) (((x) + (n)-1) / (n)) // Deoxys form history is split between the // seen and caught flags because of space efficiency. diff --git a/main.lsf b/main.lsf index 0e77b08333..89f703ef96 100644 --- a/main.lsf +++ b/main.lsf @@ -857,7 +857,6 @@ Overlay OVY_62 { After main Object src/overlay_mic_test.o - Object asm/overlay_62.o } Overlay OVY_63 { diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index b2b556ef06..614853680e 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -195,10 +195,10 @@ static void Task_AlphPuzzle_WaitDropCursorAnimOnQuit(SysTask *task, void *_data) // Used to detect hovering over corners static const u8 sCornerCoords[4][2] = { - { 0, 0 }, - { 5, 0 }, - { 0, 5 }, - { 5, 5 }, + {0, 0}, + { 5, 0}, + { 0, 5}, + { 5, 5}, }; // Region occupied by the QUIT button @@ -208,10 +208,10 @@ static const TouchscreenHitbox sButtonHitboxes[] = { }; static const s8 sTileRotationXYOffsets[4][2] = { - { 0, 0 }, - { -1, 0 }, - { -1, -1 }, - { 0, -1 }, + {0, 0 }, + { -1, 0 }, + { -1, -1}, + { 0, -1}, }; #define ALPH_TILE_BLANK ((AlphPuzzleInitTileData) { 0, 0, FALSE }) @@ -544,9 +544,9 @@ static const BgTemplate sBgTemplate4 = { }; static const WindowTemplate sWindowTemplates[3] = { - { 2, 26, 21, 6, 3, 3, 0x3EE }, - { 0, 2, 19, 27, 4, 4, 0x05B }, - { 4, 4, 15, 24, 6, 3, 0x001 }, + {2, 26, 21, 6, 3, 3, 0x3EE}, + { 0, 2, 19, 27, 4, 4, 0x05B}, + { 4, 4, 15, 24, 6, 3, 0x001}, }; static const OamManagerParam ov110_021E6EA4 = { 0, 128, 0, 32, 0, 128, 0, 32 }; @@ -564,12 +564,12 @@ static const u16 sResdatInfo[7] = { }; static const UnkStruct_0200D2B4 sSpriteTemplates[3] = { - // Drop cursor - { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 0, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - // Origin cursor - { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 3, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - // Tile - { ALPH_SPRITE_RES_PUZZLETILES, 208, 168, 0, 0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 } + // Drop cursor + {ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 0, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + // Origin cursor + { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 3, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + // Tile + { ALPH_SPRITE_RES_PUZZLETILES, 208, 168, 0, 0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0} }; static const u32 sQuitButtonTextColors[3] = { diff --git a/src/application/view_photo.c b/src/application/view_photo.c index cc7a6bd1a7..a698cf0102 100644 --- a/src/application/view_photo.c +++ b/src/application/view_photo.c @@ -69,20 +69,20 @@ static void ViewPhotoSysTask_PrintTextOnWindows(ViewPhotoSysTaskData *viewPhoto) static u8 Photo_CountValidMons(Photo *a0); static const WindowTemplate ov19_0225A04E[2] = { - { .bgId = GF_BG_LYR_SUB_1, + {.bgId = GF_BG_LYR_SUB_1, .left = 24, .top = 21, .width = 8, .height = 2, .palette = 1, - .baseTile = 0x1F0 }, + .baseTile = 0x1F0}, { .bgId = GF_BG_LYR_SUB_1, .left = 1, .top = 8, .width = 28, .height = 8, .palette = 10, - .baseTile = 0x110 } + .baseTile = 0x110} }; static const TouchscreenHitbox ov19_0225A05E[] = { diff --git a/src/application/view_rankings.c b/src/application/view_rankings.c index 7779f438f8..bbad16d1b5 100644 --- a/src/application/view_rankings.c +++ b/src/application/view_rankings.c @@ -221,25 +221,25 @@ static const RecordPageParam sRecordPageParam_BattleTower[] = { }; static const RecordPageParam sRecordPageParam_Pokemon[] = { - // mons fainted + // mons fainted { .max = 999999, .numDigits = 6, .msgId = msg_0421_00047, }, - // mons caught + // mons caught { .max = 999999, .numDigits = 6, .msgId = msg_0421_00047, }, - // eggs hatched + // eggs hatched { .max = 999999, .numDigits = 6, .msgId = msg_0421_00046, }, - // fishing landed + // fishing landed { .max = 999999, .numDigits = 6, diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index c9e38f501b..535019a21e 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2396,19 +2396,19 @@ static BOOL ov12_0224BCA4(BattleSystem *bsys, BattleContext *ctx) { } static const u8 sHitChanceTable[13][2] = { - { 33, 100 }, - { 36, 100 }, - { 43, 100 }, - { 50, 100 }, - { 60, 100 }, - { 75, 100 }, - { 1, 1 }, - { 133, 100 }, - { 166, 100 }, - { 2, 1 }, - { 233, 100 }, - { 133, 50 }, - { 3, 1 } + {33, 100}, + { 36, 100}, + { 43, 100}, + { 50, 100}, + { 60, 100}, + { 75, 100}, + { 1, 1 }, + { 133, 100}, + { 166, 100}, + { 2, 1 }, + { 233, 100}, + { 133, 50 }, + { 3, 1 } }; static BOOL BattleSystem_CheckMoveHit(BattleSystem *bsys, BattleContext *ctx, int battlerIdAttacker, int battlerIdTarget, int move) { diff --git a/src/battle/battle_cursor.c b/src/battle/battle_cursor.c index 9a52e01e9f..ba44660d87 100644 --- a/src/battle/battle_cursor.c +++ b/src/battle/battle_cursor.c @@ -30,7 +30,7 @@ static const UnkTemplate_0200D748 ov12_0226EBA0 = { .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, - .resIdList = { 0, 0, 0, 0, -1, -1 }, + .resIdList = {0, 0, 0, 0, -1, -1}, .bgPriority = 0, .vramTransfer = 0 }; diff --git a/src/battle/battle_finger.c b/src/battle/battle_finger.c index 9eae30e6a7..4a03ea6ea8 100644 --- a/src/battle/battle_finger.c +++ b/src/battle/battle_finger.c @@ -32,7 +32,7 @@ static const UnkTemplate_0200D748 ov12_0226EBD4 = { .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, - .resIdList = { 0, 0, 0, 0, -1, -1 }, + .resIdList = {0, 0, 0, 0, -1, -1}, .bgPriority = 0, .vramTransfer = 0 }; diff --git a/src/battle/overlay_12_0224E4FC.c b/src/battle/overlay_12_0224E4FC.c index 5d799d3063..f66ce087e6 100644 --- a/src/battle/overlay_12_0224E4FC.c +++ b/src/battle/overlay_12_0224E4FC.c @@ -2078,118 +2078,118 @@ enum { }; static const u8 sTypeEffectiveness[][3] = { - { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_NORMAL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIRE, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIRE, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIRE, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_WATER, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_WATER, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_WATER, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_WATER, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_WATER, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_WATER, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_GROUND, TYPE_MUL_NO_EFFECT }, - { TYPE_ELECTRIC, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GRASS, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GRASS, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GRASS, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ICE, TYPE_ICE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ICE, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ICE, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ICE, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_NORMAL, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_POISON, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_POISON, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_STEEL, TYPE_MUL_NO_EFFECT }, - { TYPE_GROUND, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GROUND, TYPE_ELECTRIC, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GROUND, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GROUND, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GROUND, TYPE_FLYING, TYPE_MUL_NO_EFFECT }, - { TYPE_GROUND, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GROUND, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GROUND, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FLYING, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FLYING, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FLYING, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FLYING, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_FLYING, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FLYING, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_DARK, TYPE_MUL_NO_EFFECT }, - { TYPE_PSYCHIC, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_BUG, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_BUG, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_BUG, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ROCK, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ROCK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ROCK, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_ROCK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_NORMAL, TYPE_MUL_NO_EFFECT }, - { TYPE_GHOST, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_GHOST, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_DRAGON, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_DRAGON, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_DARK, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_DARK, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_STEEL, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, - { TYPE_STEEL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FORESIGHT, TYPE_FORESIGHT, TYPE_MUL_NO_EFFECT }, - { TYPE_NORMAL, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, - { TYPE_FIGHTING, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, - { TYPE_ENDTABLE, TYPE_ENDTABLE, TYPE_MUL_NO_EFFECT } + {TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_NORMAL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIRE, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIRE, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIRE, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_WATER, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_WATER, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_WATER, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_WATER, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_WATER, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_WATER, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ELECTRIC, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_GROUND, TYPE_MUL_NO_EFFECT }, + { TYPE_ELECTRIC, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ELECTRIC, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GRASS, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GRASS, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GRASS, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ICE, TYPE_ICE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ICE, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ICE, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ICE, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_NORMAL, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIGHTING, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIGHTING, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIGHTING, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FIGHTING, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_POISON, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_POISON, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_STEEL, TYPE_MUL_NO_EFFECT }, + { TYPE_GROUND, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GROUND, TYPE_ELECTRIC, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GROUND, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GROUND, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GROUND, TYPE_FLYING, TYPE_MUL_NO_EFFECT }, + { TYPE_GROUND, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GROUND, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GROUND, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FLYING, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FLYING, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FLYING, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FLYING, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_FLYING, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FLYING, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_PSYCHIC, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_PSYCHIC, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_DARK, TYPE_MUL_NO_EFFECT }, + { TYPE_PSYCHIC, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_BUG, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_BUG, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_BUG, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ROCK, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ROCK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ROCK, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_ROCK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_NORMAL, TYPE_MUL_NO_EFFECT }, + { TYPE_GHOST, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_GHOST, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_DRAGON, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_DRAGON, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_DARK, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_DARK, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_STEEL, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, + { TYPE_STEEL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FORESIGHT, TYPE_FORESIGHT, TYPE_MUL_NO_EFFECT }, + { TYPE_NORMAL, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, + { TYPE_FIGHTING, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, + { TYPE_ENDTABLE, TYPE_ENDTABLE, TYPE_MUL_NO_EFFECT } }; // static @@ -5464,55 +5464,55 @@ typedef struct MoveDamageCalc { } MoveDamageCalc; static const u8 sTypeEnhancingItems[][2] = { - { HOLD_EFFECT_STRENGTHEN_BUG, TYPE_BUG }, - { HOLD_EFFECT_STRENGTHEN_STEEL, TYPE_STEEL }, - { HOLD_EFFECT_STRENGTHEN_GROUND, TYPE_GROUND }, - { HOLD_EFFECT_STRENGTHEN_ROCK, TYPE_ROCK }, - { HOLD_EFFECT_STRENGTHEN_GRASS, TYPE_GRASS }, - { HOLD_EFFECT_STRENGTHEN_DARK, TYPE_DARK }, - { HOLD_EFFECT_STRENGTHEN_FIGHT, TYPE_FIGHTING }, - { HOLD_EFFECT_STRENGTHEN_ELECTRIC, TYPE_ELECTRIC }, - { HOLD_EFFECT_STRENGTHEN_WATER, TYPE_WATER }, - { HOLD_EFFECT_STRENGTHEN_FLYING, TYPE_FLYING }, - { HOLD_EFFECT_STRENGTHEN_POISON, TYPE_POISON }, - { HOLD_EFFECT_STRENGTHEN_ICE, TYPE_ICE }, - { HOLD_EFFECT_STRENGTHEN_GHOST, TYPE_GHOST }, - { HOLD_EFFECT_STRENGTHEN_PSYCHIC, TYPE_PSYCHIC }, - { HOLD_EFFECT_STRENGTHEN_FIRE, TYPE_FIRE }, - { HOLD_EFFECT_STRENGTHEN_DRAGON, TYPE_DRAGON }, - { HOLD_EFFECT_STRENGTHEN_NORMAL, TYPE_NORMAL }, - { HOLD_EFFECT_ARCEUS_FIRE, TYPE_FIRE }, - { HOLD_EFFECT_ARCEUS_WATER, TYPE_WATER }, - { HOLD_EFFECT_ARCEUS_ELECTRIC, TYPE_ELECTRIC }, - { HOLD_EFFECT_ARCEUS_GRASS, TYPE_GRASS }, - { HOLD_EFFECT_ARCEUS_ICE, TYPE_ICE }, - { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING }, - { HOLD_EFFECT_ARCEUS_POISON, TYPE_POISON }, - { HOLD_EFFECT_ARCEUS_GROUND, TYPE_GROUND }, - { HOLD_EFFECT_ARCEUS_FLYING, TYPE_FLYING }, - { HOLD_EFFECT_ARCEUS_PSYCHIC, TYPE_PSYCHIC }, - { HOLD_EFFECT_ARCEUS_BUG, TYPE_BUG }, - { HOLD_EFFECT_ARCEUS_ROCK, TYPE_ROCK }, - { HOLD_EFFECT_ARCEUS_GHOST, TYPE_GHOST }, - { HOLD_EFFECT_ARCEUS_DRAGON, TYPE_DRAGON }, - { HOLD_EFFECT_ARCEUS_DARK, TYPE_DARK }, - { HOLD_EFFECT_ARCEUS_STEEL, TYPE_STEEL } + {HOLD_EFFECT_STRENGTHEN_BUG, TYPE_BUG }, + { HOLD_EFFECT_STRENGTHEN_STEEL, TYPE_STEEL }, + { HOLD_EFFECT_STRENGTHEN_GROUND, TYPE_GROUND }, + { HOLD_EFFECT_STRENGTHEN_ROCK, TYPE_ROCK }, + { HOLD_EFFECT_STRENGTHEN_GRASS, TYPE_GRASS }, + { HOLD_EFFECT_STRENGTHEN_DARK, TYPE_DARK }, + { HOLD_EFFECT_STRENGTHEN_FIGHT, TYPE_FIGHTING}, + { HOLD_EFFECT_STRENGTHEN_ELECTRIC, TYPE_ELECTRIC}, + { HOLD_EFFECT_STRENGTHEN_WATER, TYPE_WATER }, + { HOLD_EFFECT_STRENGTHEN_FLYING, TYPE_FLYING }, + { HOLD_EFFECT_STRENGTHEN_POISON, TYPE_POISON }, + { HOLD_EFFECT_STRENGTHEN_ICE, TYPE_ICE }, + { HOLD_EFFECT_STRENGTHEN_GHOST, TYPE_GHOST }, + { HOLD_EFFECT_STRENGTHEN_PSYCHIC, TYPE_PSYCHIC }, + { HOLD_EFFECT_STRENGTHEN_FIRE, TYPE_FIRE }, + { HOLD_EFFECT_STRENGTHEN_DRAGON, TYPE_DRAGON }, + { HOLD_EFFECT_STRENGTHEN_NORMAL, TYPE_NORMAL }, + { HOLD_EFFECT_ARCEUS_FIRE, TYPE_FIRE }, + { HOLD_EFFECT_ARCEUS_WATER, TYPE_WATER }, + { HOLD_EFFECT_ARCEUS_ELECTRIC, TYPE_ELECTRIC}, + { HOLD_EFFECT_ARCEUS_GRASS, TYPE_GRASS }, + { HOLD_EFFECT_ARCEUS_ICE, TYPE_ICE }, + { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING}, + { HOLD_EFFECT_ARCEUS_POISON, TYPE_POISON }, + { HOLD_EFFECT_ARCEUS_GROUND, TYPE_GROUND }, + { HOLD_EFFECT_ARCEUS_FLYING, TYPE_FLYING }, + { HOLD_EFFECT_ARCEUS_PSYCHIC, TYPE_PSYCHIC }, + { HOLD_EFFECT_ARCEUS_BUG, TYPE_BUG }, + { HOLD_EFFECT_ARCEUS_ROCK, TYPE_ROCK }, + { HOLD_EFFECT_ARCEUS_GHOST, TYPE_GHOST }, + { HOLD_EFFECT_ARCEUS_DRAGON, TYPE_DRAGON }, + { HOLD_EFFECT_ARCEUS_DARK, TYPE_DARK }, + { HOLD_EFFECT_ARCEUS_STEEL, TYPE_STEEL } }; static const u8 sStatChangeTable[][2] = { - { 10, 40 }, - { 10, 35 }, - { 10, 30 }, - { 10, 25 }, - { 10, 20 }, - { 10, 15 }, - { 10, 10 }, - { 15, 10 }, - { 20, 10 }, - { 25, 10 }, - { 30, 10 }, - { 35, 10 }, - { 40, 10 } + {10, 40}, + { 10, 35}, + { 10, 30}, + { 10, 25}, + { 10, 20}, + { 10, 15}, + { 10, 10}, + { 15, 10}, + { 20, 10}, + { 25, 10}, + { 30, 10}, + { 35, 10}, + { 40, 10} }; static const u16 sPunchingMoves[] = { diff --git a/src/berry_pots_app.c b/src/berry_pots_app.c index d8345ea7c2..bc98bbdca4 100644 --- a/src/berry_pots_app.c +++ b/src/berry_pots_app.c @@ -130,12 +130,12 @@ static const OamCharTransferParam ov17_02203D98 = { GX_OBJVRAMMODE_CHAR_1D_32K, }; static const WindowTemplate ov17_02203DC4[3] = { - { 2, 25, 21, 6, 2, 9, 0x1A2 }, - { 0, 2, 19, 19, 4, 12, 0x0CA }, - { 0, 2, 19, 27, 4, 12, 0x136 }, + {2, 25, 21, 6, 2, 9, 0x1A2}, + { 0, 2, 19, 19, 4, 12, 0x0CA}, + { 0, 2, 19, 27, 4, 12, 0x136}, }; static const SpriteResourceCountsListUnion ov17_02203DAC = { - { 1, 1, 1, 1, 0, 0 } + {1, 1, 1, 1, 0, 0} }; static const BgTemplate ov17_02203DDC = { 0, @@ -220,10 +220,10 @@ static const u8 ov17_02203D50[] = { 2, 1 }; static const u8 ov17_02203D54[] = { 5, 1 }; static const struct UnkStruct_ov17_02203E88 ov17_02203E88[4] = { - { 3, ov17_02203D5C }, - { 2, ov17_02203D58 }, - { 2, ov17_02203D50 }, - { 2, ov17_02203D54 }, + {3, ov17_02203D5C}, + { 2, ov17_02203D58}, + { 2, ov17_02203D50}, + { 2, ov17_02203D54}, }; static const UnkStruct_0200D2B4 ov17_02203EA8 = { 0, 27, 96, 0, 5, 13, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }; static const GraphicsBanks ov17_02203ED0 = { @@ -239,11 +239,11 @@ static const GraphicsBanks ov17_02203ED0 = { GX_VRAM_TEXPLTT_NONE, }; static const UnkStruct_0200D2B4 ov17_02203EF8[5] = { - { 0, 224, 176, 0, 0, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - { 0, 27, 96, 0, 2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - { 0, 31, 56, 0, 8, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - { 0, 27, 99, 0, 4, 14, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, - { 0, 27, 88, 0, 7, 12, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 } + {0, 224, 176, 0, 0, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + { 0, 27, 96, 0, 2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + { 0, 31, 56, 0, 8, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + { 0, 27, 99, 0, 4, 14, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, + { 0, 27, 88, 0, 7, 12, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0} }; void ov17_02201BC0(void) { diff --git a/src/berry_pots_app_tasks.c b/src/berry_pots_app_tasks.c index 66a616e152..5ba04fdf3b 100644 --- a/src/berry_pots_app_tasks.c +++ b/src/berry_pots_app_tasks.c @@ -20,7 +20,7 @@ typedef struct SysTaskArgs_ov17_0220351C { } SysTaskArgs_ov17_0220351C; static const TouchscreenHitbox ov17_02203FC0 = { - .rect = { 160, 192, 192, 0 } + .rect = {160, 192, 192, 0} }; static void ov17_022035A4(SysTask *task, SysTaskArgs_ov17_0220351C *args); diff --git a/src/bg_window.c b/src/bg_window.c index e3527b228a..4cd891eec1 100644 --- a/src/bg_window.c +++ b/src/bg_window.c @@ -1384,8 +1384,8 @@ u8 GetBgPriority(BgConfig *bgConfig, u8 bgId) { return 0; } -#define GetPixelAddressFromBlit4bpp(ptr, x, y, width) ((u8 *)((ptr) + (((x) >> 1) & 3) + (((x) << 2) & 0x3FE0) + ((((y) << 2) & 0x3FE0) * (width)) + (((u32)(((y) << 2) & 0x1C))))) -#define GetPixelAddressFromBlit8bpp(ptr, x, y, width) ((u8 *)((ptr) + ((x) & 7) + (((x) << 3) & 0x7FC0) + ((((y) << 3) & 0x7FC0) * (width)) + (((u32)(((y) << 3) & 0x38))))) +#define GetPixelAddressFromBlit4bpp(ptr, x, y, width) ((u8 *)((ptr) + (((x) >> 1) & 3) + (((x) << 2) & 0x3FE0) + ((((y) << 2) & 0x3FE0) * (width)) + ((u32)(((y) << 2) & 0x1C)))) +#define GetPixelAddressFromBlit8bpp(ptr, x, y, width) ((u8 *)((ptr) + ((x) & 7) + (((x) << 3) & 0x7FC0) + ((((y) << 3) & 0x7FC0) * (width)) + ((u32)(((y) << 3) & 0x38)))) #define ConvertPixelsToTiles(x) (((x) + ((x) & 7)) >> 3) void BlitBitmapRect4Bit(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 colorKey) { diff --git a/src/certificates_app.c b/src/certificates_app.c index 5743cad27f..5ec8c73e82 100644 --- a/src/certificates_app.c +++ b/src/certificates_app.c @@ -125,7 +125,7 @@ static const UnkTemplate_0200D748 ov78_021E68B4 = { .spritePriority = 1, .pal = 3, .vram = NNS_G2D_VRAM_TYPE_2DBOTH, - .resIdList = { 2, 2, 2, 2, 0, 0 }, + .resIdList = {2, 2, 2, 2, 0, 0}, .bgPriority = 0, .vramTransfer = 0, }; @@ -151,15 +151,15 @@ static const UnkTemplate_0200D748 ov78_021E68E8 = { .spritePriority = 0, .pal = 2, .vram = NNS_G2D_VRAM_TYPE_2DBOTH, - .resIdList = { 1, 1, 1, 1, 0, 0 }, + .resIdList = {1, 1, 1, 1, 0, 0}, .bgPriority = 0, .vramTransfer = 0, }; static s16 ov78_021E6920[3][2] = { - { 128, 16 }, - { 116, 180 }, - { 140, 180 }, + {128, 16 }, + { 116, 180}, + { 140, 180}, }; static void CertificatesApp_OnVBlank(CertificatesApp_Data *data); diff --git a/src/credits/data1.c b/src/credits/data1.c index 3d9cd6a017..e73bb6b436 100644 --- a/src/credits/data1.c +++ b/src/credits/data1.c @@ -1,8 +1,8 @@ #include "credits/credits.h" const UnkOv021E60F6 ov76_021E6E88[4] = { - { 0x49, 0x00, 0x00, 0x00 }, - { 0x49, 0x00, 0x00, 0x00 }, - { 0x49, 0x00, 0x00, 0x00 }, - { 0x07, 0x07, 0x07, 0x07 }, + {0x49, 0x00, 0x00, 0x00}, + { 0x49, 0x00, 0x00, 0x00}, + { 0x49, 0x00, 0x00, 0x00}, + { 0x07, 0x07, 0x07, 0x07}, }; diff --git a/src/data/fieldmap/hidden_items.h b/src/data/fieldmap/hidden_items.h index 45670807d6..c259329b0b 100644 --- a/src/data/fieldmap/hidden_items.h +++ b/src/data/fieldmap/hidden_items.h @@ -3,236 +3,236 @@ #include "constants/items.h" static const struct HiddenItemData sHiddenItemParam[] = { - { ITEM_POTION, 1, 0, 0, 0 }, - { ITEM_NUGGET, 1, 0, 0, 1 }, - { ITEM_NUGGET, 1, 0, 0, 225 }, - { ITEM_POTION, 1, 0, 0, 2 }, - { ITEM_POKE_BALL, 1, 0, 0, 14 }, - { ITEM_MAX_ETHER, 1, 0, 0, 15 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 16 }, - { ITEM_HYPER_POTION, 1, 0, 0, 17 }, - { ITEM_ELIXIR, 1, 0, 0, 18 }, - { ITEM_HYPER_POTION, 1, 0, 0, 3 }, - { ITEM_POKE_BALL, 1, 0, 0, 108 }, - { ITEM_GREAT_BALL, 1, 0, 0, 146 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 147 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 148 }, - { ITEM_RARE_CANDY, 1, 0, 0, 149 }, - { ITEM_NUGGET, 1, 0, 0, 150 }, - { ITEM_GREAT_BALL, 1, 0, 0, 151 }, - { ITEM_PARLYZ_HEAL, 1, 0, 0, 152 }, - { ITEM_BIG_PEARL, 1, 0, 0, 154 }, - { ITEM_X_SPEED, 1, 0, 0, 153 }, - { ITEM_REVIVE, 1, 0, 0, 155 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 156 }, - { ITEM_CALCIUM, 1, 0, 0, 157 }, - { ITEM_HEART_SCALE, 1, 0, 0, 4 }, - { ITEM_GREAT_BALL, 1, 0, 0, 5 }, - { ITEM_SUPER_POTION, 1, 0, 0, 97 }, - { ITEM_FULL_HEAL, 1, 0, 0, 6 }, - { ITEM_GREAT_BALL, 1, 0, 0, 27 }, - { ITEM_SUPER_POTION, 1, 0, 0, 28 }, - { ITEM_FULL_HEAL, 1, 0, 0, 29 }, - { ITEM_ANTIDOTE, 1, 0, 0, 30 }, - { ITEM_SUPER_POTION, 1, 0, 0, 31 }, - { ITEM_FULL_HEAL, 1, 0, 0, 32 }, - { ITEM_ETHER, 1, 0, 0, 33 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 211 }, - { ITEM_REPEL, 1, 0, 0, 212 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 213 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 214 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 215 }, - { ITEM_RARE_CANDY, 1, 0, 0, 7 }, - { ITEM_SUPER_POTION, 1, 0, 0, 8 }, - { ITEM_SUPER_POTION, 1, 0, 0, 9 }, - { ITEM_PARLYZ_HEAL, 1, 0, 0, 52 }, - { ITEM_SUPER_POTION, 1, 0, 0, 53 }, - { ITEM_ANTIDOTE, 1, 0, 0, 67 }, - { ITEM_MAX_POTION, 1, 0, 0, 68 }, - { ITEM_REVIVE, 1, 0, 0, 69 }, - { ITEM_NUGGET, 1, 0, 0, 10 }, - { ITEM_AWAKENING, 1, 0, 0, 11 }, - { ITEM_FULL_HEAL, 1, 0, 0, 34 }, - { ITEM_FULL_HEAL, 1, 0, 0, 35 }, - { ITEM_PP_UP, 1, 0, 0, 159 }, - { ITEM_PROTEIN, 1, 0, 0, 160 }, - { ITEM_HYPER_POTION, 1, 0, 0, 12 }, - { ITEM_ETHER, 1, 0, 0, 13 }, - { ITEM_RARE_CANDY, 1, 0, 0, 132 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 133 }, - { ITEM_ETHER, 1, 0, 0, 19 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 20 }, - { ITEM_ANTIDOTE, 1, 0, 0, 65 }, - { ITEM_REVIVE, 1, 0, 0, 21 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 125 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 126 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 127 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 128 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 129 }, - { ITEM_MAX_POTION, 1, 0, 0, 62 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 63 }, - { ITEM_CARBOS, 1, 0, 0, 64 }, - { ITEM_HP_UP, 1, 0, 0, 22 }, - { ITEM_NUGGET, 1, 0, 0, 98 }, - { ITEM_PP_UP, 1, 0, 0, 135 }, - { ITEM_X_ATTACK, 1, 0, 0, 136 }, - { ITEM_RARE_CANDY, 1, 0, 0, 23 }, - { ITEM_FULL_HEAL, 1, 0, 0, 137 }, - { ITEM_HYPER_POTION, 1, 0, 0, 66 }, - { ITEM_PROTEIN, 1, 0, 0, 86 }, - { ITEM_PEARL, 1, 0, 0, 158 }, - { ITEM_RARE_CANDY, 1, 0, 0, 161 }, - { ITEM_HYPER_POTION, 1, 0, 0, 24 }, - { ITEM_MAX_ETHER, 1, 0, 0, 99 }, - { ITEM_STARDUST, 1, 0, 0, 170 }, - { ITEM_STARDUST, 1, 0, 0, 171 }, - { ITEM_STARDUST, 1, 0, 0, 172 }, - { ITEM_STARDUST, 1, 0, 0, 173 }, - { ITEM_RARE_CANDY, 1, 0, 0, 73 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 74 }, - { ITEM_SUPER_REPEL, 1, 0, 0, 191 }, - { ITEM_PEARL, 1, 0, 0, 192 }, - { ITEM_REVIVE, 1, 0, 0, 193 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 75 }, - { ITEM_REVIVE, 1, 0, 0, 25 }, - { ITEM_STARDUST, 1, 0, 0, 26 }, - { ITEM_BIG_PEARL, 1, 0, 0, 209 }, - { ITEM_STARDUST, 1, 0, 0, 39 }, - { ITEM_PEARL, 1, 0, 0, 40 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 226 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 41 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 130 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 131 }, - { ITEM_MAX_POTION, 1, 0, 0, 42 }, - { ITEM_HYPER_POTION, 1, 0, 0, 43 }, - { ITEM_REVIVE, 1, 0, 0, 44 }, - { ITEM_MAX_REPEL, 1, 0, 0, 45 }, - { ITEM_ETHER, 1, 0, 0, 46 }, - { ITEM_RARE_CANDY, 1, 0, 0, 140 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 141 }, - { ITEM_NUGGET, 1, 0, 0, 142 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 47 }, - { ITEM_HP_UP, 1, 0, 0, 48 }, - { ITEM_HYPER_POTION, 1, 0, 0, 143 }, - { ITEM_FULL_HEAL, 1, 0, 0, 144 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 49 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 50 }, - { ITEM_REVIVE, 1, 0, 0, 51 }, - { ITEM_FULL_HEAL, 1, 0, 0, 54 }, - { ITEM_X_SP__DEF, 1, 0, 0, 55 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 36 }, - { ITEM_RARE_CANDY, 1, 0, 0, 37 }, - { ITEM_MAX_POTION, 1, 0, 0, 102 }, - { ITEM_ELIXIR, 1, 0, 0, 100 }, - { ITEM_MAX_POTION, 1, 0, 0, 70 }, - { ITEM_ICE_HEAL, 1, 0, 0, 72 }, - { ITEM_REVIVE, 1, 0, 0, 228 }, - { ITEM_CARBOS, 1, 0, 0, 71 }, - { ITEM_REVIVE, 1, 0, 0, 81 }, - { ITEM_MAX_POTION, 1, 0, 0, 82 }, - { ITEM_MAX_ELIXIR, 1, 0, 0, 83 }, - { ITEM_PP_UP, 1, 0, 0, 101 }, - { ITEM_REVIVE, 1, 0, 0, 181 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 182 }, - { ITEM_NUGGET, 1, 0, 0, 183 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 184 }, - { ITEM_MAX_POTION, 1, 0, 0, 79 }, - { ITEM_FULL_HEAL, 1, 0, 0, 80 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 185 }, - { ITEM_PP_UP, 1, 0, 0, 186 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 189 }, - { ITEM_HYPER_POTION, 1, 0, 0, 187 }, - { ITEM_ZINC, 1, 0, 0, 188 }, - { ITEM_RARE_CANDY, 1, 0, 0, 190 }, - { ITEM_IRON, 1, 0, 0, 84 }, - { ITEM_FULL_HEAL, 1, 0, 0, 103 }, - { ITEM_HEART_SCALE, 1, 0, 0, 168 }, - { ITEM_PEARL, 1, 0, 0, 162 }, - { ITEM_PEARL, 1, 0, 0, 163 }, - { ITEM_BIG_PEARL, 1, 0, 0, 164 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 56 }, - { ITEM_CALCIUM, 1, 0, 0, 224 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 57 }, - { ITEM_X_SPECIAL, 1, 0, 0, 58 }, - { ITEM_REVIVE, 1, 0, 0, 104 }, - { ITEM_X_ACCURACY, 1, 0, 0, 59 }, - { ITEM_X_DEFENSE, 1, 0, 0, 60 }, - { ITEM_MAX_POTION, 1, 0, 0, 61 }, - { ITEM_HP_UP, 1, 0, 0, 169 }, - { ITEM_CARBOS, 1, 0, 0, 197 }, - { ITEM_ETHER, 1, 0, 0, 105 }, - { ITEM_NUGGET, 1, 0, 0, 106 }, - { ITEM_REVIVE, 1, 0, 0, 107 }, - { ITEM_PP_UP, 1, 0, 0, 122 }, - { ITEM_MAX_ETHER, 1, 0, 0, 109 }, - { ITEM_MAX_ELIXIR, 1, 0, 0, 110 }, - { ITEM_NUGGET, 1, 0, 0, 134 }, - { ITEM_CALCIUM, 1, 0, 0, 111 }, - { ITEM_ELIXIR, 1, 0, 0, 112 }, - { ITEM_MAX_ETHER, 1, 0, 0, 85 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 87 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 216 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 217 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 218 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 219 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 220 }, - { ITEM_PP_UP, 1, 0, 0, 198 }, - { ITEM_GUARD_SPEC_, 1, 0, 0, 199 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 227 }, - { ITEM_STAR_PIECE, 1, 0, 0, 145 }, - { ITEM_STAR_PIECE, 1, 0, 0, 138 }, - { ITEM_HYPER_POTION, 1, 0, 0, 139 }, - { ITEM_REVIVE, 1, 0, 0, 195 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 196 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 113 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 194 }, - { ITEM_NUGGET, 1, 0, 0, 200 }, - { ITEM_STARDUST, 1, 0, 0, 174 }, - { ITEM_STARDUST, 1, 0, 0, 175 }, - { ITEM_STARDUST, 1, 0, 0, 176 }, - { ITEM_STARDUST, 1, 0, 0, 177 }, - { ITEM_RARE_CANDY, 1, 0, 0, 114 }, - { ITEM_IRON, 1, 0, 0, 166 }, - { ITEM_STAR_PIECE, 1, 0, 0, 167 }, - { ITEM_ESCAPE_ROPE, 1, 0, 0, 88 }, - { ITEM_ICE_HEAL, 1, 0, 0, 89 }, - { ITEM_PEARL, 1, 0, 0, 90 }, - { ITEM_PEARL, 1, 0, 0, 91 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 92 }, - { ITEM_RARE_CANDY, 1, 0, 0, 210 }, - { ITEM_ZINC, 1, 0, 0, 223 }, - { ITEM_BIG_PEARL, 1, 0, 0, 180 }, - { ITEM_PEARL, 1, 0, 0, 178 }, - { ITEM_PEARL, 1, 0, 0, 179 }, - { ITEM_REVIVE, 1, 0, 0, 207 }, - { ITEM_MAX_ELIXIR, 1, 0, 0, 208 }, - { ITEM_RARE_CANDY, 1, 0, 0, 115 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 116 }, - { ITEM_DIRE_HIT, 1, 0, 0, 76 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 77 }, - { ITEM_REVIVE, 1, 0, 0, 201 }, - { ITEM_RARE_CANDY, 1, 0, 0, 165 }, - { ITEM_MAX_ETHER, 1, 0, 0, 204 }, - { ITEM_HYPER_POTION, 1, 0, 0, 205 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 202 }, - { ITEM_HYPER_POTION, 1, 0, 0, 203 }, - { ITEM_MAX_POTION, 1, 0, 0, 78 }, - { ITEM_IRON, 1, 0, 0, 222 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 206 }, - { ITEM_HYPER_POTION, 1, 0, 0, 93 }, - { ITEM_RARE_CANDY, 1, 0, 0, 94 }, - { ITEM_REVIVE, 1, 0, 0, 95 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 96 }, - { ITEM_PP_UP, 1, 0, 0, 117 }, - { ITEM_BIG_PEARL, 1, 0, 0, 118 }, - { ITEM_ZINC, 1, 0, 0, 119 }, - { ITEM_FULL_HEAL, 1, 0, 0, 120 }, - { ITEM_PROTEIN, 1, 0, 0, 221 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 121 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 123 }, - { ITEM_NUGGET, 1, 0, 0, 124 }, - { ITEM_DEEPSEATOOTH, 1, 0, 0, 38 }, - { ITEM_DEEPSEASCALE, 1, 0, 0, 229 }, - { ITEM_PP_MAX, 1, 0, 0, 230 }, + {ITEM_POTION, 1, 0, 0, 0 }, + { ITEM_NUGGET, 1, 0, 0, 1 }, + { ITEM_NUGGET, 1, 0, 0, 225}, + { ITEM_POTION, 1, 0, 0, 2 }, + { ITEM_POKE_BALL, 1, 0, 0, 14 }, + { ITEM_MAX_ETHER, 1, 0, 0, 15 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 16 }, + { ITEM_HYPER_POTION, 1, 0, 0, 17 }, + { ITEM_ELIXIR, 1, 0, 0, 18 }, + { ITEM_HYPER_POTION, 1, 0, 0, 3 }, + { ITEM_POKE_BALL, 1, 0, 0, 108}, + { ITEM_GREAT_BALL, 1, 0, 0, 146}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 147}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 148}, + { ITEM_RARE_CANDY, 1, 0, 0, 149}, + { ITEM_NUGGET, 1, 0, 0, 150}, + { ITEM_GREAT_BALL, 1, 0, 0, 151}, + { ITEM_PARLYZ_HEAL, 1, 0, 0, 152}, + { ITEM_BIG_PEARL, 1, 0, 0, 154}, + { ITEM_X_SPEED, 1, 0, 0, 153}, + { ITEM_REVIVE, 1, 0, 0, 155}, + { ITEM_ULTRA_BALL, 1, 0, 0, 156}, + { ITEM_CALCIUM, 1, 0, 0, 157}, + { ITEM_HEART_SCALE, 1, 0, 0, 4 }, + { ITEM_GREAT_BALL, 1, 0, 0, 5 }, + { ITEM_SUPER_POTION, 1, 0, 0, 97 }, + { ITEM_FULL_HEAL, 1, 0, 0, 6 }, + { ITEM_GREAT_BALL, 1, 0, 0, 27 }, + { ITEM_SUPER_POTION, 1, 0, 0, 28 }, + { ITEM_FULL_HEAL, 1, 0, 0, 29 }, + { ITEM_ANTIDOTE, 1, 0, 0, 30 }, + { ITEM_SUPER_POTION, 1, 0, 0, 31 }, + { ITEM_FULL_HEAL, 1, 0, 0, 32 }, + { ITEM_ETHER, 1, 0, 0, 33 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 211}, + { ITEM_REPEL, 1, 0, 0, 212}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 213}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 214}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 215}, + { ITEM_RARE_CANDY, 1, 0, 0, 7 }, + { ITEM_SUPER_POTION, 1, 0, 0, 8 }, + { ITEM_SUPER_POTION, 1, 0, 0, 9 }, + { ITEM_PARLYZ_HEAL, 1, 0, 0, 52 }, + { ITEM_SUPER_POTION, 1, 0, 0, 53 }, + { ITEM_ANTIDOTE, 1, 0, 0, 67 }, + { ITEM_MAX_POTION, 1, 0, 0, 68 }, + { ITEM_REVIVE, 1, 0, 0, 69 }, + { ITEM_NUGGET, 1, 0, 0, 10 }, + { ITEM_AWAKENING, 1, 0, 0, 11 }, + { ITEM_FULL_HEAL, 1, 0, 0, 34 }, + { ITEM_FULL_HEAL, 1, 0, 0, 35 }, + { ITEM_PP_UP, 1, 0, 0, 159}, + { ITEM_PROTEIN, 1, 0, 0, 160}, + { ITEM_HYPER_POTION, 1, 0, 0, 12 }, + { ITEM_ETHER, 1, 0, 0, 13 }, + { ITEM_RARE_CANDY, 1, 0, 0, 132}, + { ITEM_ULTRA_BALL, 1, 0, 0, 133}, + { ITEM_ETHER, 1, 0, 0, 19 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 20 }, + { ITEM_ANTIDOTE, 1, 0, 0, 65 }, + { ITEM_REVIVE, 1, 0, 0, 21 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 125}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 126}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 127}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 128}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 129}, + { ITEM_MAX_POTION, 1, 0, 0, 62 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 63 }, + { ITEM_CARBOS, 1, 0, 0, 64 }, + { ITEM_HP_UP, 1, 0, 0, 22 }, + { ITEM_NUGGET, 1, 0, 0, 98 }, + { ITEM_PP_UP, 1, 0, 0, 135}, + { ITEM_X_ATTACK, 1, 0, 0, 136}, + { ITEM_RARE_CANDY, 1, 0, 0, 23 }, + { ITEM_FULL_HEAL, 1, 0, 0, 137}, + { ITEM_HYPER_POTION, 1, 0, 0, 66 }, + { ITEM_PROTEIN, 1, 0, 0, 86 }, + { ITEM_PEARL, 1, 0, 0, 158}, + { ITEM_RARE_CANDY, 1, 0, 0, 161}, + { ITEM_HYPER_POTION, 1, 0, 0, 24 }, + { ITEM_MAX_ETHER, 1, 0, 0, 99 }, + { ITEM_STARDUST, 1, 0, 0, 170}, + { ITEM_STARDUST, 1, 0, 0, 171}, + { ITEM_STARDUST, 1, 0, 0, 172}, + { ITEM_STARDUST, 1, 0, 0, 173}, + { ITEM_RARE_CANDY, 1, 0, 0, 73 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 74 }, + { ITEM_SUPER_REPEL, 1, 0, 0, 191}, + { ITEM_PEARL, 1, 0, 0, 192}, + { ITEM_REVIVE, 1, 0, 0, 193}, + { ITEM_FULL_RESTORE, 1, 0, 0, 75 }, + { ITEM_REVIVE, 1, 0, 0, 25 }, + { ITEM_STARDUST, 1, 0, 0, 26 }, + { ITEM_BIG_PEARL, 1, 0, 0, 209}, + { ITEM_STARDUST, 1, 0, 0, 39 }, + { ITEM_PEARL, 1, 0, 0, 40 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 226}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 41 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 130}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 131}, + { ITEM_MAX_POTION, 1, 0, 0, 42 }, + { ITEM_HYPER_POTION, 1, 0, 0, 43 }, + { ITEM_REVIVE, 1, 0, 0, 44 }, + { ITEM_MAX_REPEL, 1, 0, 0, 45 }, + { ITEM_ETHER, 1, 0, 0, 46 }, + { ITEM_RARE_CANDY, 1, 0, 0, 140}, + { ITEM_ULTRA_BALL, 1, 0, 0, 141}, + { ITEM_NUGGET, 1, 0, 0, 142}, + { ITEM_FULL_RESTORE, 1, 0, 0, 47 }, + { ITEM_HP_UP, 1, 0, 0, 48 }, + { ITEM_HYPER_POTION, 1, 0, 0, 143}, + { ITEM_FULL_HEAL, 1, 0, 0, 144}, + { ITEM_MAX_REVIVE, 1, 0, 0, 49 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 50 }, + { ITEM_REVIVE, 1, 0, 0, 51 }, + { ITEM_FULL_HEAL, 1, 0, 0, 54 }, + { ITEM_X_SP__DEF, 1, 0, 0, 55 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 36 }, + { ITEM_RARE_CANDY, 1, 0, 0, 37 }, + { ITEM_MAX_POTION, 1, 0, 0, 102}, + { ITEM_ELIXIR, 1, 0, 0, 100}, + { ITEM_MAX_POTION, 1, 0, 0, 70 }, + { ITEM_ICE_HEAL, 1, 0, 0, 72 }, + { ITEM_REVIVE, 1, 0, 0, 228}, + { ITEM_CARBOS, 1, 0, 0, 71 }, + { ITEM_REVIVE, 1, 0, 0, 81 }, + { ITEM_MAX_POTION, 1, 0, 0, 82 }, + { ITEM_MAX_ELIXIR, 1, 0, 0, 83 }, + { ITEM_PP_UP, 1, 0, 0, 101}, + { ITEM_REVIVE, 1, 0, 0, 181}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 182}, + { ITEM_NUGGET, 1, 0, 0, 183}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 184}, + { ITEM_MAX_POTION, 1, 0, 0, 79 }, + { ITEM_FULL_HEAL, 1, 0, 0, 80 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 185}, + { ITEM_PP_UP, 1, 0, 0, 186}, + { ITEM_ULTRA_BALL, 1, 0, 0, 189}, + { ITEM_HYPER_POTION, 1, 0, 0, 187}, + { ITEM_ZINC, 1, 0, 0, 188}, + { ITEM_RARE_CANDY, 1, 0, 0, 190}, + { ITEM_IRON, 1, 0, 0, 84 }, + { ITEM_FULL_HEAL, 1, 0, 0, 103}, + { ITEM_HEART_SCALE, 1, 0, 0, 168}, + { ITEM_PEARL, 1, 0, 0, 162}, + { ITEM_PEARL, 1, 0, 0, 163}, + { ITEM_BIG_PEARL, 1, 0, 0, 164}, + { ITEM_MAX_REVIVE, 1, 0, 0, 56 }, + { ITEM_CALCIUM, 1, 0, 0, 224}, + { ITEM_FULL_RESTORE, 1, 0, 0, 57 }, + { ITEM_X_SPECIAL, 1, 0, 0, 58 }, + { ITEM_REVIVE, 1, 0, 0, 104}, + { ITEM_X_ACCURACY, 1, 0, 0, 59 }, + { ITEM_X_DEFENSE, 1, 0, 0, 60 }, + { ITEM_MAX_POTION, 1, 0, 0, 61 }, + { ITEM_HP_UP, 1, 0, 0, 169}, + { ITEM_CARBOS, 1, 0, 0, 197}, + { ITEM_ETHER, 1, 0, 0, 105}, + { ITEM_NUGGET, 1, 0, 0, 106}, + { ITEM_REVIVE, 1, 0, 0, 107}, + { ITEM_PP_UP, 1, 0, 0, 122}, + { ITEM_MAX_ETHER, 1, 0, 0, 109}, + { ITEM_MAX_ELIXIR, 1, 0, 0, 110}, + { ITEM_NUGGET, 1, 0, 0, 134}, + { ITEM_CALCIUM, 1, 0, 0, 111}, + { ITEM_ELIXIR, 1, 0, 0, 112}, + { ITEM_MAX_ETHER, 1, 0, 0, 85 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 87 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 216}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 217}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 218}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 219}, + { ITEM_TINYMUSHROOM, 1, 0, 0, 220}, + { ITEM_PP_UP, 1, 0, 0, 198}, + { ITEM_GUARD_SPEC_, 1, 0, 0, 199}, + { ITEM_MAX_REVIVE, 1, 0, 0, 227}, + { ITEM_STAR_PIECE, 1, 0, 0, 145}, + { ITEM_STAR_PIECE, 1, 0, 0, 138}, + { ITEM_HYPER_POTION, 1, 0, 0, 139}, + { ITEM_REVIVE, 1, 0, 0, 195}, + { ITEM_MAX_REVIVE, 1, 0, 0, 196}, + { ITEM_ULTRA_BALL, 1, 0, 0, 113}, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 194}, + { ITEM_NUGGET, 1, 0, 0, 200}, + { ITEM_STARDUST, 1, 0, 0, 174}, + { ITEM_STARDUST, 1, 0, 0, 175}, + { ITEM_STARDUST, 1, 0, 0, 176}, + { ITEM_STARDUST, 1, 0, 0, 177}, + { ITEM_RARE_CANDY, 1, 0, 0, 114}, + { ITEM_IRON, 1, 0, 0, 166}, + { ITEM_STAR_PIECE, 1, 0, 0, 167}, + { ITEM_ESCAPE_ROPE, 1, 0, 0, 88 }, + { ITEM_ICE_HEAL, 1, 0, 0, 89 }, + { ITEM_PEARL, 1, 0, 0, 90 }, + { ITEM_PEARL, 1, 0, 0, 91 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 92 }, + { ITEM_RARE_CANDY, 1, 0, 0, 210}, + { ITEM_ZINC, 1, 0, 0, 223}, + { ITEM_BIG_PEARL, 1, 0, 0, 180}, + { ITEM_PEARL, 1, 0, 0, 178}, + { ITEM_PEARL, 1, 0, 0, 179}, + { ITEM_REVIVE, 1, 0, 0, 207}, + { ITEM_MAX_ELIXIR, 1, 0, 0, 208}, + { ITEM_RARE_CANDY, 1, 0, 0, 115}, + { ITEM_FULL_RESTORE, 1, 0, 0, 116}, + { ITEM_DIRE_HIT, 1, 0, 0, 76 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 77 }, + { ITEM_REVIVE, 1, 0, 0, 201}, + { ITEM_RARE_CANDY, 1, 0, 0, 165}, + { ITEM_MAX_ETHER, 1, 0, 0, 204}, + { ITEM_HYPER_POTION, 1, 0, 0, 205}, + { ITEM_ULTRA_BALL, 1, 0, 0, 202}, + { ITEM_HYPER_POTION, 1, 0, 0, 203}, + { ITEM_MAX_POTION, 1, 0, 0, 78 }, + { ITEM_IRON, 1, 0, 0, 222}, + { ITEM_MAX_REVIVE, 1, 0, 0, 206}, + { ITEM_HYPER_POTION, 1, 0, 0, 93 }, + { ITEM_RARE_CANDY, 1, 0, 0, 94 }, + { ITEM_REVIVE, 1, 0, 0, 95 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 96 }, + { ITEM_PP_UP, 1, 0, 0, 117}, + { ITEM_BIG_PEARL, 1, 0, 0, 118}, + { ITEM_ZINC, 1, 0, 0, 119}, + { ITEM_FULL_HEAL, 1, 0, 0, 120}, + { ITEM_PROTEIN, 1, 0, 0, 221}, + { ITEM_MAX_REVIVE, 1, 0, 0, 121}, + { ITEM_ULTRA_BALL, 1, 0, 0, 123}, + { ITEM_NUGGET, 1, 0, 0, 124}, + { ITEM_DEEPSEATOOTH, 1, 0, 0, 38 }, + { ITEM_DEEPSEASCALE, 1, 0, 0, 229}, + { ITEM_PP_MAX, 1, 0, 0, 230}, }; #endif //_IN_FIELDMAP_C diff --git a/src/easy_chat.c b/src/easy_chat.c index 4f0c8ab95f..32b7af261d 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -54,12 +54,12 @@ static const u16 sNarcMsgBanks[EC_GROUP_MAX] = { }; static const u8 sLanguageToGreetingMap[6][2] = { - { LANGUAGE_JAPANESE, msg_0287_konnichiwa }, - { LANGUAGE_ENGLISH, msg_0287_hello }, - { LANGUAGE_FRENCH, msg_0287_bonjour }, - { LANGUAGE_ITALIAN, msg_0287_ciao }, - { LANGUAGE_GERMAN, msg_0287_hallo }, - { LANGUAGE_SPANISH, msg_0287_hola }, + {LANGUAGE_JAPANESE, msg_0287_konnichiwa}, + { LANGUAGE_ENGLISH, msg_0287_hello }, + { LANGUAGE_FRENCH, msg_0287_bonjour }, + { LANGUAGE_ITALIAN, msg_0287_ciao }, + { LANGUAGE_GERMAN, msg_0287_hallo }, + { LANGUAGE_SPANISH, msg_0287_hola }, }; // Several easy chat words are identical in @@ -86,18 +86,18 @@ typedef struct ECIdenticalPhrases { } ECIdenticalPhrases; static const ECIdenticalPhrases sIdenticalPhrases[12] = { - { sEasyChatAnticipation, NELEMS(sEasyChatAnticipation) }, - { sEasyChatHey, NELEMS(sEasyChatHey) }, - { sEasyChatHuh_, NELEMS(sEasyChatHuh_) }, - { sEasyChatI, NELEMS(sEasyChatI) }, - { sEasyChatKids, NELEMS(sEasyChatKids) }, - { sEasyChatNoWay, NELEMS(sEasyChatNoWay) }, - { sEasyChatOk, NELEMS(sEasyChatOk) }, - { sEasyChatPsychic, NELEMS(sEasyChatPsychic) }, - { sEasyChatSimple, NELEMS(sEasyChatSimple) }, - { sEasyChatWelcome, NELEMS(sEasyChatWelcome) }, - { sEasyChatWow, NELEMS(sEasyChatWow) }, - { sEasyChatYou, NELEMS(sEasyChatYou) }, + {sEasyChatAnticipation, NELEMS(sEasyChatAnticipation)}, + { sEasyChatHey, NELEMS(sEasyChatHey) }, + { sEasyChatHuh_, NELEMS(sEasyChatHuh_) }, + { sEasyChatI, NELEMS(sEasyChatI) }, + { sEasyChatKids, NELEMS(sEasyChatKids) }, + { sEasyChatNoWay, NELEMS(sEasyChatNoWay) }, + { sEasyChatOk, NELEMS(sEasyChatOk) }, + { sEasyChatPsychic, NELEMS(sEasyChatPsychic) }, + { sEasyChatSimple, NELEMS(sEasyChatSimple) }, + { sEasyChatWelcome, NELEMS(sEasyChatWelcome) }, + { sEasyChatWow, NELEMS(sEasyChatWow) }, + { sEasyChatYou, NELEMS(sEasyChatYou) }, }; EasyChatManager *EasyChatManager_New(HeapID heapId) { diff --git a/src/field/headbutt.c b/src/field/headbutt.c index 3ff09d42f7..027f2c18fa 100644 --- a/src/field/headbutt.c +++ b/src/field/headbutt.c @@ -47,55 +47,55 @@ static const s8 sRareTreeLUT_1[][1] = { }; static const s8 sRareTreeLUT_2[][2] = { - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON }, + {TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON}, }; static const s8 sRareTreeLUT_3[][3] = { - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_NONE, TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + {TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_NONE, TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, }; static const s8 sRareTreeLUT_4[][4] = { - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON }, - { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, + {TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON}, + { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, }; static const s8 sRareTreeLUT_5Plus[][5] = { - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + {TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, }; typedef struct TaskData_TryHeadbuttEncounter { diff --git a/src/field/legend_cutscene_camera.c b/src/field/legend_cutscene_camera.c index 75099fa28e..938a288de1 100644 --- a/src/field/legend_cutscene_camera.c +++ b/src/field/legend_cutscene_camera.c @@ -224,18 +224,18 @@ static const CameraParam sCameraParam_SoulSilver[] = { }; static const VecFx32 sCameraOffset_HeartGold[] = { - { -FX32_CONST(195), -FX32_CONST(148.605), -FX32_CONST(45.19165) }, - { FX32_CONST(198), -FX32_CONST(148.605), -FX32_CONST(45.19165) }, - { 0, -FX32_CONST(35.751708984375), -FX32_CONST(23.0476) }, - { 0, FX32_CONST(495.6323), FX32_CONST(28.73) }, + {-FX32_CONST(195), -FX32_CONST(148.605), -FX32_CONST(45.19165)}, + { FX32_CONST(198), -FX32_CONST(148.605), -FX32_CONST(45.19165)}, + { 0, -FX32_CONST(35.751708984375), -FX32_CONST(23.0476) }, + { 0, FX32_CONST(495.6323), FX32_CONST(28.73) }, }; static const VecFx32 sCameraOffset_SoulSilver[] = { - { -FX32_CONST(127), 0, -FX32_CONST(208) }, - { FX32_CONST(63), 0, -FX32_CONST(208) }, - { 0, 0, -FX32_CONST(82) }, - { 0, 0, -FX32_CONST(433) }, - { 0, 0, -FX32_CONST(225) }, + {-FX32_CONST(127), 0, -FX32_CONST(208)}, + { FX32_CONST(63), 0, -FX32_CONST(208)}, + { 0, 0, -FX32_CONST(82) }, + { 0, 0, -FX32_CONST(433)}, + { 0, 0, -FX32_CONST(225)}, }; static const u8 sBg3TilemapFileIDs[] = { diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 0488b694ce..c0c9aaf410 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -939,9 +939,9 @@ BOOL ScrCmd_743(ScriptContext *ctx) { } static const u8 sFriendshipRoomStatuesPositions[3][2] = { - { 4, 10 }, - { 7, 5 }, - { 10, 10 }, + {4, 10}, + { 7, 5 }, + { 10, 10}, }; BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { @@ -1163,8 +1163,8 @@ BOOL ScrCmd_RadioMusicIsPlaying(ScriptContext *ctx) { } static const int sSlotLuckDistribution[2][2] = { - { 7, 3 }, - { 5, 2 }, + {7, 3}, + { 5, 2}, }; // Return value is unused outside of Japanese copies. diff --git a/src/field_move.c b/src/field_move.c index cb9c092ee0..afa9e4b84d 100644 --- a/src/field_move.c +++ b/src/field_move.c @@ -71,20 +71,20 @@ static BOOL Task_UseHeadbuttInField(TaskManager *taskManager); static struct TeleportFieldEnv *sub_020689A4(HeapID heapId, u8 slotno, SaveData *saveData); static const struct FieldMoveFuncDat sFieldMoveFuncTable[] = { - { FieldMoveMenuUse_Cut, FieldMoveMenuCheck_Cut }, - { FieldMoveMenuUse_Fly, FieldMoveMenuCheck_Fly }, - { FieldMoveMenuUse_Surf, FieldMoveMenuCheck_Surf }, - { FieldMoveMenuUse_Strength, FieldMoveMenuCheck_Strength }, - { FieldMoveMenuUse_RockSmash, FieldMoveMenuCheck_RockSmash }, - { FieldMoveMenuUse_Waterfall, FieldMoveMenuCheck_Waterfall }, - { FieldMoveMenuUse_RockClimb, FieldMoveMenuCheck_RockClimb }, - { FieldMoveMenuUse_Flash, FieldMoveMenuCheck_Flash }, - { FieldMoveMenuUse_Teleport, FieldMoveMenuCheck_Teleport }, - { FieldMoveMenuUse_Dig, FieldMoveMenuCheck_Dig }, - { FieldMoveMenuUse_SweetScent, FieldMoveMenuCheck_SweetScent }, - { FieldMoveMenuUse_Chatter, FieldMoveMenuCheck_Chatter }, - { FieldMoveMenuUse_Whirlpool, FieldMoveMenuCheck_Whirlpool }, - { FieldMoveMenuUse_Headbutt, FieldMoveMenuCheck_Headbutt }, + {FieldMoveMenuUse_Cut, FieldMoveMenuCheck_Cut }, + { FieldMoveMenuUse_Fly, FieldMoveMenuCheck_Fly }, + { FieldMoveMenuUse_Surf, FieldMoveMenuCheck_Surf }, + { FieldMoveMenuUse_Strength, FieldMoveMenuCheck_Strength }, + { FieldMoveMenuUse_RockSmash, FieldMoveMenuCheck_RockSmash }, + { FieldMoveMenuUse_Waterfall, FieldMoveMenuCheck_Waterfall }, + { FieldMoveMenuUse_RockClimb, FieldMoveMenuCheck_RockClimb }, + { FieldMoveMenuUse_Flash, FieldMoveMenuCheck_Flash }, + { FieldMoveMenuUse_Teleport, FieldMoveMenuCheck_Teleport }, + { FieldMoveMenuUse_Dig, FieldMoveMenuCheck_Dig }, + { FieldMoveMenuUse_SweetScent, FieldMoveMenuCheck_SweetScent}, + { FieldMoveMenuUse_Chatter, FieldMoveMenuCheck_Chatter }, + { FieldMoveMenuUse_Whirlpool, FieldMoveMenuCheck_Whirlpool }, + { FieldMoveMenuUse_Headbutt, FieldMoveMenuCheck_Headbutt }, }; static inline BOOL MoveUseCheck_SafariOrPalPark(const FieldMoveCheckData *checkData) { diff --git a/src/field_roamer.c b/src/field_roamer.c index d1387cce8c..1a25d33408 100644 --- a/src/field_roamer.c +++ b/src/field_roamer.c @@ -69,50 +69,50 @@ static const u32 sRoamerLocations[ROAMER_LOC_COUNT] = { }; static const struct RoamerAdjacency sRoamerAdjacencyTable[ROAMER_LOC_COUNT] = { - // Johto - { 2, { ROAMER_LOC_R30, ROAMER_LOC_R46, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R29, ROAMER_LOC_R31, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R30, ROAMER_LOC_R32, ROAMER_LOC_R36, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R31, ROAMER_LOC_R33, ROAMER_LOC_R36, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R32, ROAMER_LOC_R34, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R33, ROAMER_LOC_R35, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R34, ROAMER_LOC_R36, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R31, ROAMER_LOC_R32, ROAMER_LOC_R37, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R36, ROAMER_LOC_R38, ROAMER_LOC_R42, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R37, ROAMER_LOC_R39, ROAMER_LOC_R42, -1, -1, -1 } }, - { 1, { ROAMER_LOC_R38, -1, -1, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R37, ROAMER_LOC_R38, ROAMER_LOC_R43, ROAMER_LOC_R44, -1, -1 } }, - { 2, { ROAMER_LOC_R42, ROAMER_LOC_R44, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R42, ROAMER_LOC_R43, ROAMER_LOC_R46, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R44, ROAMER_LOC_R46, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R29, ROAMER_LOC_R45, -1, -1, -1, -1 } }, + // Johto + {2, { ROAMER_LOC_R30, ROAMER_LOC_R46, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R29, ROAMER_LOC_R31, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R30, ROAMER_LOC_R32, ROAMER_LOC_R36, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R31, ROAMER_LOC_R33, ROAMER_LOC_R36, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R32, ROAMER_LOC_R34, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R33, ROAMER_LOC_R35, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R34, ROAMER_LOC_R36, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R31, ROAMER_LOC_R32, ROAMER_LOC_R37, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R36, ROAMER_LOC_R38, ROAMER_LOC_R42, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R37, ROAMER_LOC_R39, ROAMER_LOC_R42, -1, -1, -1 } }, + { 1, { ROAMER_LOC_R38, -1, -1, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R37, ROAMER_LOC_R38, ROAMER_LOC_R43, ROAMER_LOC_R44, -1, -1 } }, + { 2, { ROAMER_LOC_R42, ROAMER_LOC_R44, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R42, ROAMER_LOC_R43, ROAMER_LOC_R46, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R44, ROAMER_LOC_R46, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R29, ROAMER_LOC_R45, -1, -1, -1, -1 } }, - // Kanto - { 2, { ROAMER_LOC_R02, ROAMER_LOC_R22, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R01, ROAMER_LOC_R22, ROAMER_LOC_R03, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R02, ROAMER_LOC_R04, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R03, ROAMER_LOC_R05, ROAMER_LOC_R24, -1, -1, -1 } }, - { 6, { ROAMER_LOC_R04, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R24 } }, - { 3, { ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R11, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R08, ROAMER_LOC_R16, -1, -1 } }, - { 5, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R10, ROAMER_LOC_R12, -1 } }, - { 4, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R10, ROAMER_LOC_R24, -1, -1 } }, - { 3, { ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R12, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R06, ROAMER_LOC_R12, -1, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R08, ROAMER_LOC_R10, ROAMER_LOC_R11, ROAMER_LOC_R13, -1, -1 } }, - { 2, { ROAMER_LOC_R12, ROAMER_LOC_R14, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R13, ROAMER_LOC_R15, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R14, ROAMER_LOC_R18, ROAMER_LOC_W19, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R07, ROAMER_LOC_R22, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R16, ROAMER_LOC_R18, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R15, ROAMER_LOC_R17, ROAMER_LOC_W19, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R15, ROAMER_LOC_R18, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_W19, ROAMER_LOC_W21, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R01, ROAMER_LOC_W19, -1, -1, -1 /*,-1*/ } }, - { 4, { ROAMER_LOC_R01, ROAMER_LOC_R02, ROAMER_LOC_R26, ROAMER_LOC_R28, -1, -1 } }, - { 3, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R09, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R22, ROAMER_LOC_R28, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R22, ROAMER_LOC_R26, ROAMER_LOC_R09, -1, -1, -1 } }, + // Kanto + { 2, { ROAMER_LOC_R02, ROAMER_LOC_R22, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R01, ROAMER_LOC_R22, ROAMER_LOC_R03, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R02, ROAMER_LOC_R04, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R03, ROAMER_LOC_R05, ROAMER_LOC_R24, -1, -1, -1 } }, + { 6, { ROAMER_LOC_R04, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R24 }}, + { 3, { ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R11, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R08, ROAMER_LOC_R16, -1, -1 } }, + { 5, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R10, ROAMER_LOC_R12, -1 } }, + { 4, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R10, ROAMER_LOC_R24, -1, -1 } }, + { 3, { ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R12, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R06, ROAMER_LOC_R12, -1, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R08, ROAMER_LOC_R10, ROAMER_LOC_R11, ROAMER_LOC_R13, -1, -1 } }, + { 2, { ROAMER_LOC_R12, ROAMER_LOC_R14, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R13, ROAMER_LOC_R15, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R14, ROAMER_LOC_R18, ROAMER_LOC_W19, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R07, ROAMER_LOC_R22, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R16, ROAMER_LOC_R18, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R15, ROAMER_LOC_R17, ROAMER_LOC_W19, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R15, ROAMER_LOC_R18, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_W19, ROAMER_LOC_W21, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R01, ROAMER_LOC_W19, -1, -1, -1 /*,-1*/ } }, + { 4, { ROAMER_LOC_R01, ROAMER_LOC_R02, ROAMER_LOC_R26, ROAMER_LOC_R28, -1, -1 } }, + { 3, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R09, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R22, ROAMER_LOC_R28, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R22, ROAMER_LOC_R26, ROAMER_LOC_R09, -1, -1, -1 } }, }; void RoamerLocationUpdateRand(RoamerSaveData *roamer, u8 roamer_idx) { diff --git a/src/field_system_rtc_weather.c b/src/field_system_rtc_weather.c index 0a558e06e0..f4fd1c5085 100644 --- a/src/field_system_rtc_weather.c +++ b/src/field_system_rtc_weather.c @@ -9,14 +9,14 @@ #include "unk_02055418.h" const MonthDay DiamondDustDates[] = { - { JANUARY, 1 }, - { JANUARY, 31 }, - { FEBRUARY, 1 }, - { FEBRUARY, 29 }, - { MARCH, 15 }, - { OCTOBER, 10 }, - { DECEMBER, 3 }, - { DECEMBER, 31 }, + {JANUARY, 1 }, + { JANUARY, 31}, + { FEBRUARY, 1 }, + { FEBRUARY, 29}, + { MARCH, 15}, + { OCTOBER, 10}, + { DECEMBER, 3 }, + { DECEMBER, 31}, }; //_020FA09C u32 FieldSystem_GetWeather_HandleDiamondDust(FieldSystem *fieldSystem, u32 mapId) { diff --git a/src/field_take_photo.c b/src/field_take_photo.c index f548feedf5..521fa7a736 100644 --- a/src/field_take_photo.c +++ b/src/field_take_photo.c @@ -121,12 +121,12 @@ typedef struct Coord2U16 { static const Coord2U16 sSoloPhotoMonCoordOffsets = { 1, -1 }; static const Coord2U16 sPhotoMonCoordOffsets[] = { - { 2, 0 }, - { 1, -1 }, - { -1, -1 }, - { 3, -1 }, - { 0, -2 }, - { 2, -2 }, + {2, 0 }, + { 1, -1}, + { -1, -1}, + { 3, -1}, + { 0, -2}, + { 2, -2}, }; static PhotoCameraParam sCameraParam = { diff --git a/src/field_use_item.c b/src/field_use_item.c index d15a154162..1f72191c35 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -99,36 +99,36 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager); static void RegisteredItem_CreateGoToAppTask(struct ItemFieldUseData *data, FieldApplicationWorkCtor ctor, BOOL no_app); static const struct ItemUseFuncDat sItemFieldUseFuncs[] = { - { NULL, ItemFieldUseFunc_Generic, NULL }, - { ItemMenuUseFunc_HealingItem, NULL, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_Bicycle, ItemFieldUseFunc_Bicycle, ItemCheckUseFunc_Bicycle }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_TMHM, NULL, NULL }, - { ItemMenuUseFunc_Mail, NULL, NULL }, - { ItemMenuUseFunc_Berry, NULL, ItemCheckUseFunc_Berry }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_PalPad, ItemFieldUseFunc_PalPad, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_Honey, NULL, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_OldRod, ItemFieldUseFunc_OldRod, ItemCheckUseFunc_FishingRod }, - { ItemMenuUseFunc_GoodRod, ItemFieldUseFunc_GoodRod, ItemCheckUseFunc_FishingRod }, - { ItemMenuUseFunc_SuperRod, ItemFieldUseFunc_SuperRod, ItemCheckUseFunc_FishingRod }, - { NULL, ItemFieldUseFunc_Generic, NULL }, - { ItemMenuUseFunc_EvoStone, NULL, NULL }, - { ItemMenuUseFunc_EscapeRope, NULL, ItemCheckUseFunc_EscapeRope }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_ApricornBox, ItemFieldUseFunc_ApricornBox, NULL }, - { ItemMenuUseFunc_BerryPots, ItemFieldUseFunc_BerryPots, NULL }, - { ItemMenuUseFunc_UnownReport, ItemFieldUseFunc_UnownReport, NULL }, - { ItemMenuUseFunc_DowsingMchn, ItemFieldUseFunc_DowsingMchn, NULL }, - { NULL, ItemFieldUseFunc_GbSounds, NULL }, - { ItemMenuUseFunc_Gracidea, ItemFieldUseFunc_Gracidea, NULL }, - { ItemMenuUseFunc_VSRecorder, ItemFieldUseFunc_VSRecorder, NULL }, + {NULL, ItemFieldUseFunc_Generic, NULL }, + { ItemMenuUseFunc_HealingItem, NULL, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_Bicycle, ItemFieldUseFunc_Bicycle, ItemCheckUseFunc_Bicycle }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_TMHM, NULL, NULL }, + { ItemMenuUseFunc_Mail, NULL, NULL }, + { ItemMenuUseFunc_Berry, NULL, ItemCheckUseFunc_Berry }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_PalPad, ItemFieldUseFunc_PalPad, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_Honey, NULL, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_OldRod, ItemFieldUseFunc_OldRod, ItemCheckUseFunc_FishingRod}, + { ItemMenuUseFunc_GoodRod, ItemFieldUseFunc_GoodRod, ItemCheckUseFunc_FishingRod}, + { ItemMenuUseFunc_SuperRod, ItemFieldUseFunc_SuperRod, ItemCheckUseFunc_FishingRod}, + { NULL, ItemFieldUseFunc_Generic, NULL }, + { ItemMenuUseFunc_EvoStone, NULL, NULL }, + { ItemMenuUseFunc_EscapeRope, NULL, ItemCheckUseFunc_EscapeRope}, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_ApricornBox, ItemFieldUseFunc_ApricornBox, NULL }, + { ItemMenuUseFunc_BerryPots, ItemFieldUseFunc_BerryPots, NULL }, + { ItemMenuUseFunc_UnownReport, ItemFieldUseFunc_UnownReport, NULL }, + { ItemMenuUseFunc_DowsingMchn, ItemFieldUseFunc_DowsingMchn, NULL }, + { NULL, ItemFieldUseFunc_GbSounds, NULL }, + { ItemMenuUseFunc_Gracidea, ItemFieldUseFunc_Gracidea, NULL }, + { ItemMenuUseFunc_VSRecorder, ItemFieldUseFunc_VSRecorder, NULL }, }; void *GetItemFieldUseFunc(int funcType, u16 itemType) { diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index b690280833..b8c6641ac5 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -102,12 +102,12 @@ static BOOL sub_02053F70(TaskManager *taskManager); static BOOL sub_020540A4(TaskManager *taskManager); static const struct UnkStruct_020FC5CC _020FC5CC[] = { - { 1, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, - { 1, 2, 0, 0, 0, 1, 0, 0, 64, 12 }, - { 3, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, - { 1, 1, 1, 0, 1, 1, 1, 0, 64, 12 }, - { 1, 1, 1, 0, 1, 1, 1, 0, 0, 10 }, - { 6, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, + {1, 0, 0, 0, 0, 1, 0, 0, 64, 12}, + { 1, 2, 0, 0, 0, 1, 0, 0, 64, 12}, + { 3, 0, 0, 0, 0, 1, 0, 0, 64, 12}, + { 1, 1, 1, 0, 1, 1, 1, 0, 64, 12}, + { 1, 1, 1, 0, 1, 1, 1, 0, 0, 10}, + { 6, 0, 0, 0, 0, 1, 0, 0, 64, 12}, }; static void sub_02052F30(FieldSystem *fieldSystem) { diff --git a/src/fieldmap.c b/src/fieldmap.c index cddb115516..1d6a4f618b 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -31,36 +31,36 @@ struct HiddenItemData { #include "data/fieldmap.h" const struct ScriptBankMapping sScriptBankMapping[30] = { - { _std_scratch_card, NARC_scr_seq_scr_seq_0263_bin, NARC_msg_msg_0433_bin }, - { _std_frontier_records, NARC_scr_seq_scr_seq_0264_bin, NARC_msg_msg_0019_bin }, - { _std_frontier_move_tutor, NARC_scr_seq_scr_seq_0002_bin, NARC_msg_msg_0748_bin }, - { _std_bug_contest, NARC_scr_seq_scr_seq_0151_bin, NARC_msg_msg_0246_bin }, - { _std_trainer_house, NARC_scr_seq_scr_seq_0952_bin, NARC_msg_msg_0726_bin }, - { 10300, NARC_scr_seq_scr_seq_0734_bin, NARC_msg_msg_0444_bin }, - { _std_mystery_gift, NARC_scr_seq_scr_seq_0144_bin, NARC_msg_msg_0209_bin }, - { 10150, NARC_scr_seq_scr_seq_0955_bin, NARC_msg_msg_0732_bin }, - { _std_tv, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin }, - { _std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin }, - { _std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin }, - { 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin }, - { _std_pokeathlon, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin }, - { 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin }, - { _std_following_mon, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin }, - { _std_init, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin }, - { _std_daycare, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin }, - { _std_group, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin }, - { _std_wifi_reception, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin }, - { _std_colosseum, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin }, - { _std_comm_reception, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin }, - { _std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin }, - { _std_safari, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin }, - { _std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin }, // Hidden Items - { _std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin }, - { _std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin }, - { _std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin }, - { _std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin }, - { _std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin }, - { _std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin }, + {_std_scratch_card, NARC_scr_seq_scr_seq_0263_bin, NARC_msg_msg_0433_bin}, + { _std_frontier_records, NARC_scr_seq_scr_seq_0264_bin, NARC_msg_msg_0019_bin}, + { _std_frontier_move_tutor, NARC_scr_seq_scr_seq_0002_bin, NARC_msg_msg_0748_bin}, + { _std_bug_contest, NARC_scr_seq_scr_seq_0151_bin, NARC_msg_msg_0246_bin}, + { _std_trainer_house, NARC_scr_seq_scr_seq_0952_bin, NARC_msg_msg_0726_bin}, + { 10300, NARC_scr_seq_scr_seq_0734_bin, NARC_msg_msg_0444_bin}, + { _std_mystery_gift, NARC_scr_seq_scr_seq_0144_bin, NARC_msg_msg_0209_bin}, + { 10150, NARC_scr_seq_scr_seq_0955_bin, NARC_msg_msg_0732_bin}, + { _std_tv, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin}, + { _std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin}, + { _std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin}, + { 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin}, + { _std_pokeathlon, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin}, + { 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin}, + { _std_following_mon, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin}, + { _std_init, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin}, + { _std_daycare, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin}, + { _std_group, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin}, + { _std_wifi_reception, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin}, + { _std_colosseum, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin}, + { _std_comm_reception, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin}, + { _std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin}, + { _std_safari, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin}, + { _std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin}, // Hidden Items + { _std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin}, + { _std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin}, + { _std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin}, + { _std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin}, + { _std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin}, + { _std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin}, }; void StartMapSceneScript(FieldSystem *fieldSystem, u16 script, LocalMapObject *lastInteracted) { diff --git a/src/font.c b/src/font.c index be6e5e2f07..8c688ded8e 100644 --- a/src/font.c +++ b/src/font.c @@ -17,22 +17,22 @@ struct FontWork { static struct FontWork *sFontWork = NULL; static const u16 sFontArcParam[][2] = { - { 0x0000, FALSE }, - { 0x0001, FALSE }, - { 0x0002, FALSE }, - { 0x0003, FALSE }, - { 0x0004, FALSE }, - { 0x000A, FALSE }, + {0x0000, FALSE}, + { 0x0001, FALSE}, + { 0x0002, FALSE}, + { 0x0003, FALSE}, + { 0x0004, FALSE}, + { 0x000A, FALSE}, }; static const struct FontInfo sFontInfos[] = { - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + {0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, }; void FontWork_Init(void) { diff --git a/src/font_data.c b/src/font_data.c index 81f8cf3fc6..f9865a0a48 100644 --- a/src/font_data.c +++ b/src/font_data.c @@ -77,8 +77,8 @@ void FontData_ModeSwitch(struct FontData *fontData, int mode, HeapID heapId) { static void FontData_Init(struct FontData *fontData, NarcId narcId, int fileId, BOOL isFixedWidth, HeapID heapId) { static const u8 _020F6324[][2] = { - { GLYPHSHAPE_8x8, GLYPHSHAPE_8x16 }, - { GLYPHSHAPE_16x8, GLYPHSHAPE_16x16 } + {GLYPHSHAPE_8x8, GLYPHSHAPE_8x16 }, + { GLYPHSHAPE_16x8, GLYPHSHAPE_16x16} }; fontData->narc = NARC_New(narcId, heapId); if (fontData->narc != NULL) { diff --git a/src/get_egg.c b/src/get_egg.c index 043c203ba1..84d64422f2 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -529,15 +529,15 @@ void Save_Daycare_ResetEggStats(Daycare *dayCare) { } static const u16 _020FF4AE[][3] = { - { SPECIES_WYNAUT, ITEM_LAX_INCENSE, SPECIES_WOBBUFFET }, - { SPECIES_AZURILL, ITEM_SEA_INCENSE, SPECIES_MARILL }, - { SPECIES_MIME_JR, ITEM_ODD_INCENSE, SPECIES_MR_MIME }, - { SPECIES_BONSLY, ITEM_ROCK_INCENSE, SPECIES_SUDOWOODO }, - { SPECIES_MUNCHLAX, ITEM_FULL_INCENSE, SPECIES_SNORLAX }, - { SPECIES_MANTYKE, ITEM_WAVE_INCENSE, SPECIES_MANTINE }, - { SPECIES_BUDEW, ITEM_ROSE_INCENSE, SPECIES_ROSELIA }, - { SPECIES_HAPPINY, ITEM_LUCK_INCENSE, SPECIES_CHANSEY }, - { SPECIES_CHINGLING, ITEM_PURE_INCENSE, SPECIES_CHIMECHO }, + {SPECIES_WYNAUT, ITEM_LAX_INCENSE, SPECIES_WOBBUFFET}, + { SPECIES_AZURILL, ITEM_SEA_INCENSE, SPECIES_MARILL }, + { SPECIES_MIME_JR, ITEM_ODD_INCENSE, SPECIES_MR_MIME }, + { SPECIES_BONSLY, ITEM_ROCK_INCENSE, SPECIES_SUDOWOODO}, + { SPECIES_MUNCHLAX, ITEM_FULL_INCENSE, SPECIES_SNORLAX }, + { SPECIES_MANTYKE, ITEM_WAVE_INCENSE, SPECIES_MANTINE }, + { SPECIES_BUDEW, ITEM_ROSE_INCENSE, SPECIES_ROSELIA }, + { SPECIES_HAPPINY, ITEM_LUCK_INCENSE, SPECIES_CHANSEY }, + { SPECIES_CHINGLING, ITEM_PURE_INCENSE, SPECIES_CHIMECHO }, }; static u16 Daycare_BreedingIncenseCheck(u16 species, Daycare *dayCare) { diff --git a/src/gymmick_init.c b/src/gymmick_init.c index 994bb1fde5..c11a22d592 100644 --- a/src/gymmick_init.c +++ b/src/gymmick_init.c @@ -19,21 +19,21 @@ typedef struct TrashCan { } TrashCan; static const TrashCan sTrashCans[NUM_TRASH_CANS] = { - [0] = { .numNeighbors = 2, .neighbors = { 1, 5, 0xFF, 0xFF } }, - [1] = { .numNeighbors = 3, .neighbors = { 0, 2, 6, 0xFF } }, - [2] = { .numNeighbors = 3, .neighbors = { 1, 3, 7, 0xFF } }, - [3] = { .numNeighbors = 3, .neighbors = { 2, 4, 8, 0xFF } }, - [4] = { .numNeighbors = 2, .neighbors = { 3, 9, 0xFF, 0xFF } }, - [5] = { .numNeighbors = 3, .neighbors = { 0, 6, 10, 0xFF } }, - [6] = { .numNeighbors = 4, .neighbors = { 1, 5, 7, 11 } }, - [7] = { .numNeighbors = 4, .neighbors = { 2, 6, 8, 12 } }, - [8] = { .numNeighbors = 4, .neighbors = { 3, 7, 9, 13 } }, - [9] = { .numNeighbors = 3, .neighbors = { 4, 8, 14, 0xFF } }, - [10] = { .numNeighbors = 2, .neighbors = { 5, 11, 0xFF, 0xFF } }, - [11] = { .numNeighbors = 3, .neighbors = { 6, 10, 12, 0xFF } }, - [12] = { .numNeighbors = 3, .neighbors = { 7, 11, 13, 0xFF } }, - [13] = { .numNeighbors = 3, .neighbors = { 8, 12, 14, 0xFF } }, - [14] = { .numNeighbors = 2, .neighbors = { 9, 13, 0xFF, 0xFF } }, + [0] = {.numNeighbors = 2, .neighbors = { 1, 5, 0xFF, 0xFF } }, + [1] = { .numNeighbors = 3, .neighbors = { 0, 2, 6, 0xFF } }, + [2] = { .numNeighbors = 3, .neighbors = { 1, 3, 7, 0xFF } }, + [3] = { .numNeighbors = 3, .neighbors = { 2, 4, 8, 0xFF } }, + [4] = { .numNeighbors = 2, .neighbors = { 3, 9, 0xFF, 0xFF } }, + [5] = { .numNeighbors = 3, .neighbors = { 0, 6, 10, 0xFF } }, + [6] = { .numNeighbors = 4, .neighbors = { 1, 5, 7, 11 } }, + [7] = { .numNeighbors = 4, .neighbors = { 2, 6, 8, 12 } }, + [8] = { .numNeighbors = 4, .neighbors = { 3, 7, 9, 13 } }, + [9] = { .numNeighbors = 3, .neighbors = { 4, 8, 14, 0xFF } }, + [10] = { .numNeighbors = 2, .neighbors = { 5, 11, 0xFF, 0xFF }}, + [11] = { .numNeighbors = 3, .neighbors = { 6, 10, 12, 0xFF } }, + [12] = { .numNeighbors = 3, .neighbors = { 7, 11, 13, 0xFF } }, + [13] = { .numNeighbors = 3, .neighbors = { 8, 12, 14, 0xFF } }, + [14] = { .numNeighbors = 2, .neighbors = { 9, 13, 0xFF, 0xFF }}, }; void InitEcruteakGym(FieldSystem *fieldSystem) { diff --git a/src/intro_movie_scene_3.c b/src/intro_movie_scene_3.c index 004f26228e..a1f8b670dc 100644 --- a/src/intro_movie_scene_3.c +++ b/src/intro_movie_scene_3.c @@ -80,10 +80,10 @@ static const int sMap3dObjFileIds[3][2] = { static const CameraParam sCameraParam = { FX32_CONST(410.922119140625), - { 0xD602, + {0xD602, 0x0000, 0x0000, - 0 }, + 0}, 0, 0x05C1, FALSE, @@ -122,9 +122,9 @@ static const VecFx32 sLightVectors[3][4] = { }; static const GXRgb sLightColors[3][4] = { - { RGB(22, 22, 20), RGB(0, 0, 0), RGB(0, 4, 9), RGB(0, 0, 0) }, - { RGB(11, 11, 16), RGB(0, 0, 0), RGB(18, 10, 0), RGB(0, 0, 0) }, - { RGB(19, 16, 12), RGB(0, 0, 0), RGB(16, 6, 0), RGB(0, 0, 0) }, + {RGB(22, 22, 20), RGB(0, 0, 0), RGB(0, 4, 9), RGB(0, 0, 0)}, + { RGB(11, 11, 16), RGB(0, 0, 0), RGB(18, 10, 0), RGB(0, 0, 0)}, + { RGB(19, 16, 12), RGB(0, 0, 0), RGB(16, 6, 0), RGB(0, 0, 0)}, }; static const GXRgb sDiffUse[3] = { diff --git a/src/intro_movie_scene_4.c b/src/intro_movie_scene_4.c index add9aa550b..426dbf6fcc 100644 --- a/src/intro_movie_scene_4.c +++ b/src/intro_movie_scene_4.c @@ -58,9 +58,9 @@ static void IntroMovie_Scene4_FlipScreensAtNextVBlank(IntroMovieScene4Data *scen static void Task_IntroMovie_Scene4_FlipScreens(SysTask *task, void *pVoid); static const int sStarterParticleResIds[3][3] = { - { 6, 7, 8 }, - { 3, 4, 5 }, - { 0, 1, 2 } + {6, 7, 8}, + { 3, 4, 5}, + { 0, 1, 2} }; static const u8 sIntroMovieScene4SpriteResCounts[4] = { 4, 4, 4, 4 }; diff --git a/src/item.c b/src/item.c index bd345812d0..4ef0e2fbd0 100644 --- a/src/item.c +++ b/src/item.c @@ -132,543 +132,543 @@ static const u16 sTMHMMoves[] = { }; static const u16 sItemNarcIds[ITEMS_COUNT][4] = { - [ITEM_NONE] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_MASTER_BALL] = { NARC_item_data_0001_bin, NARC_item_icon_item_icon_002_NCGR, NARC_item_icon_item_icon_003_NCLR, AGB_ITEM_MASTER_BALL }, - [ITEM_ULTRA_BALL] = { NARC_item_data_0002_bin, NARC_item_icon_item_icon_004_NCGR, NARC_item_icon_item_icon_005_NCLR, AGB_ITEM_ULTRA_BALL }, - [ITEM_GREAT_BALL] = { NARC_item_data_0003_bin, NARC_item_icon_item_icon_006_NCGR, NARC_item_icon_item_icon_007_NCLR, AGB_ITEM_GREAT_BALL }, - [ITEM_POKE_BALL] = { NARC_item_data_0004_bin, NARC_item_icon_item_icon_008_NCGR, NARC_item_icon_item_icon_009_NCLR, AGB_ITEM_POKE_BALL }, - [ITEM_SAFARI_BALL] = { NARC_item_data_0005_bin, NARC_item_icon_item_icon_010_NCGR, NARC_item_icon_item_icon_011_NCLR, AGB_ITEM_SAFARI_BALL }, - [ITEM_NET_BALL] = { NARC_item_data_0006_bin, NARC_item_icon_item_icon_012_NCGR, NARC_item_icon_item_icon_013_NCLR, AGB_ITEM_NET_BALL }, - [ITEM_DIVE_BALL] = { NARC_item_data_0007_bin, NARC_item_icon_item_icon_014_NCGR, NARC_item_icon_item_icon_015_NCLR, AGB_ITEM_DIVE_BALL }, - [ITEM_NEST_BALL] = { NARC_item_data_0008_bin, NARC_item_icon_item_icon_016_NCGR, NARC_item_icon_item_icon_017_NCLR, AGB_ITEM_NEST_BALL }, - [ITEM_REPEAT_BALL] = { NARC_item_data_0009_bin, NARC_item_icon_item_icon_018_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_REPEAT_BALL }, - [ITEM_TIMER_BALL] = { NARC_item_data_0010_bin, NARC_item_icon_item_icon_020_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_TIMER_BALL }, - [ITEM_LUXURY_BALL] = { NARC_item_data_0011_bin, NARC_item_icon_item_icon_021_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_LUXURY_BALL }, - [ITEM_PREMIER_BALL] = { NARC_item_data_0012_bin, NARC_item_icon_item_icon_023_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_PREMIER_BALL }, - [ITEM_DUSK_BALL] = { NARC_item_data_0013_bin, NARC_item_icon_item_icon_663_NCGR, NARC_item_icon_item_icon_664_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAL_BALL] = { NARC_item_data_0014_bin, NARC_item_icon_item_icon_665_NCGR, NARC_item_icon_item_icon_666_NCLR, AGB_ITEM_NONE }, - [ITEM_QUICK_BALL] = { NARC_item_data_0015_bin, NARC_item_icon_item_icon_667_NCGR, NARC_item_icon_item_icon_668_NCLR, AGB_ITEM_NONE }, - [ITEM_CHERISH_BALL] = { NARC_item_data_0016_bin, NARC_item_icon_item_icon_669_NCGR, NARC_item_icon_item_icon_670_NCLR, AGB_ITEM_NONE }, - [ITEM_POTION] = { NARC_item_data_0017_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_025_NCLR, AGB_ITEM_POTION }, - [ITEM_ANTIDOTE] = { NARC_item_data_0018_bin, NARC_item_icon_item_icon_026_NCGR, NARC_item_icon_item_icon_027_NCLR, AGB_ITEM_ANTIDOTE }, - [ITEM_BURN_HEAL] = { NARC_item_data_0019_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_028_NCLR, AGB_ITEM_BURN_HEAL }, - [ITEM_ICE_HEAL] = { NARC_item_data_0020_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_029_NCLR, AGB_ITEM_ICE_HEAL }, - [ITEM_AWAKENING] = { NARC_item_data_0021_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_031_NCLR, AGB_ITEM_AWAKENING }, - [ITEM_PARLYZ_HEAL] = { NARC_item_data_0022_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_032_NCLR, AGB_ITEM_PARALYZE_HEAL }, - [ITEM_FULL_RESTORE] = { NARC_item_data_0023_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_034_NCLR, AGB_ITEM_FULL_RESTORE }, - [ITEM_MAX_POTION] = { NARC_item_data_0024_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_035_NCLR, AGB_ITEM_MAX_POTION }, - [ITEM_HYPER_POTION] = { NARC_item_data_0025_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_036_NCLR, AGB_ITEM_HYPER_POTION }, - [ITEM_SUPER_POTION] = { NARC_item_data_0026_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_037_NCLR, AGB_ITEM_SUPER_POTION }, - [ITEM_FULL_HEAL] = { NARC_item_data_0027_bin, NARC_item_icon_item_icon_038_NCGR, NARC_item_icon_item_icon_039_NCLR, AGB_ITEM_FULL_HEAL }, - [ITEM_REVIVE] = { NARC_item_data_0028_bin, NARC_item_icon_item_icon_040_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_REVIVE }, - [ITEM_MAX_REVIVE] = { NARC_item_data_0029_bin, NARC_item_icon_item_icon_041_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_MAX_REVIVE }, - [ITEM_FRESH_WATER] = { NARC_item_data_0030_bin, NARC_item_icon_item_icon_043_NCGR, NARC_item_icon_item_icon_044_NCLR, AGB_ITEM_FRESH_WATER }, - [ITEM_SODA_POP] = { NARC_item_data_0031_bin, NARC_item_icon_item_icon_045_NCGR, NARC_item_icon_item_icon_046_NCLR, AGB_ITEM_SODA_POP }, - [ITEM_LEMONADE] = { NARC_item_data_0032_bin, NARC_item_icon_item_icon_047_NCGR, NARC_item_icon_item_icon_048_NCLR, AGB_ITEM_LEMONADE }, - [ITEM_MOOMOO_MILK] = { NARC_item_data_0033_bin, NARC_item_icon_item_icon_049_NCGR, NARC_item_icon_item_icon_050_NCLR, AGB_ITEM_MOOMOO_MILK }, - [ITEM_ENERGYPOWDER] = { NARC_item_data_0034_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_052_NCLR, AGB_ITEM_ENERGY_POWDER }, - [ITEM_ENERGY_ROOT] = { NARC_item_data_0035_bin, NARC_item_icon_item_icon_053_NCGR, NARC_item_icon_item_icon_054_NCLR, AGB_ITEM_ENERGY_ROOT }, - [ITEM_HEAL_POWDER] = { NARC_item_data_0036_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_055_NCLR, AGB_ITEM_HEAL_POWDER }, - [ITEM_REVIVAL_HERB] = { NARC_item_data_0037_bin, NARC_item_icon_item_icon_056_NCGR, NARC_item_icon_item_icon_057_NCLR, AGB_ITEM_REVIVAL_HERB }, - [ITEM_ETHER] = { NARC_item_data_0038_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_059_NCLR, AGB_ITEM_ETHER }, - [ITEM_MAX_ETHER] = { NARC_item_data_0039_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_060_NCLR, AGB_ITEM_MAX_ETHER }, - [ITEM_ELIXIR] = { NARC_item_data_0040_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_061_NCLR, AGB_ITEM_ELIXIR }, - [ITEM_MAX_ELIXIR] = { NARC_item_data_0041_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_062_NCLR, AGB_ITEM_MAX_ELIXIR }, - [ITEM_LAVA_COOKIE] = { NARC_item_data_0042_bin, NARC_item_icon_item_icon_063_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_LAVA_COOKIE }, - [ITEM_BERRY_JUICE] = { NARC_item_data_0043_bin, NARC_item_icon_item_icon_071_NCGR, NARC_item_icon_item_icon_072_NCLR, AGB_ITEM_BERRY_JUICE }, - [ITEM_SACRED_ASH] = { NARC_item_data_0044_bin, NARC_item_icon_item_icon_073_NCGR, NARC_item_icon_item_icon_074_NCLR, AGB_ITEM_SACRED_ASH }, - [ITEM_HP_UP] = { NARC_item_data_0045_bin, NARC_item_icon_item_icon_083_NCGR, NARC_item_icon_item_icon_084_NCLR, AGB_ITEM_HP_UP }, - [ITEM_PROTEIN] = { NARC_item_data_0046_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_086_NCLR, AGB_ITEM_PROTEIN }, - [ITEM_IRON] = { NARC_item_data_0047_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_087_NCLR, AGB_ITEM_IRON }, - [ITEM_CARBOS] = { NARC_item_data_0048_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_088_NCLR, AGB_ITEM_CARBOS }, - [ITEM_CALCIUM] = { NARC_item_data_0049_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_089_NCLR, AGB_ITEM_CALCIUM }, - [ITEM_RARE_CANDY] = { NARC_item_data_0050_bin, NARC_item_icon_item_icon_090_NCGR, NARC_item_icon_item_icon_091_NCLR, AGB_ITEM_RARE_CANDY }, - [ITEM_PP_UP] = { NARC_item_data_0051_bin, NARC_item_icon_item_icon_092_NCGR, NARC_item_icon_item_icon_093_NCLR, AGB_ITEM_PP_UP }, - [ITEM_ZINC] = { NARC_item_data_0052_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_094_NCLR, AGB_ITEM_ZINC }, - [ITEM_PP_MAX] = { NARC_item_data_0053_bin, NARC_item_icon_item_icon_095_NCGR, NARC_item_icon_item_icon_096_NCLR, AGB_ITEM_PP_MAX }, - [ITEM_OLD_GATEAU] = { NARC_item_data_0054_bin, NARC_item_icon_item_icon_466_NCGR, NARC_item_icon_item_icon_467_NCLR, AGB_ITEM_NONE }, - [ITEM_GUARD_SPEC_] = { NARC_item_data_0055_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_097_NCLR, AGB_ITEM_POKEHEARTGOLD_AGB_SPEC }, - [ITEM_DIRE_HIT] = { NARC_item_data_0056_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_098_NCLR, AGB_ITEM_DIRE_HIT }, - [ITEM_X_ATTACK] = { NARC_item_data_0057_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_099_NCLR, AGB_ITEM_X_ATTACK }, - [ITEM_X_DEFENSE] = { NARC_item_data_0058_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_101_NCLR, AGB_ITEM_X_DEFEND }, - [ITEM_X_SPEED] = { NARC_item_data_0059_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_102_NCLR, AGB_ITEM_X_SPEED }, - [ITEM_X_ACCURACY] = { NARC_item_data_0060_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_103_NCLR, AGB_ITEM_X_ACCURACY }, - [ITEM_X_SPECIAL] = { NARC_item_data_0061_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_104_NCLR, AGB_ITEM_X_SPECIAL }, - [ITEM_X_SP__DEF] = { NARC_item_data_0062_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_469_NCLR, AGB_ITEM_NONE }, - [ITEM_POKE_DOLL] = { NARC_item_data_0063_bin, NARC_item_icon_item_icon_105_NCGR, NARC_item_icon_item_icon_106_NCLR, AGB_ITEM_POKE_DOLL }, - [ITEM_FLUFFY_TAIL] = { NARC_item_data_0064_bin, NARC_item_icon_item_icon_107_NCGR, NARC_item_icon_item_icon_108_NCLR, AGB_ITEM_FLUFFY_TAIL }, - [ITEM_BLUE_FLUTE] = { NARC_item_data_0065_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_066_NCLR, AGB_ITEM_BLUE_FLUTE }, - [ITEM_YELLOW_FLUTE] = { NARC_item_data_0066_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_067_NCLR, AGB_ITEM_YELLOW_FLUTE }, - [ITEM_RED_FLUTE] = { NARC_item_data_0067_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_068_NCLR, AGB_ITEM_RED_FLUTE }, - [ITEM_BLACK_FLUTE] = { NARC_item_data_0068_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_069_NCLR, AGB_ITEM_BLACK_FLUTE }, - [ITEM_WHITE_FLUTE] = { NARC_item_data_0069_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_070_NCLR, AGB_ITEM_WHITE_FLUTE }, - [ITEM_SHOAL_SALT] = { NARC_item_data_0070_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_075_NCLR, AGB_ITEM_SHOAL_SALT }, - [ITEM_SHOAL_SHELL] = { NARC_item_data_0071_bin, NARC_item_icon_item_icon_076_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHOAL_SHELL }, - [ITEM_RED_SHARD] = { NARC_item_data_0072_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_079_NCLR, AGB_ITEM_RED_SHARD }, - [ITEM_BLUE_SHARD] = { NARC_item_data_0073_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_080_NCLR, AGB_ITEM_BLUE_SHARD }, - [ITEM_YELLOW_SHARD] = { NARC_item_data_0074_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_081_NCLR, AGB_ITEM_YELLOW_SHARD }, - [ITEM_GREEN_SHARD] = { NARC_item_data_0075_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_082_NCLR, AGB_ITEM_GREEN_SHARD }, - [ITEM_SUPER_REPEL] = { NARC_item_data_0076_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_110_NCLR, AGB_ITEM_SUPER_REPEL }, - [ITEM_MAX_REPEL] = { NARC_item_data_0077_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_111_NCLR, AGB_ITEM_MAX_REPEL }, - [ITEM_ESCAPE_ROPE] = { NARC_item_data_0078_bin, NARC_item_icon_item_icon_112_NCGR, NARC_item_icon_item_icon_113_NCLR, AGB_ITEM_ESCAPE_ROPE }, - [ITEM_REPEL] = { NARC_item_data_0079_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_114_NCLR, AGB_ITEM_REPEL }, - [ITEM_SUN_STONE] = { NARC_item_data_0080_bin, NARC_item_icon_item_icon_115_NCGR, NARC_item_icon_item_icon_116_NCLR, AGB_ITEM_SUN_STONE }, - [ITEM_MOON_STONE] = { NARC_item_data_0081_bin, NARC_item_icon_item_icon_117_NCGR, NARC_item_icon_item_icon_118_NCLR, AGB_ITEM_MOON_STONE }, - [ITEM_FIRE_STONE] = { NARC_item_data_0082_bin, NARC_item_icon_item_icon_119_NCGR, NARC_item_icon_item_icon_120_NCLR, AGB_ITEM_FIRE_STONE }, - [ITEM_THUNDERSTONE] = { NARC_item_data_0083_bin, NARC_item_icon_item_icon_121_NCGR, NARC_item_icon_item_icon_122_NCLR, AGB_ITEM_THUNDER_STONE }, - [ITEM_WATER_STONE] = { NARC_item_data_0084_bin, NARC_item_icon_item_icon_123_NCGR, NARC_item_icon_item_icon_124_NCLR, AGB_ITEM_WATER_STONE }, - [ITEM_LEAF_STONE] = { NARC_item_data_0085_bin, NARC_item_icon_item_icon_125_NCGR, NARC_item_icon_item_icon_126_NCLR, AGB_ITEM_LEAF_STONE }, - [ITEM_TINYMUSHROOM] = { NARC_item_data_0086_bin, NARC_item_icon_item_icon_127_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_TINY_MUSHROOM }, - [ITEM_BIG_MUSHROOM] = { NARC_item_data_0087_bin, NARC_item_icon_item_icon_128_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_BIG_MUSHROOM }, - [ITEM_PEARL] = { NARC_item_data_0088_bin, NARC_item_icon_item_icon_130_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_PEARL }, - [ITEM_BIG_PEARL] = { NARC_item_data_0089_bin, NARC_item_icon_item_icon_132_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_BIG_PEARL }, - [ITEM_STARDUST] = { NARC_item_data_0090_bin, NARC_item_icon_item_icon_133_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STARDUST }, - [ITEM_STAR_PIECE] = { NARC_item_data_0091_bin, NARC_item_icon_item_icon_135_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STAR_PIECE }, - [ITEM_NUGGET] = { NARC_item_data_0092_bin, NARC_item_icon_item_icon_136_NCGR, NARC_item_icon_item_icon_137_NCLR, AGB_ITEM_NUGGET }, - [ITEM_HEART_SCALE] = { NARC_item_data_0093_bin, NARC_item_icon_item_icon_138_NCGR, NARC_item_icon_item_icon_139_NCLR, AGB_ITEM_HEART_SCALE }, - [ITEM_HONEY] = { NARC_item_data_0094_bin, NARC_item_icon_item_icon_470_NCGR, NARC_item_icon_item_icon_471_NCLR, AGB_ITEM_NONE }, - [ITEM_GROWTH_MULCH] = { NARC_item_data_0095_bin, NARC_item_icon_item_icon_472_NCGR, NARC_item_icon_item_icon_473_NCLR, AGB_ITEM_NONE }, - [ITEM_DAMP_MULCH] = { NARC_item_data_0096_bin, NARC_item_icon_item_icon_474_NCGR, NARC_item_icon_item_icon_475_NCLR, AGB_ITEM_NONE }, - [ITEM_STABLE_MULCH] = { NARC_item_data_0097_bin, NARC_item_icon_item_icon_476_NCGR, NARC_item_icon_item_icon_477_NCLR, AGB_ITEM_NONE }, - [ITEM_GOOEY_MULCH] = { NARC_item_data_0098_bin, NARC_item_icon_item_icon_478_NCGR, NARC_item_icon_item_icon_479_NCLR, AGB_ITEM_NONE }, - [ITEM_ROOT_FOSSIL] = { NARC_item_data_0099_bin, NARC_item_icon_item_icon_392_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_ROOT_FOSSIL }, - [ITEM_CLAW_FOSSIL] = { NARC_item_data_0100_bin, NARC_item_icon_item_icon_394_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_CLAW_FOSSIL }, - [ITEM_HELIX_FOSSIL] = { NARC_item_data_0101_bin, NARC_item_icon_item_icon_431_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_HELIX_FOSSIL }, - [ITEM_DOME_FOSSIL] = { NARC_item_data_0102_bin, NARC_item_icon_item_icon_433_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_DOME_FOSSIL }, - [ITEM_OLD_AMBER] = { NARC_item_data_0103_bin, NARC_item_icon_item_icon_425_NCGR, NARC_item_icon_item_icon_426_NCLR, AGB_ITEM_OLD_AMBER }, - [ITEM_ARMOR_FOSSIL] = { NARC_item_data_0104_bin, NARC_item_icon_item_icon_617_NCGR, NARC_item_icon_item_icon_618_NCLR, AGB_ITEM_NONE }, - [ITEM_SKULL_FOSSIL] = { NARC_item_data_0105_bin, NARC_item_icon_item_icon_615_NCGR, NARC_item_icon_item_icon_616_NCLR, AGB_ITEM_NONE }, - [ITEM_RARE_BONE] = { NARC_item_data_0106_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_NONE }, - [ITEM_SHINY_STONE] = { NARC_item_data_0107_bin, NARC_item_icon_item_icon_480_NCGR, NARC_item_icon_item_icon_481_NCLR, AGB_ITEM_NONE }, - [ITEM_DUSK_STONE] = { NARC_item_data_0108_bin, NARC_item_icon_item_icon_482_NCGR, NARC_item_icon_item_icon_483_NCLR, AGB_ITEM_NONE }, - [ITEM_DAWN_STONE] = { NARC_item_data_0109_bin, NARC_item_icon_item_icon_484_NCGR, NARC_item_icon_item_icon_485_NCLR, AGB_ITEM_NONE }, - [ITEM_OVAL_STONE] = { NARC_item_data_0110_bin, NARC_item_icon_item_icon_486_NCGR, NARC_item_icon_item_icon_487_NCLR, AGB_ITEM_NONE }, - [ITEM_ODD_KEYSTONE] = { NARC_item_data_0111_bin, NARC_item_icon_item_icon_488_NCGR, NARC_item_icon_item_icon_489_NCLR, AGB_ITEM_NONE }, - [ITEM_GRISEOUS_ORB] = { NARC_item_data_0112_bin, NARC_item_icon_item_icon_699_NCGR, NARC_item_icon_item_icon_700_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_113] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_114] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_115] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_116] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_117] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_118] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_119] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_120] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_121] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_122] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_123] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_124] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_125] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_126] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_127] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_128] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_129] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_130] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_131] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_132] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_133] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_134] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_ADAMANT_ORB] = { NARC_item_data_0113_bin, NARC_item_icon_item_icon_648_NCGR, NARC_item_icon_item_icon_649_NCLR, AGB_ITEM_NONE }, - [ITEM_LUSTROUS_ORB] = { NARC_item_data_0114_bin, NARC_item_icon_item_icon_646_NCGR, NARC_item_icon_item_icon_647_NCLR, AGB_ITEM_NONE }, - [ITEM_GRASS_MAIL] = { NARC_item_data_0115_bin, NARC_item_icon_item_icon_140_NCGR, NARC_item_icon_item_icon_141_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_MAIL] = { NARC_item_data_0116_bin, NARC_item_icon_item_icon_142_NCGR, NARC_item_icon_item_icon_143_NCLR, AGB_ITEM_NONE }, - [ITEM_BUBBLE_MAIL] = { NARC_item_data_0117_bin, NARC_item_icon_item_icon_144_NCGR, NARC_item_icon_item_icon_145_NCLR, AGB_ITEM_NONE }, - [ITEM_BLOOM_MAIL] = { NARC_item_data_0118_bin, NARC_item_icon_item_icon_146_NCGR, NARC_item_icon_item_icon_147_NCLR, AGB_ITEM_NONE }, - [ITEM_TUNNEL_MAIL] = { NARC_item_data_0119_bin, NARC_item_icon_item_icon_148_NCGR, NARC_item_icon_item_icon_149_NCLR, AGB_ITEM_NONE }, - [ITEM_STEEL_MAIL] = { NARC_item_data_0120_bin, NARC_item_icon_item_icon_150_NCGR, NARC_item_icon_item_icon_151_NCLR, AGB_ITEM_NONE }, - [ITEM_HEART_MAIL] = { NARC_item_data_0121_bin, NARC_item_icon_item_icon_152_NCGR, NARC_item_icon_item_icon_153_NCLR, AGB_ITEM_NONE }, - [ITEM_SNOW_MAIL] = { NARC_item_data_0122_bin, NARC_item_icon_item_icon_154_NCGR, NARC_item_icon_item_icon_155_NCLR, AGB_ITEM_NONE }, - [ITEM_SPACE_MAIL] = { NARC_item_data_0123_bin, NARC_item_icon_item_icon_156_NCGR, NARC_item_icon_item_icon_157_NCLR, AGB_ITEM_NONE }, - [ITEM_AIR_MAIL] = { NARC_item_data_0124_bin, NARC_item_icon_item_icon_158_NCGR, NARC_item_icon_item_icon_159_NCLR, AGB_ITEM_NONE }, - [ITEM_MOSAIC_MAIL] = { NARC_item_data_0125_bin, NARC_item_icon_item_icon_160_NCGR, NARC_item_icon_item_icon_161_NCLR, AGB_ITEM_NONE }, - [ITEM_BRICK_MAIL] = { NARC_item_data_0126_bin, NARC_item_icon_item_icon_162_NCGR, NARC_item_icon_item_icon_163_NCLR, AGB_ITEM_NONE }, - [ITEM_CHERI_BERRY] = { NARC_item_data_0127_bin, NARC_item_icon_item_icon_164_NCGR, NARC_item_icon_item_icon_165_NCLR, AGB_ITEM_CHERI_BERRY }, - [ITEM_CHESTO_BERRY] = { NARC_item_data_0128_bin, NARC_item_icon_item_icon_166_NCGR, NARC_item_icon_item_icon_167_NCLR, AGB_ITEM_CHESTO_BERRY }, - [ITEM_PECHA_BERRY] = { NARC_item_data_0129_bin, NARC_item_icon_item_icon_168_NCGR, NARC_item_icon_item_icon_169_NCLR, AGB_ITEM_PECHA_BERRY }, - [ITEM_RAWST_BERRY] = { NARC_item_data_0130_bin, NARC_item_icon_item_icon_170_NCGR, NARC_item_icon_item_icon_171_NCLR, AGB_ITEM_RAWST_BERRY }, - [ITEM_ASPEAR_BERRY] = { NARC_item_data_0131_bin, NARC_item_icon_item_icon_172_NCGR, NARC_item_icon_item_icon_173_NCLR, AGB_ITEM_ASPEAR_BERRY }, - [ITEM_LEPPA_BERRY] = { NARC_item_data_0132_bin, NARC_item_icon_item_icon_174_NCGR, NARC_item_icon_item_icon_175_NCLR, AGB_ITEM_LEPPA_BERRY }, - [ITEM_ORAN_BERRY] = { NARC_item_data_0133_bin, NARC_item_icon_item_icon_176_NCGR, NARC_item_icon_item_icon_177_NCLR, AGB_ITEM_ORAN_BERRY }, - [ITEM_PERSIM_BERRY] = { NARC_item_data_0134_bin, NARC_item_icon_item_icon_178_NCGR, NARC_item_icon_item_icon_179_NCLR, AGB_ITEM_PERSIM_BERRY }, - [ITEM_LUM_BERRY] = { NARC_item_data_0135_bin, NARC_item_icon_item_icon_180_NCGR, NARC_item_icon_item_icon_181_NCLR, AGB_ITEM_LUM_BERRY }, - [ITEM_SITRUS_BERRY] = { NARC_item_data_0136_bin, NARC_item_icon_item_icon_182_NCGR, NARC_item_icon_item_icon_183_NCLR, AGB_ITEM_SITRUS_BERRY }, - [ITEM_FIGY_BERRY] = { NARC_item_data_0137_bin, NARC_item_icon_item_icon_184_NCGR, NARC_item_icon_item_icon_185_NCLR, AGB_ITEM_FIGY_BERRY }, - [ITEM_WIKI_BERRY] = { NARC_item_data_0138_bin, NARC_item_icon_item_icon_186_NCGR, NARC_item_icon_item_icon_187_NCLR, AGB_ITEM_WIKI_BERRY }, - [ITEM_MAGO_BERRY] = { NARC_item_data_0139_bin, NARC_item_icon_item_icon_188_NCGR, NARC_item_icon_item_icon_189_NCLR, AGB_ITEM_MAGO_BERRY }, - [ITEM_AGUAV_BERRY] = { NARC_item_data_0140_bin, NARC_item_icon_item_icon_190_NCGR, NARC_item_icon_item_icon_191_NCLR, AGB_ITEM_AGUAV_BERRY }, - [ITEM_IAPAPA_BERRY] = { NARC_item_data_0141_bin, NARC_item_icon_item_icon_192_NCGR, NARC_item_icon_item_icon_193_NCLR, AGB_ITEM_IAPAPA_BERRY }, - [ITEM_RAZZ_BERRY] = { NARC_item_data_0142_bin, NARC_item_icon_item_icon_194_NCGR, NARC_item_icon_item_icon_195_NCLR, AGB_ITEM_RAZZ_BERRY }, - [ITEM_BLUK_BERRY] = { NARC_item_data_0143_bin, NARC_item_icon_item_icon_196_NCGR, NARC_item_icon_item_icon_197_NCLR, AGB_ITEM_BLUK_BERRY }, - [ITEM_NANAB_BERRY] = { NARC_item_data_0144_bin, NARC_item_icon_item_icon_198_NCGR, NARC_item_icon_item_icon_199_NCLR, AGB_ITEM_NANAB_BERRY }, - [ITEM_WEPEAR_BERRY] = { NARC_item_data_0145_bin, NARC_item_icon_item_icon_200_NCGR, NARC_item_icon_item_icon_201_NCLR, AGB_ITEM_WEPEAR_BERRY }, - [ITEM_PINAP_BERRY] = { NARC_item_data_0146_bin, NARC_item_icon_item_icon_202_NCGR, NARC_item_icon_item_icon_203_NCLR, AGB_ITEM_PINAP_BERRY }, - [ITEM_POMEG_BERRY] = { NARC_item_data_0147_bin, NARC_item_icon_item_icon_204_NCGR, NARC_item_icon_item_icon_205_NCLR, AGB_ITEM_POMEG_BERRY }, - [ITEM_KELPSY_BERRY] = { NARC_item_data_0148_bin, NARC_item_icon_item_icon_206_NCGR, NARC_item_icon_item_icon_207_NCLR, AGB_ITEM_KELPSY_BERRY }, - [ITEM_QUALOT_BERRY] = { NARC_item_data_0149_bin, NARC_item_icon_item_icon_208_NCGR, NARC_item_icon_item_icon_209_NCLR, AGB_ITEM_QUALOT_BERRY }, - [ITEM_HONDEW_BERRY] = { NARC_item_data_0150_bin, NARC_item_icon_item_icon_210_NCGR, NARC_item_icon_item_icon_211_NCLR, AGB_ITEM_HONDEW_BERRY }, - [ITEM_GREPA_BERRY] = { NARC_item_data_0151_bin, NARC_item_icon_item_icon_212_NCGR, NARC_item_icon_item_icon_213_NCLR, AGB_ITEM_GREPA_BERRY }, - [ITEM_TAMATO_BERRY] = { NARC_item_data_0152_bin, NARC_item_icon_item_icon_214_NCGR, NARC_item_icon_item_icon_215_NCLR, AGB_ITEM_TAMATO_BERRY }, - [ITEM_CORNN_BERRY] = { NARC_item_data_0153_bin, NARC_item_icon_item_icon_216_NCGR, NARC_item_icon_item_icon_217_NCLR, AGB_ITEM_CORNN_BERRY }, - [ITEM_MAGOST_BERRY] = { NARC_item_data_0154_bin, NARC_item_icon_item_icon_218_NCGR, NARC_item_icon_item_icon_219_NCLR, AGB_ITEM_MAGOST_BERRY }, - [ITEM_RABUTA_BERRY] = { NARC_item_data_0155_bin, NARC_item_icon_item_icon_220_NCGR, NARC_item_icon_item_icon_221_NCLR, AGB_ITEM_RABUTA_BERRY }, - [ITEM_NOMEL_BERRY] = { NARC_item_data_0156_bin, NARC_item_icon_item_icon_222_NCGR, NARC_item_icon_item_icon_223_NCLR, AGB_ITEM_NOMEL_BERRY }, - [ITEM_SPELON_BERRY] = { NARC_item_data_0157_bin, NARC_item_icon_item_icon_224_NCGR, NARC_item_icon_item_icon_225_NCLR, AGB_ITEM_SPELON_BERRY }, - [ITEM_PAMTRE_BERRY] = { NARC_item_data_0158_bin, NARC_item_icon_item_icon_226_NCGR, NARC_item_icon_item_icon_227_NCLR, AGB_ITEM_PAMTRE_BERRY }, - [ITEM_WATMEL_BERRY] = { NARC_item_data_0159_bin, NARC_item_icon_item_icon_228_NCGR, NARC_item_icon_item_icon_229_NCLR, AGB_ITEM_WATMEL_BERRY }, - [ITEM_DURIN_BERRY] = { NARC_item_data_0160_bin, NARC_item_icon_item_icon_230_NCGR, NARC_item_icon_item_icon_231_NCLR, AGB_ITEM_DURIN_BERRY }, - [ITEM_BELUE_BERRY] = { NARC_item_data_0161_bin, NARC_item_icon_item_icon_232_NCGR, NARC_item_icon_item_icon_233_NCLR, AGB_ITEM_BELUE_BERRY }, - [ITEM_OCCA_BERRY] = { NARC_item_data_0162_bin, NARC_item_icon_item_icon_554_NCGR, NARC_item_icon_item_icon_555_NCLR, AGB_ITEM_NONE }, - [ITEM_PASSHO_BERRY] = { NARC_item_data_0163_bin, NARC_item_icon_item_icon_556_NCGR, NARC_item_icon_item_icon_557_NCLR, AGB_ITEM_NONE }, - [ITEM_WACAN_BERRY] = { NARC_item_data_0164_bin, NARC_item_icon_item_icon_558_NCGR, NARC_item_icon_item_icon_559_NCLR, AGB_ITEM_NONE }, - [ITEM_RINDO_BERRY] = { NARC_item_data_0165_bin, NARC_item_icon_item_icon_560_NCGR, NARC_item_icon_item_icon_561_NCLR, AGB_ITEM_NONE }, - [ITEM_YACHE_BERRY] = { NARC_item_data_0166_bin, NARC_item_icon_item_icon_562_NCGR, NARC_item_icon_item_icon_563_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOPLE_BERRY] = { NARC_item_data_0167_bin, NARC_item_icon_item_icon_564_NCGR, NARC_item_icon_item_icon_565_NCLR, AGB_ITEM_NONE }, - [ITEM_KEBIA_BERRY] = { NARC_item_data_0168_bin, NARC_item_icon_item_icon_566_NCGR, NARC_item_icon_item_icon_567_NCLR, AGB_ITEM_NONE }, - [ITEM_SHUCA_BERRY] = { NARC_item_data_0169_bin, NARC_item_icon_item_icon_568_NCGR, NARC_item_icon_item_icon_569_NCLR, AGB_ITEM_NONE }, - [ITEM_COBA_BERRY] = { NARC_item_data_0170_bin, NARC_item_icon_item_icon_570_NCGR, NARC_item_icon_item_icon_571_NCLR, AGB_ITEM_NONE }, - [ITEM_PAYAPA_BERRY] = { NARC_item_data_0171_bin, NARC_item_icon_item_icon_572_NCGR, NARC_item_icon_item_icon_573_NCLR, AGB_ITEM_NONE }, - [ITEM_TANGA_BERRY] = { NARC_item_data_0172_bin, NARC_item_icon_item_icon_574_NCGR, NARC_item_icon_item_icon_575_NCLR, AGB_ITEM_NONE }, - [ITEM_CHARTI_BERRY] = { NARC_item_data_0173_bin, NARC_item_icon_item_icon_576_NCGR, NARC_item_icon_item_icon_577_NCLR, AGB_ITEM_NONE }, - [ITEM_KASIB_BERRY] = { NARC_item_data_0174_bin, NARC_item_icon_item_icon_578_NCGR, NARC_item_icon_item_icon_579_NCLR, AGB_ITEM_NONE }, - [ITEM_HABAN_BERRY] = { NARC_item_data_0175_bin, NARC_item_icon_item_icon_580_NCGR, NARC_item_icon_item_icon_581_NCLR, AGB_ITEM_NONE }, - [ITEM_COLBUR_BERRY] = { NARC_item_data_0176_bin, NARC_item_icon_item_icon_582_NCGR, NARC_item_icon_item_icon_583_NCLR, AGB_ITEM_NONE }, - [ITEM_BABIRI_BERRY] = { NARC_item_data_0177_bin, NARC_item_icon_item_icon_584_NCGR, NARC_item_icon_item_icon_585_NCLR, AGB_ITEM_NONE }, - [ITEM_CHILAN_BERRY] = { NARC_item_data_0178_bin, NARC_item_icon_item_icon_586_NCGR, NARC_item_icon_item_icon_587_NCLR, AGB_ITEM_NONE }, - [ITEM_LIECHI_BERRY] = { NARC_item_data_0179_bin, NARC_item_icon_item_icon_234_NCGR, NARC_item_icon_item_icon_235_NCLR, AGB_ITEM_LIECHI_BERRY }, - [ITEM_GANLON_BERRY] = { NARC_item_data_0180_bin, NARC_item_icon_item_icon_236_NCGR, NARC_item_icon_item_icon_237_NCLR, AGB_ITEM_GANLON_BERRY }, - [ITEM_SALAC_BERRY] = { NARC_item_data_0181_bin, NARC_item_icon_item_icon_238_NCGR, NARC_item_icon_item_icon_239_NCLR, AGB_ITEM_SALAC_BERRY }, - [ITEM_PETAYA_BERRY] = { NARC_item_data_0182_bin, NARC_item_icon_item_icon_240_NCGR, NARC_item_icon_item_icon_241_NCLR, AGB_ITEM_PETAYA_BERRY }, - [ITEM_APICOT_BERRY] = { NARC_item_data_0183_bin, NARC_item_icon_item_icon_242_NCGR, NARC_item_icon_item_icon_243_NCLR, AGB_ITEM_APICOT_BERRY }, - [ITEM_LANSAT_BERRY] = { NARC_item_data_0184_bin, NARC_item_icon_item_icon_244_NCGR, NARC_item_icon_item_icon_245_NCLR, AGB_ITEM_LANSAT_BERRY }, - [ITEM_STARF_BERRY] = { NARC_item_data_0185_bin, NARC_item_icon_item_icon_246_NCGR, NARC_item_icon_item_icon_247_NCLR, AGB_ITEM_STARF_BERRY }, - [ITEM_ENIGMA_BERRY] = { NARC_item_data_0186_bin, NARC_item_icon_item_icon_248_NCGR, NARC_item_icon_item_icon_249_NCLR, AGB_ITEM_ENIGMA_BERRY }, - [ITEM_MICLE_BERRY] = { NARC_item_data_0187_bin, NARC_item_icon_item_icon_588_NCGR, NARC_item_icon_item_icon_589_NCLR, AGB_ITEM_NONE }, - [ITEM_CUSTAP_BERRY] = { NARC_item_data_0188_bin, NARC_item_icon_item_icon_590_NCGR, NARC_item_icon_item_icon_591_NCLR, AGB_ITEM_NONE }, - [ITEM_JABOCA_BERRY] = { NARC_item_data_0189_bin, NARC_item_icon_item_icon_592_NCGR, NARC_item_icon_item_icon_593_NCLR, AGB_ITEM_NONE }, - [ITEM_ROWAP_BERRY] = { NARC_item_data_0190_bin, NARC_item_icon_item_icon_594_NCGR, NARC_item_icon_item_icon_595_NCLR, AGB_ITEM_NONE }, - [ITEM_BRIGHTPOWDER] = { NARC_item_data_0191_bin, NARC_item_icon_item_icon_250_NCGR, NARC_item_icon_item_icon_251_NCLR, AGB_ITEM_BRIGHT_POWDER }, - [ITEM_WHITE_HERB] = { NARC_item_data_0192_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_253_NCLR, AGB_ITEM_WHITE_HERB }, - [ITEM_MACHO_BRACE] = { NARC_item_data_0193_bin, NARC_item_icon_item_icon_254_NCGR, NARC_item_icon_item_icon_255_NCLR, AGB_ITEM_MACHO_BRACE }, - [ITEM_EXP__SHARE] = { NARC_item_data_0194_bin, NARC_item_icon_item_icon_256_NCGR, NARC_item_icon_item_icon_257_NCLR, AGB_ITEM_EXP_SHARE }, - [ITEM_QUICK_CLAW] = { NARC_item_data_0195_bin, NARC_item_icon_item_icon_258_NCGR, NARC_item_icon_item_icon_259_NCLR, AGB_ITEM_QUICK_CLAW }, - [ITEM_SOOTHE_BELL] = { NARC_item_data_0196_bin, NARC_item_icon_item_icon_260_NCGR, NARC_item_icon_item_icon_261_NCLR, AGB_ITEM_SOOTHE_BELL }, - [ITEM_MENTAL_HERB] = { NARC_item_data_0197_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_262_NCLR, AGB_ITEM_MENTAL_HERB }, - [ITEM_CHOICE_BAND] = { NARC_item_data_0198_bin, NARC_item_icon_item_icon_263_NCGR, NARC_item_icon_item_icon_264_NCLR, AGB_ITEM_CHOICE_BAND }, - [ITEM_KINGS_ROCK] = { NARC_item_data_0199_bin, NARC_item_icon_item_icon_265_NCGR, NARC_item_icon_item_icon_266_NCLR, AGB_ITEM_KINGS_ROCK }, - [ITEM_SILVERPOWDER] = { NARC_item_data_0200_bin, NARC_item_icon_item_icon_267_NCGR, NARC_item_icon_item_icon_268_NCLR, AGB_ITEM_SILVER_POWDER }, - [ITEM_AMULET_COIN] = { NARC_item_data_0201_bin, NARC_item_icon_item_icon_269_NCGR, NARC_item_icon_item_icon_270_NCLR, AGB_ITEM_AMULET_COIN }, - [ITEM_CLEANSE_TAG] = { NARC_item_data_0202_bin, NARC_item_icon_item_icon_271_NCGR, NARC_item_icon_item_icon_272_NCLR, AGB_ITEM_CLEANSE_TAG }, - [ITEM_SOUL_DEW] = { NARC_item_data_0203_bin, NARC_item_icon_item_icon_273_NCGR, NARC_item_icon_item_icon_274_NCLR, AGB_ITEM_SOUL_DEW }, - [ITEM_DEEPSEATOOTH] = { NARC_item_data_0204_bin, NARC_item_icon_item_icon_275_NCGR, NARC_item_icon_item_icon_276_NCLR, AGB_ITEM_DEEP_SEA_TOOTH }, - [ITEM_DEEPSEASCALE] = { NARC_item_data_0205_bin, NARC_item_icon_item_icon_277_NCGR, NARC_item_icon_item_icon_278_NCLR, AGB_ITEM_DEEP_SEA_SCALE }, - [ITEM_SMOKE_BALL] = { NARC_item_data_0206_bin, NARC_item_icon_item_icon_279_NCGR, NARC_item_icon_item_icon_280_NCLR, AGB_ITEM_SMOKE_BALL }, - [ITEM_EVERSTONE] = { NARC_item_data_0207_bin, NARC_item_icon_item_icon_281_NCGR, NARC_item_icon_item_icon_282_NCLR, AGB_ITEM_EVERSTONE }, - [ITEM_FOCUS_BAND] = { NARC_item_data_0208_bin, NARC_item_icon_item_icon_283_NCGR, NARC_item_icon_item_icon_284_NCLR, AGB_ITEM_FOCUS_BAND }, - [ITEM_LUCKY_EGG] = { NARC_item_data_0209_bin, NARC_item_icon_item_icon_285_NCGR, NARC_item_icon_item_icon_286_NCLR, AGB_ITEM_LUCKY_EGG }, - [ITEM_SCOPE_LENS] = { NARC_item_data_0210_bin, NARC_item_icon_item_icon_287_NCGR, NARC_item_icon_item_icon_288_NCLR, AGB_ITEM_SCOPE_LENS }, - [ITEM_METAL_COAT] = { NARC_item_data_0211_bin, NARC_item_icon_item_icon_289_NCGR, NARC_item_icon_item_icon_290_NCLR, AGB_ITEM_METAL_COAT }, - [ITEM_LEFTOVERS] = { NARC_item_data_0212_bin, NARC_item_icon_item_icon_291_NCGR, NARC_item_icon_item_icon_292_NCLR, AGB_ITEM_LEFTOVERS }, - [ITEM_DRAGON_SCALE] = { NARC_item_data_0213_bin, NARC_item_icon_item_icon_293_NCGR, NARC_item_icon_item_icon_294_NCLR, AGB_ITEM_DRAGON_SCALE }, - [ITEM_LIGHT_BALL] = { NARC_item_data_0214_bin, NARC_item_icon_item_icon_295_NCGR, NARC_item_icon_item_icon_296_NCLR, AGB_ITEM_LIGHT_BALL }, - [ITEM_SOFT_SAND] = { NARC_item_data_0215_bin, NARC_item_icon_item_icon_297_NCGR, NARC_item_icon_item_icon_298_NCLR, AGB_ITEM_SOFT_SAND }, - [ITEM_HARD_STONE] = { NARC_item_data_0216_bin, NARC_item_icon_item_icon_299_NCGR, NARC_item_icon_item_icon_300_NCLR, AGB_ITEM_HARD_STONE }, - [ITEM_MIRACLE_SEED] = { NARC_item_data_0217_bin, NARC_item_icon_item_icon_301_NCGR, NARC_item_icon_item_icon_302_NCLR, AGB_ITEM_MIRACLE_SEED }, - [ITEM_BLACKGLASSES] = { NARC_item_data_0218_bin, NARC_item_icon_item_icon_303_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_GLASSES }, - [ITEM_BLACK_BELT] = { NARC_item_data_0219_bin, NARC_item_icon_item_icon_305_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_BELT }, - [ITEM_MAGNET] = { NARC_item_data_0220_bin, NARC_item_icon_item_icon_306_NCGR, NARC_item_icon_item_icon_307_NCLR, AGB_ITEM_MAGNET }, - [ITEM_MYSTIC_WATER] = { NARC_item_data_0221_bin, NARC_item_icon_item_icon_308_NCGR, NARC_item_icon_item_icon_309_NCLR, AGB_ITEM_MYSTIC_WATER }, - [ITEM_SHARP_BEAK] = { NARC_item_data_0222_bin, NARC_item_icon_item_icon_310_NCGR, NARC_item_icon_item_icon_311_NCLR, AGB_ITEM_SHARP_BEAK }, - [ITEM_POISON_BARB] = { NARC_item_data_0223_bin, NARC_item_icon_item_icon_312_NCGR, NARC_item_icon_item_icon_313_NCLR, AGB_ITEM_POISON_BARB }, - [ITEM_NEVERMELTICE] = { NARC_item_data_0224_bin, NARC_item_icon_item_icon_314_NCGR, NARC_item_icon_item_icon_315_NCLR, AGB_ITEM_NEVER_MELT_ICE }, - [ITEM_SPELL_TAG] = { NARC_item_data_0225_bin, NARC_item_icon_item_icon_316_NCGR, NARC_item_icon_item_icon_317_NCLR, AGB_ITEM_SPELL_TAG }, - [ITEM_TWISTEDSPOON] = { NARC_item_data_0226_bin, NARC_item_icon_item_icon_318_NCGR, NARC_item_icon_item_icon_319_NCLR, AGB_ITEM_TWISTED_SPOON }, - [ITEM_CHARCOAL] = { NARC_item_data_0227_bin, NARC_item_icon_item_icon_320_NCGR, NARC_item_icon_item_icon_321_NCLR, AGB_ITEM_CHARCOAL }, - [ITEM_DRAGON_FANG] = { NARC_item_data_0228_bin, NARC_item_icon_item_icon_322_NCGR, NARC_item_icon_item_icon_323_NCLR, AGB_ITEM_DRAGON_FANG }, - [ITEM_SILK_SCARF] = { NARC_item_data_0229_bin, NARC_item_icon_item_icon_324_NCGR, NARC_item_icon_item_icon_325_NCLR, AGB_ITEM_SILK_SCARF }, - [ITEM_UPGRADE] = { NARC_item_data_0230_bin, NARC_item_icon_item_icon_326_NCGR, NARC_item_icon_item_icon_327_NCLR, AGB_ITEM_UP_GRADE }, - [ITEM_SHELL_BELL] = { NARC_item_data_0231_bin, NARC_item_icon_item_icon_328_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHELL_BELL }, - [ITEM_SEA_INCENSE] = { NARC_item_data_0232_bin, NARC_item_icon_item_icon_329_NCGR, NARC_item_icon_item_icon_330_NCLR, AGB_ITEM_SEA_INCENSE }, - [ITEM_LAX_INCENSE] = { NARC_item_data_0233_bin, NARC_item_icon_item_icon_331_NCGR, NARC_item_icon_item_icon_332_NCLR, AGB_ITEM_LAX_INCENSE }, - [ITEM_LUCKY_PUNCH] = { NARC_item_data_0234_bin, NARC_item_icon_item_icon_333_NCGR, NARC_item_icon_item_icon_334_NCLR, AGB_ITEM_LUCKY_PUNCH }, - [ITEM_METAL_POWDER] = { NARC_item_data_0235_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_336_NCLR, AGB_ITEM_METAL_POWDER }, - [ITEM_THICK_CLUB] = { NARC_item_data_0236_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_THICK_CLUB }, - [ITEM_STICK] = { NARC_item_data_0237_bin, NARC_item_icon_item_icon_339_NCGR, NARC_item_icon_item_icon_340_NCLR, AGB_ITEM_STICK }, - [ITEM_RED_SCARF] = { NARC_item_data_0238_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_342_NCLR, AGB_ITEM_RED_SCARF }, - [ITEM_BLUE_SCARF] = { NARC_item_data_0239_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_343_NCLR, AGB_ITEM_BLUE_SCARF }, - [ITEM_PINK_SCARF] = { NARC_item_data_0240_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_344_NCLR, AGB_ITEM_PINK_SCARF }, - [ITEM_GREEN_SCARF] = { NARC_item_data_0241_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_345_NCLR, AGB_ITEM_GREEN_SCARF }, - [ITEM_YELLOW_SCARF] = { NARC_item_data_0242_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_346_NCLR, AGB_ITEM_YELLOW_SCARF }, - [ITEM_WIDE_LENS] = { NARC_item_data_0243_bin, NARC_item_icon_item_icon_490_NCGR, NARC_item_icon_item_icon_491_NCLR, AGB_ITEM_NONE }, - [ITEM_MUSCLE_BAND] = { NARC_item_data_0244_bin, NARC_item_icon_item_icon_492_NCGR, NARC_item_icon_item_icon_493_NCLR, AGB_ITEM_NONE }, - [ITEM_WISE_GLASSES] = { NARC_item_data_0245_bin, NARC_item_icon_item_icon_494_NCGR, NARC_item_icon_item_icon_495_NCLR, AGB_ITEM_NONE }, - [ITEM_EXPERT_BELT] = { NARC_item_data_0246_bin, NARC_item_icon_item_icon_496_NCGR, NARC_item_icon_item_icon_497_NCLR, AGB_ITEM_NONE }, - [ITEM_LIGHT_CLAY] = { NARC_item_data_0247_bin, NARC_item_icon_item_icon_611_NCGR, NARC_item_icon_item_icon_612_NCLR, AGB_ITEM_NONE }, - [ITEM_LIFE_ORB] = { NARC_item_data_0248_bin, NARC_item_icon_item_icon_498_NCGR, NARC_item_icon_item_icon_499_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_HERB] = { NARC_item_data_0249_bin, NARC_item_icon_item_icon_500_NCGR, NARC_item_icon_item_icon_501_NCLR, AGB_ITEM_NONE }, - [ITEM_TOXIC_ORB] = { NARC_item_data_0250_bin, NARC_item_icon_item_icon_502_NCGR, NARC_item_icon_item_icon_503_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_ORB] = { NARC_item_data_0251_bin, NARC_item_icon_item_icon_504_NCGR, NARC_item_icon_item_icon_505_NCLR, AGB_ITEM_NONE }, - [ITEM_QUICK_POWDER] = { NARC_item_data_0252_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_658_NCLR, AGB_ITEM_NONE }, - [ITEM_FOCUS_SASH] = { NARC_item_data_0253_bin, NARC_item_icon_item_icon_659_NCGR, NARC_item_icon_item_icon_660_NCLR, AGB_ITEM_NONE }, - [ITEM_ZOOM_LENS] = { NARC_item_data_0254_bin, NARC_item_icon_item_icon_506_NCGR, NARC_item_icon_item_icon_507_NCLR, AGB_ITEM_NONE }, - [ITEM_METRONOME] = { NARC_item_data_0255_bin, NARC_item_icon_item_icon_508_NCGR, NARC_item_icon_item_icon_509_NCLR, AGB_ITEM_NONE }, - [ITEM_IRON_BALL] = { NARC_item_data_0256_bin, NARC_item_icon_item_icon_613_NCGR, NARC_item_icon_item_icon_614_NCLR, AGB_ITEM_NONE }, - [ITEM_LAGGING_TAIL] = { NARC_item_data_0257_bin, NARC_item_icon_item_icon_650_NCGR, NARC_item_icon_item_icon_651_NCLR, AGB_ITEM_NONE }, - [ITEM_DESTINY_KNOT] = { NARC_item_data_0258_bin, NARC_item_icon_item_icon_654_NCGR, NARC_item_icon_item_icon_655_NCLR, AGB_ITEM_NONE }, - [ITEM_BLACK_SLUDGE] = { NARC_item_data_0259_bin, NARC_item_icon_item_icon_510_NCGR, NARC_item_icon_item_icon_511_NCLR, AGB_ITEM_NONE }, - [ITEM_ICY_ROCK] = { NARC_item_data_0260_bin, NARC_item_icon_item_icon_636_NCGR, NARC_item_icon_item_icon_637_NCLR, AGB_ITEM_NONE }, - [ITEM_SMOOTH_ROCK] = { NARC_item_data_0261_bin, NARC_item_icon_item_icon_638_NCGR, NARC_item_icon_item_icon_639_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAT_ROCK] = { NARC_item_data_0262_bin, NARC_item_icon_item_icon_640_NCGR, NARC_item_icon_item_icon_641_NCLR, AGB_ITEM_NONE }, - [ITEM_DAMP_ROCK] = { NARC_item_data_0263_bin, NARC_item_icon_item_icon_642_NCGR, NARC_item_icon_item_icon_643_NCLR, AGB_ITEM_NONE }, - [ITEM_GRIP_CLAW] = { NARC_item_data_0264_bin, NARC_item_icon_item_icon_652_NCGR, NARC_item_icon_item_icon_653_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOICE_SCARF] = { NARC_item_data_0265_bin, NARC_item_icon_item_icon_512_NCGR, NARC_item_icon_item_icon_513_NCLR, AGB_ITEM_NONE }, - [ITEM_STICKY_BARB] = { NARC_item_data_0266_bin, NARC_item_icon_item_icon_514_NCGR, NARC_item_icon_item_icon_515_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BRACER] = { NARC_item_data_0267_bin, NARC_item_icon_item_icon_683_NCGR, NARC_item_icon_item_icon_684_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BELT] = { NARC_item_data_0268_bin, NARC_item_icon_item_icon_691_NCGR, NARC_item_icon_item_icon_692_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_LENS] = { NARC_item_data_0269_bin, NARC_item_icon_item_icon_693_NCGR, NARC_item_icon_item_icon_694_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BAND] = { NARC_item_data_0270_bin, NARC_item_icon_item_icon_685_NCGR, NARC_item_icon_item_icon_686_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_ANKLET] = { NARC_item_data_0271_bin, NARC_item_icon_item_icon_687_NCGR, NARC_item_icon_item_icon_688_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_WEIGHT] = { NARC_item_data_0272_bin, NARC_item_icon_item_icon_689_NCGR, NARC_item_icon_item_icon_690_NCLR, AGB_ITEM_NONE }, - [ITEM_SHED_SHELL] = { NARC_item_data_0273_bin, NARC_item_icon_item_icon_516_NCGR, NARC_item_icon_item_icon_517_NCLR, AGB_ITEM_NONE }, - [ITEM_BIG_ROOT] = { NARC_item_data_0274_bin, NARC_item_icon_item_icon_518_NCGR, NARC_item_icon_item_icon_519_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOICE_SPECS] = { NARC_item_data_0275_bin, NARC_item_icon_item_icon_520_NCGR, NARC_item_icon_item_icon_521_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_PLATE] = { NARC_item_data_0276_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_620_NCLR, AGB_ITEM_NONE }, - [ITEM_SPLASH_PLATE] = { NARC_item_data_0277_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_621_NCLR, AGB_ITEM_NONE }, - [ITEM_ZAP_PLATE] = { NARC_item_data_0278_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_622_NCLR, AGB_ITEM_NONE }, - [ITEM_MEADOW_PLATE] = { NARC_item_data_0279_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_623_NCLR, AGB_ITEM_NONE }, - [ITEM_ICICLE_PLATE] = { NARC_item_data_0280_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_624_NCLR, AGB_ITEM_NONE }, - [ITEM_FIST_PLATE] = { NARC_item_data_0281_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_625_NCLR, AGB_ITEM_NONE }, - [ITEM_TOXIC_PLATE] = { NARC_item_data_0282_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_626_NCLR, AGB_ITEM_NONE }, - [ITEM_EARTH_PLATE] = { NARC_item_data_0283_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_627_NCLR, AGB_ITEM_NONE }, - [ITEM_SKY_PLATE] = { NARC_item_data_0284_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_628_NCLR, AGB_ITEM_NONE }, - [ITEM_MIND_PLATE] = { NARC_item_data_0285_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_629_NCLR, AGB_ITEM_NONE }, - [ITEM_INSECT_PLATE] = { NARC_item_data_0286_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_630_NCLR, AGB_ITEM_NONE }, - [ITEM_STONE_PLATE] = { NARC_item_data_0287_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_631_NCLR, AGB_ITEM_NONE }, - [ITEM_SPOOKY_PLATE] = { NARC_item_data_0288_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_632_NCLR, AGB_ITEM_NONE }, - [ITEM_DRACO_PLATE] = { NARC_item_data_0289_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_633_NCLR, AGB_ITEM_NONE }, - [ITEM_DREAD_PLATE] = { NARC_item_data_0290_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_634_NCLR, AGB_ITEM_NONE }, - [ITEM_IRON_PLATE] = { NARC_item_data_0291_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_635_NCLR, AGB_ITEM_NONE }, - [ITEM_ODD_INCENSE] = { NARC_item_data_0292_bin, NARC_item_icon_item_icon_522_NCGR, NARC_item_icon_item_icon_523_NCLR, AGB_ITEM_NONE }, - [ITEM_ROCK_INCENSE] = { NARC_item_data_0293_bin, NARC_item_icon_item_icon_524_NCGR, NARC_item_icon_item_icon_525_NCLR, AGB_ITEM_NONE }, - [ITEM_FULL_INCENSE] = { NARC_item_data_0294_bin, NARC_item_icon_item_icon_526_NCGR, NARC_item_icon_item_icon_527_NCLR, AGB_ITEM_NONE }, - [ITEM_WAVE_INCENSE] = { NARC_item_data_0295_bin, NARC_item_icon_item_icon_528_NCGR, NARC_item_icon_item_icon_529_NCLR, AGB_ITEM_NONE }, - [ITEM_ROSE_INCENSE] = { NARC_item_data_0296_bin, NARC_item_icon_item_icon_530_NCGR, NARC_item_icon_item_icon_531_NCLR, AGB_ITEM_NONE }, - [ITEM_LUCK_INCENSE] = { NARC_item_data_0297_bin, NARC_item_icon_item_icon_532_NCGR, NARC_item_icon_item_icon_533_NCLR, AGB_ITEM_NONE }, - [ITEM_PURE_INCENSE] = { NARC_item_data_0298_bin, NARC_item_icon_item_icon_534_NCGR, NARC_item_icon_item_icon_535_NCLR, AGB_ITEM_NONE }, - [ITEM_PROTECTOR] = { NARC_item_data_0299_bin, NARC_item_icon_item_icon_695_NCGR, NARC_item_icon_item_icon_696_NCLR, AGB_ITEM_NONE }, - [ITEM_ELECTIRIZER] = { NARC_item_data_0300_bin, NARC_item_icon_item_icon_536_NCGR, NARC_item_icon_item_icon_537_NCLR, AGB_ITEM_NONE }, - [ITEM_MAGMARIZER] = { NARC_item_data_0301_bin, NARC_item_icon_item_icon_538_NCGR, NARC_item_icon_item_icon_539_NCLR, AGB_ITEM_NONE }, - [ITEM_DUBIOUS_DISC] = { NARC_item_data_0302_bin, NARC_item_icon_item_icon_540_NCGR, NARC_item_icon_item_icon_541_NCLR, AGB_ITEM_NONE }, - [ITEM_REAPER_CLOTH] = { NARC_item_data_0303_bin, NARC_item_icon_item_icon_542_NCGR, NARC_item_icon_item_icon_543_NCLR, AGB_ITEM_NONE }, - [ITEM_RAZOR_CLAW] = { NARC_item_data_0304_bin, NARC_item_icon_item_icon_544_NCGR, NARC_item_icon_item_icon_545_NCLR, AGB_ITEM_NONE }, - [ITEM_RAZOR_FANG] = { NARC_item_data_0305_bin, NARC_item_icon_item_icon_546_NCGR, NARC_item_icon_item_icon_547_NCLR, AGB_ITEM_NONE }, - [ITEM_TM01] = { NARC_item_data_0306_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM01 }, - [ITEM_TM02] = { NARC_item_data_0307_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_TM02 }, - [ITEM_TM03] = { NARC_item_data_0308_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM03 }, - [ITEM_TM04] = { NARC_item_data_0309_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM04 }, - [ITEM_TM05] = { NARC_item_data_0310_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM05 }, - [ITEM_TM06] = { NARC_item_data_0311_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM06 }, - [ITEM_TM07] = { NARC_item_data_0312_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM07 }, - [ITEM_TM08] = { NARC_item_data_0313_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM08 }, - [ITEM_TM09] = { NARC_item_data_0314_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM09 }, - [ITEM_TM10] = { NARC_item_data_0315_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM10 }, - [ITEM_TM11] = { NARC_item_data_0316_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM11 }, - [ITEM_TM12] = { NARC_item_data_0317_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM12 }, - [ITEM_TM13] = { NARC_item_data_0318_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM13 }, - [ITEM_TM14] = { NARC_item_data_0319_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM14 }, - [ITEM_TM15] = { NARC_item_data_0320_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM15 }, - [ITEM_TM16] = { NARC_item_data_0321_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM16 }, - [ITEM_TM17] = { NARC_item_data_0322_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM17 }, - [ITEM_TM18] = { NARC_item_data_0323_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM18 }, - [ITEM_TM19] = { NARC_item_data_0324_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM19 }, - [ITEM_TM20] = { NARC_item_data_0325_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM20 }, - [ITEM_TM21] = { NARC_item_data_0326_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM21 }, - [ITEM_TM22] = { NARC_item_data_0327_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM22 }, - [ITEM_TM23] = { NARC_item_data_0328_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM23 }, - [ITEM_TM24] = { NARC_item_data_0329_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM24 }, - [ITEM_TM25] = { NARC_item_data_0330_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM25 }, - [ITEM_TM26] = { NARC_item_data_0331_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM26 }, - [ITEM_TM27] = { NARC_item_data_0332_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM27 }, - [ITEM_TM28] = { NARC_item_data_0333_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM28 }, - [ITEM_TM29] = { NARC_item_data_0334_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM29 }, - [ITEM_TM30] = { NARC_item_data_0335_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_TM30 }, - [ITEM_TM31] = { NARC_item_data_0336_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM31 }, - [ITEM_TM32] = { NARC_item_data_0337_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM32 }, - [ITEM_TM33] = { NARC_item_data_0338_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM33 }, - [ITEM_TM34] = { NARC_item_data_0339_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM34 }, - [ITEM_TM35] = { NARC_item_data_0340_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM35 }, - [ITEM_TM36] = { NARC_item_data_0341_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM36 }, - [ITEM_TM37] = { NARC_item_data_0342_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM37 }, - [ITEM_TM38] = { NARC_item_data_0343_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM38 }, - [ITEM_TM39] = { NARC_item_data_0344_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM39 }, - [ITEM_TM40] = { NARC_item_data_0345_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_TM40 }, - [ITEM_TM41] = { NARC_item_data_0346_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM41 }, - [ITEM_TM42] = { NARC_item_data_0347_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM42 }, - [ITEM_TM43] = { NARC_item_data_0348_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM43 }, - [ITEM_TM44] = { NARC_item_data_0349_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM44 }, - [ITEM_TM45] = { NARC_item_data_0350_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM45 }, - [ITEM_TM46] = { NARC_item_data_0351_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM46 }, - [ITEM_TM47] = { NARC_item_data_0352_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM47 }, - [ITEM_TM48] = { NARC_item_data_0353_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM48 }, - [ITEM_TM49] = { NARC_item_data_0354_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM49 }, - [ITEM_TM50] = { NARC_item_data_0355_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM50 }, - [ITEM_TM51] = { NARC_item_data_0356_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, - [ITEM_TM52] = { NARC_item_data_0357_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, - [ITEM_TM53] = { NARC_item_data_0358_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, - [ITEM_TM54] = { NARC_item_data_0359_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM55] = { NARC_item_data_0360_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_NONE }, - [ITEM_TM56] = { NARC_item_data_0361_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM57] = { NARC_item_data_0362_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, - [ITEM_TM58] = { NARC_item_data_0363_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM59] = { NARC_item_data_0364_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_NONE }, - [ITEM_TM60] = { NARC_item_data_0365_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, - [ITEM_TM61] = { NARC_item_data_0366_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_NONE }, - [ITEM_TM62] = { NARC_item_data_0367_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM63] = { NARC_item_data_0368_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM64] = { NARC_item_data_0369_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM65] = { NARC_item_data_0370_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_NONE }, - [ITEM_TM66] = { NARC_item_data_0371_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM67] = { NARC_item_data_0372_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM68] = { NARC_item_data_0373_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM69] = { NARC_item_data_0374_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM70] = { NARC_item_data_0375_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM71] = { NARC_item_data_0376_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM72] = { NARC_item_data_0377_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_NONE }, - [ITEM_TM73] = { NARC_item_data_0378_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, - [ITEM_TM74] = { NARC_item_data_0379_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, - [ITEM_TM75] = { NARC_item_data_0380_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM76] = { NARC_item_data_0381_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM77] = { NARC_item_data_0382_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM78] = { NARC_item_data_0383_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM79] = { NARC_item_data_0384_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM80] = { NARC_item_data_0385_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM81] = { NARC_item_data_0386_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM82] = { NARC_item_data_0387_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM83] = { NARC_item_data_0388_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM84] = { NARC_item_data_0389_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_NONE }, - [ITEM_TM85] = { NARC_item_data_0390_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, - [ITEM_TM86] = { NARC_item_data_0391_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, - [ITEM_TM87] = { NARC_item_data_0392_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM88] = { NARC_item_data_0393_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, - [ITEM_TM89] = { NARC_item_data_0394_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM90] = { NARC_item_data_0395_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM91] = { NARC_item_data_0396_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, - [ITEM_TM92] = { NARC_item_data_0397_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, - [ITEM_HM01] = { NARC_item_data_0398_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM01 }, - [ITEM_HM02] = { NARC_item_data_0399_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_HM02 }, - [ITEM_HM03] = { NARC_item_data_0400_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM03 }, - [ITEM_HM04] = { NARC_item_data_0401_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM04 }, - [ITEM_HM05] = { NARC_item_data_0402_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM05 }, - [ITEM_HM06] = { NARC_item_data_0403_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_HM06 }, - [ITEM_HM07] = { NARC_item_data_0404_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM07 }, - [ITEM_HM08] = { NARC_item_data_0405_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM08 }, - [ITEM_EXPLORER_KIT] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_LOOT_SACK] = { NARC_item_data_0406_bin, NARC_item_icon_item_icon_550_NCGR, NARC_item_icon_item_icon_551_NCLR, AGB_ITEM_NONE }, - [ITEM_RULE_BOOK] = { NARC_item_data_0407_bin, NARC_item_icon_item_icon_552_NCGR, NARC_item_icon_item_icon_553_NCLR, AGB_ITEM_NONE }, - [ITEM_POKE_RADAR] = { NARC_item_data_0408_bin, NARC_item_icon_item_icon_697_NCGR, NARC_item_icon_item_icon_698_NCLR, AGB_ITEM_NONE }, - [ITEM_POINT_CARD] = { NARC_item_data_0409_bin, NARC_item_icon_item_icon_681_NCGR, NARC_item_icon_item_icon_682_NCLR, AGB_ITEM_NONE }, - [ITEM_JOURNAL] = { NARC_item_data_0410_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, - [ITEM_SEAL_CASE] = { NARC_item_data_0411_bin, NARC_item_icon_item_icon_671_NCGR, NARC_item_icon_item_icon_672_NCLR, AGB_ITEM_NONE }, - [ITEM_FASHION_CASE] = { NARC_item_data_0412_bin, NARC_item_icon_item_icon_675_NCGR, NARC_item_icon_item_icon_676_NCLR, AGB_ITEM_NONE }, - [ITEM_SEAL_BAG] = { NARC_item_data_0413_bin, NARC_item_icon_item_icon_673_NCGR, NARC_item_icon_item_icon_674_NCLR, AGB_ITEM_NONE }, - [ITEM_PAL_PAD] = { NARC_item_data_0414_bin, NARC_item_icon_item_icon_661_NCGR, NARC_item_icon_item_icon_662_NCLR, AGB_ITEM_NONE }, - [ITEM_WORKS_KEY] = { NARC_item_data_0415_bin, NARC_item_icon_item_icon_644_NCGR, NARC_item_icon_item_icon_645_NCLR, AGB_ITEM_NONE }, - [ITEM_OLD_CHARM] = { NARC_item_data_0416_bin, NARC_item_icon_item_icon_604_NCGR, NARC_item_icon_item_icon_605_NCLR, AGB_ITEM_NONE }, - [ITEM_GALACTIC_KEY] = { NARC_item_data_0417_bin, NARC_item_icon_item_icon_656_NCGR, NARC_item_icon_item_icon_657_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_CHAIN] = { NARC_item_data_0418_bin, NARC_item_icon_item_icon_679_NCGR, NARC_item_icon_item_icon_680_NCLR, AGB_ITEM_NONE }, - [ITEM_TOWN_MAP] = { NARC_item_data_0419_bin, NARC_item_icon_item_icon_439_NCGR, NARC_item_icon_item_icon_440_NCLR, AGB_ITEM_TOWN_MAP }, - [ITEM_VS__SEEKER] = { NARC_item_data_0420_bin, NARC_item_icon_item_icon_441_NCGR, NARC_item_icon_item_icon_442_NCLR, AGB_ITEM_VS_SEEKER }, - [ITEM_COIN_CASE] = { NARC_item_data_0421_bin, NARC_item_icon_item_icon_349_NCGR, NARC_item_icon_item_icon_350_NCLR, AGB_ITEM_COIN_CASE }, - [ITEM_OLD_ROD] = { NARC_item_data_0422_bin, NARC_item_icon_item_icon_353_NCGR, NARC_item_icon_item_icon_354_NCLR, AGB_ITEM_OLD_ROD }, - [ITEM_GOOD_ROD] = { NARC_item_data_0423_bin, NARC_item_icon_item_icon_355_NCGR, NARC_item_icon_item_icon_356_NCLR, AGB_ITEM_GOOD_ROD }, - [ITEM_SUPER_ROD] = { NARC_item_data_0424_bin, NARC_item_icon_item_icon_357_NCGR, NARC_item_icon_item_icon_358_NCLR, AGB_ITEM_SUPER_ROD }, - [ITEM_SPRAYDUCK] = { NARC_item_data_0425_bin, NARC_item_icon_item_icon_363_NCGR, NARC_item_icon_item_icon_364_NCLR, AGB_ITEM_NONE }, - [ITEM_POFFIN_CASE] = { NARC_item_data_0426_bin, NARC_item_icon_item_icon_373_NCGR, NARC_item_icon_item_icon_374_NCLR, AGB_ITEM_NONE }, - [ITEM_BICYCLE] = { NARC_item_data_0427_bin, NARC_item_icon_item_icon_437_NCGR, NARC_item_icon_item_icon_438_NCLR, AGB_ITEM_BICYCLE }, - [ITEM_SUITE_KEY] = { NARC_item_data_0428_bin, NARC_item_icon_item_icon_429_NCGR, NARC_item_icon_item_icon_430_NCLR, AGB_ITEM_NONE }, - [ITEM_OAKS_LETTER] = { NARC_item_data_0429_bin, NARC_item_icon_item_icon_375_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_NONE }, - [ITEM_LUNAR_WING] = { NARC_item_data_0430_bin, NARC_item_icon_item_icon_602_NCGR, NARC_item_icon_item_icon_603_NCLR, AGB_ITEM_NONE }, - [ITEM_MEMBER_CARD] = { NARC_item_data_0431_bin, NARC_item_icon_item_icon_608_NCGR, NARC_item_icon_item_icon_609_NCLR, AGB_ITEM_NONE }, - [ITEM_AZURE_FLUTE] = { NARC_item_data_0432_bin, NARC_item_icon_item_icon_677_NCGR, NARC_item_icon_item_icon_678_NCLR, AGB_ITEM_NONE }, - [ITEM_S_S__TICKET] = { NARC_item_data_0433_bin, NARC_item_icon_item_icon_359_NCGR, NARC_item_icon_item_icon_360_NCLR, AGB_ITEM_SS_TICKET }, - [ITEM_CONTEST_PASS] = { NARC_item_data_0434_bin, NARC_item_icon_item_icon_361_NCGR, NARC_item_icon_item_icon_362_NCLR, AGB_ITEM_CONTEST_PASS }, - [ITEM_MAGMA_STONE] = { NARC_item_data_0435_bin, NARC_item_icon_item_icon_596_NCGR, NARC_item_icon_item_icon_597_NCLR, AGB_ITEM_NONE }, - [ITEM_PARCEL] = { NARC_item_data_0436_bin, NARC_item_icon_item_icon_415_NCGR, NARC_item_icon_item_icon_416_NCLR, AGB_ITEM_OAKS_PARCEL }, - [ITEM_COUPON_1] = { NARC_item_data_0437_bin, NARC_item_icon_item_icon_417_NCGR, NARC_item_icon_item_icon_418_NCLR, AGB_ITEM_NONE }, - [ITEM_COUPON_2] = { NARC_item_data_0438_bin, NARC_item_icon_item_icon_419_NCGR, NARC_item_icon_item_icon_420_NCLR, AGB_ITEM_NONE }, - [ITEM_COUPON_3] = { NARC_item_data_0439_bin, NARC_item_icon_item_icon_421_NCGR, NARC_item_icon_item_icon_422_NCLR, AGB_ITEM_NONE }, - [ITEM_STORAGE_KEY] = { NARC_item_data_0440_bin, NARC_item_icon_item_icon_598_NCGR, NARC_item_icon_item_icon_599_NCLR, AGB_ITEM_STORAGE_KEY }, - [ITEM_SECRETPOTION] = { NARC_item_data_0441_bin, NARC_item_icon_item_icon_600_NCGR, NARC_item_icon_item_icon_601_NCLR, AGB_ITEM_NONE }, - [ITEM_VS__RECORDER] = { NARC_item_data_0442_bin, NARC_item_icon_item_icon_701_NCGR, NARC_item_icon_item_icon_702_NCLR, AGB_ITEM_NONE }, - [ITEM_GRACIDEA] = { NARC_item_data_0443_bin, NARC_item_icon_item_icon_703_NCGR, NARC_item_icon_item_icon_704_NCLR, AGB_ITEM_NONE }, - [ITEM_SECRET_KEY] = { NARC_item_data_0444_bin, NARC_item_icon_item_icon_705_NCGR, NARC_item_icon_item_icon_706_NCLR, AGB_ITEM_SECRET_KEY }, - [ITEM_APRICORN_BOX] = { NARC_item_data_0445_bin, NARC_item_icon_item_icon_709_NCGR, NARC_item_icon_item_icon_710_NCLR, AGB_ITEM_NONE }, - [ITEM_UNOWN_REPORT] = { NARC_item_data_0446_bin, NARC_item_icon_item_icon_759_NCGR, NARC_item_icon_item_icon_760_NCLR, AGB_ITEM_NONE }, - [ITEM_BERRY_POTS] = { NARC_item_data_0447_bin, NARC_item_icon_item_icon_711_NCGR, NARC_item_icon_item_icon_712_NCLR, AGB_ITEM_NONE }, - [ITEM_DOWSING_MCHN] = { NARC_item_data_0448_bin, NARC_item_icon_item_icon_747_NCGR, NARC_item_icon_item_icon_748_NCLR, AGB_ITEM_ITEMFINDER }, - [ITEM_BLUE_CARD] = { NARC_item_data_0449_bin, NARC_item_icon_item_icon_761_NCGR, NARC_item_icon_item_icon_762_NCLR, AGB_ITEM_NONE }, - [ITEM_SLOWPOKETAIL] = { NARC_item_data_0450_bin, NARC_item_icon_item_icon_763_NCGR, NARC_item_icon_item_icon_764_NCLR, AGB_ITEM_NONE }, - [ITEM_CLEAR_BELL] = { NARC_item_data_0451_bin, NARC_item_icon_item_icon_765_NCGR, NARC_item_icon_item_icon_766_NCLR, AGB_ITEM_NONE }, - [ITEM_CARD_KEY] = { NARC_item_data_0452_bin, NARC_item_icon_item_icon_767_NCGR, NARC_item_icon_item_icon_768_NCLR, AGB_ITEM_CARD_KEY }, - [ITEM_BASEMENT_KEY] = { NARC_item_data_0453_bin, NARC_item_icon_item_icon_769_NCGR, NARC_item_icon_item_icon_770_NCLR, AGB_ITEM_BASEMENT_KEY }, - [ITEM_SQUIRTBOTTLE] = { NARC_item_data_0454_bin, NARC_item_icon_item_icon_713_NCGR, NARC_item_icon_item_icon_714_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_SCALE] = { NARC_item_data_0455_bin, NARC_item_icon_item_icon_771_NCGR, NARC_item_icon_item_icon_772_NCLR, AGB_ITEM_NONE }, - [ITEM_LOST_ITEM] = { NARC_item_data_0456_bin, NARC_item_icon_item_icon_773_NCGR, NARC_item_icon_item_icon_774_NCLR, AGB_ITEM_NONE }, - [ITEM_PASS] = { NARC_item_data_0457_bin, NARC_item_icon_item_icon_775_NCGR, NARC_item_icon_item_icon_776_NCLR, AGB_ITEM_NONE }, - [ITEM_MACHINE_PART] = { NARC_item_data_0458_bin, NARC_item_icon_item_icon_777_NCGR, NARC_item_icon_item_icon_778_NCLR, AGB_ITEM_NONE }, - [ITEM_SILVER_WING] = { NARC_item_data_0459_bin, NARC_item_icon_item_icon_779_NCGR, NARC_item_icon_item_icon_780_NCLR, AGB_ITEM_NONE }, - [ITEM_RAINBOW_WING] = { NARC_item_data_0460_bin, NARC_item_icon_item_icon_781_NCGR, NARC_item_icon_item_icon_782_NCLR, AGB_ITEM_NONE }, - [ITEM_MYSTERY_EGG] = { NARC_item_data_0461_bin, NARC_item_icon_item_icon_783_NCGR, NARC_item_icon_item_icon_784_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_APRICORN] = { NARC_item_data_0462_bin, NARC_item_icon_item_icon_733_NCGR, NARC_item_icon_item_icon_734_NCLR, AGB_ITEM_NONE }, - [ITEM_YLW_APRICORN] = { NARC_item_data_0463_bin, NARC_item_icon_item_icon_737_NCGR, NARC_item_icon_item_icon_738_NCLR, AGB_ITEM_NONE }, - [ITEM_BLU_APRICORN] = { NARC_item_data_0464_bin, NARC_item_icon_item_icon_735_NCGR, NARC_item_icon_item_icon_736_NCLR, AGB_ITEM_NONE }, - [ITEM_GRN_APRICORN] = { NARC_item_data_0465_bin, NARC_item_icon_item_icon_739_NCGR, NARC_item_icon_item_icon_740_NCLR, AGB_ITEM_NONE }, - [ITEM_PNK_APRICORN] = { NARC_item_data_0466_bin, NARC_item_icon_item_icon_741_NCGR, NARC_item_icon_item_icon_742_NCLR, AGB_ITEM_NONE }, - [ITEM_WHT_APRICORN] = { NARC_item_data_0467_bin, NARC_item_icon_item_icon_743_NCGR, NARC_item_icon_item_icon_744_NCLR, AGB_ITEM_NONE }, - [ITEM_BLK_APRICORN] = { NARC_item_data_0468_bin, NARC_item_icon_item_icon_745_NCGR, NARC_item_icon_item_icon_746_NCLR, AGB_ITEM_NONE }, - [ITEM_FAST_BALL] = { NARC_item_data_0469_bin, NARC_item_icon_item_icon_723_NCGR, NARC_item_icon_item_icon_724_NCLR, AGB_ITEM_NONE }, - [ITEM_LEVEL_BALL] = { NARC_item_data_0470_bin, NARC_item_icon_item_icon_717_NCGR, NARC_item_icon_item_icon_718_NCLR, AGB_ITEM_NONE }, - [ITEM_LURE_BALL] = { NARC_item_data_0471_bin, NARC_item_icon_item_icon_715_NCGR, NARC_item_icon_item_icon_716_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAVY_BALL] = { NARC_item_data_0472_bin, NARC_item_icon_item_icon_721_NCGR, NARC_item_icon_item_icon_722_NCLR, AGB_ITEM_NONE }, - [ITEM_LOVE_BALL] = { NARC_item_data_0473_bin, NARC_item_icon_item_icon_727_NCGR, NARC_item_icon_item_icon_728_NCLR, AGB_ITEM_NONE }, - [ITEM_FRIEND_BALL] = { NARC_item_data_0474_bin, NARC_item_icon_item_icon_725_NCGR, NARC_item_icon_item_icon_726_NCLR, AGB_ITEM_NONE }, - [ITEM_MOON_BALL] = { NARC_item_data_0475_bin, NARC_item_icon_item_icon_719_NCGR, NARC_item_icon_item_icon_720_NCLR, AGB_ITEM_NONE }, - [ITEM_SPORT_BALL] = { NARC_item_data_0476_bin, NARC_item_icon_item_icon_731_NCGR, NARC_item_icon_item_icon_732_NCLR, AGB_ITEM_NONE }, - [ITEM_PARK_BALL] = { NARC_item_data_0477_bin, NARC_item_icon_item_icon_729_NCGR, NARC_item_icon_item_icon_730_NCLR, AGB_ITEM_NONE }, - [ITEM_PHOTO_ALBUM] = { NARC_item_data_0478_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, - [ITEM_GB_SOUNDS] = { NARC_item_data_0479_bin, NARC_item_icon_item_icon_785_NCGR, NARC_item_icon_item_icon_786_NCLR, AGB_ITEM_NONE }, - [ITEM_TIDAL_BELL] = { NARC_item_data_0480_bin, NARC_item_icon_item_icon_787_NCGR, NARC_item_icon_item_icon_788_NCLR, AGB_ITEM_NONE }, - [ITEM_RAGECANDYBAR] = { NARC_item_data_0481_bin, NARC_item_icon_item_icon_749_NCGR, NARC_item_icon_item_icon_750_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_01] = { NARC_item_data_0482_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_02] = { NARC_item_data_0483_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_03] = { NARC_item_data_0484_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_04] = { NARC_item_data_0485_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_05] = { NARC_item_data_0486_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_06] = { NARC_item_data_0487_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_07] = { NARC_item_data_0488_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_08] = { NARC_item_data_0489_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_09] = { NARC_item_data_0490_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_10] = { NARC_item_data_0491_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_11] = { NARC_item_data_0492_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_12] = { NARC_item_data_0493_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_13] = { NARC_item_data_0494_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_14] = { NARC_item_data_0495_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_15] = { NARC_item_data_0496_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_16] = { NARC_item_data_0497_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_17] = { NARC_item_data_0498_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_18] = { NARC_item_data_0499_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_19] = { NARC_item_data_0500_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_20] = { NARC_item_data_0501_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_21] = { NARC_item_data_0502_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_22] = { NARC_item_data_0503_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_23] = { NARC_item_data_0504_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_24] = { NARC_item_data_0505_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_25] = { NARC_item_data_0506_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_26] = { NARC_item_data_0507_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_27] = { NARC_item_data_0508_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_JADE_ORB] = { NARC_item_data_0509_bin, NARC_item_icon_item_icon_755_NCGR, NARC_item_icon_item_icon_756_NCLR, AGB_ITEM_NONE }, - [ITEM_LOCK_CAPSULE] = { NARC_item_data_0510_bin, NARC_item_icon_item_icon_791_NCGR, NARC_item_icon_item_icon_792_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_ORB] = { NARC_item_data_0511_bin, NARC_item_icon_item_icon_751_NCGR, NARC_item_icon_item_icon_752_NCLR, AGB_ITEM_RED_ORB }, - [ITEM_BLUE_ORB] = { NARC_item_data_0512_bin, NARC_item_icon_item_icon_753_NCGR, NARC_item_icon_item_icon_754_NCLR, AGB_ITEM_BLUE_ORB }, - [ITEM_ENIGMA_STONE] = { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, + [ITEM_NONE] = {NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_MASTER_BALL] = { NARC_item_data_0001_bin, NARC_item_icon_item_icon_002_NCGR, NARC_item_icon_item_icon_003_NCLR, AGB_ITEM_MASTER_BALL }, + [ITEM_ULTRA_BALL] = { NARC_item_data_0002_bin, NARC_item_icon_item_icon_004_NCGR, NARC_item_icon_item_icon_005_NCLR, AGB_ITEM_ULTRA_BALL }, + [ITEM_GREAT_BALL] = { NARC_item_data_0003_bin, NARC_item_icon_item_icon_006_NCGR, NARC_item_icon_item_icon_007_NCLR, AGB_ITEM_GREAT_BALL }, + [ITEM_POKE_BALL] = { NARC_item_data_0004_bin, NARC_item_icon_item_icon_008_NCGR, NARC_item_icon_item_icon_009_NCLR, AGB_ITEM_POKE_BALL }, + [ITEM_SAFARI_BALL] = { NARC_item_data_0005_bin, NARC_item_icon_item_icon_010_NCGR, NARC_item_icon_item_icon_011_NCLR, AGB_ITEM_SAFARI_BALL }, + [ITEM_NET_BALL] = { NARC_item_data_0006_bin, NARC_item_icon_item_icon_012_NCGR, NARC_item_icon_item_icon_013_NCLR, AGB_ITEM_NET_BALL }, + [ITEM_DIVE_BALL] = { NARC_item_data_0007_bin, NARC_item_icon_item_icon_014_NCGR, NARC_item_icon_item_icon_015_NCLR, AGB_ITEM_DIVE_BALL }, + [ITEM_NEST_BALL] = { NARC_item_data_0008_bin, NARC_item_icon_item_icon_016_NCGR, NARC_item_icon_item_icon_017_NCLR, AGB_ITEM_NEST_BALL }, + [ITEM_REPEAT_BALL] = { NARC_item_data_0009_bin, NARC_item_icon_item_icon_018_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_REPEAT_BALL }, + [ITEM_TIMER_BALL] = { NARC_item_data_0010_bin, NARC_item_icon_item_icon_020_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_TIMER_BALL }, + [ITEM_LUXURY_BALL] = { NARC_item_data_0011_bin, NARC_item_icon_item_icon_021_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_LUXURY_BALL }, + [ITEM_PREMIER_BALL] = { NARC_item_data_0012_bin, NARC_item_icon_item_icon_023_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_PREMIER_BALL }, + [ITEM_DUSK_BALL] = { NARC_item_data_0013_bin, NARC_item_icon_item_icon_663_NCGR, NARC_item_icon_item_icon_664_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAL_BALL] = { NARC_item_data_0014_bin, NARC_item_icon_item_icon_665_NCGR, NARC_item_icon_item_icon_666_NCLR, AGB_ITEM_NONE }, + [ITEM_QUICK_BALL] = { NARC_item_data_0015_bin, NARC_item_icon_item_icon_667_NCGR, NARC_item_icon_item_icon_668_NCLR, AGB_ITEM_NONE }, + [ITEM_CHERISH_BALL] = { NARC_item_data_0016_bin, NARC_item_icon_item_icon_669_NCGR, NARC_item_icon_item_icon_670_NCLR, AGB_ITEM_NONE }, + [ITEM_POTION] = { NARC_item_data_0017_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_025_NCLR, AGB_ITEM_POTION }, + [ITEM_ANTIDOTE] = { NARC_item_data_0018_bin, NARC_item_icon_item_icon_026_NCGR, NARC_item_icon_item_icon_027_NCLR, AGB_ITEM_ANTIDOTE }, + [ITEM_BURN_HEAL] = { NARC_item_data_0019_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_028_NCLR, AGB_ITEM_BURN_HEAL }, + [ITEM_ICE_HEAL] = { NARC_item_data_0020_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_029_NCLR, AGB_ITEM_ICE_HEAL }, + [ITEM_AWAKENING] = { NARC_item_data_0021_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_031_NCLR, AGB_ITEM_AWAKENING }, + [ITEM_PARLYZ_HEAL] = { NARC_item_data_0022_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_032_NCLR, AGB_ITEM_PARALYZE_HEAL }, + [ITEM_FULL_RESTORE] = { NARC_item_data_0023_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_034_NCLR, AGB_ITEM_FULL_RESTORE }, + [ITEM_MAX_POTION] = { NARC_item_data_0024_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_035_NCLR, AGB_ITEM_MAX_POTION }, + [ITEM_HYPER_POTION] = { NARC_item_data_0025_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_036_NCLR, AGB_ITEM_HYPER_POTION }, + [ITEM_SUPER_POTION] = { NARC_item_data_0026_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_037_NCLR, AGB_ITEM_SUPER_POTION }, + [ITEM_FULL_HEAL] = { NARC_item_data_0027_bin, NARC_item_icon_item_icon_038_NCGR, NARC_item_icon_item_icon_039_NCLR, AGB_ITEM_FULL_HEAL }, + [ITEM_REVIVE] = { NARC_item_data_0028_bin, NARC_item_icon_item_icon_040_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_REVIVE }, + [ITEM_MAX_REVIVE] = { NARC_item_data_0029_bin, NARC_item_icon_item_icon_041_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_MAX_REVIVE }, + [ITEM_FRESH_WATER] = { NARC_item_data_0030_bin, NARC_item_icon_item_icon_043_NCGR, NARC_item_icon_item_icon_044_NCLR, AGB_ITEM_FRESH_WATER }, + [ITEM_SODA_POP] = { NARC_item_data_0031_bin, NARC_item_icon_item_icon_045_NCGR, NARC_item_icon_item_icon_046_NCLR, AGB_ITEM_SODA_POP }, + [ITEM_LEMONADE] = { NARC_item_data_0032_bin, NARC_item_icon_item_icon_047_NCGR, NARC_item_icon_item_icon_048_NCLR, AGB_ITEM_LEMONADE }, + [ITEM_MOOMOO_MILK] = { NARC_item_data_0033_bin, NARC_item_icon_item_icon_049_NCGR, NARC_item_icon_item_icon_050_NCLR, AGB_ITEM_MOOMOO_MILK }, + [ITEM_ENERGYPOWDER] = { NARC_item_data_0034_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_052_NCLR, AGB_ITEM_ENERGY_POWDER }, + [ITEM_ENERGY_ROOT] = { NARC_item_data_0035_bin, NARC_item_icon_item_icon_053_NCGR, NARC_item_icon_item_icon_054_NCLR, AGB_ITEM_ENERGY_ROOT }, + [ITEM_HEAL_POWDER] = { NARC_item_data_0036_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_055_NCLR, AGB_ITEM_HEAL_POWDER }, + [ITEM_REVIVAL_HERB] = { NARC_item_data_0037_bin, NARC_item_icon_item_icon_056_NCGR, NARC_item_icon_item_icon_057_NCLR, AGB_ITEM_REVIVAL_HERB }, + [ITEM_ETHER] = { NARC_item_data_0038_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_059_NCLR, AGB_ITEM_ETHER }, + [ITEM_MAX_ETHER] = { NARC_item_data_0039_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_060_NCLR, AGB_ITEM_MAX_ETHER }, + [ITEM_ELIXIR] = { NARC_item_data_0040_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_061_NCLR, AGB_ITEM_ELIXIR }, + [ITEM_MAX_ELIXIR] = { NARC_item_data_0041_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_062_NCLR, AGB_ITEM_MAX_ELIXIR }, + [ITEM_LAVA_COOKIE] = { NARC_item_data_0042_bin, NARC_item_icon_item_icon_063_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_LAVA_COOKIE }, + [ITEM_BERRY_JUICE] = { NARC_item_data_0043_bin, NARC_item_icon_item_icon_071_NCGR, NARC_item_icon_item_icon_072_NCLR, AGB_ITEM_BERRY_JUICE }, + [ITEM_SACRED_ASH] = { NARC_item_data_0044_bin, NARC_item_icon_item_icon_073_NCGR, NARC_item_icon_item_icon_074_NCLR, AGB_ITEM_SACRED_ASH }, + [ITEM_HP_UP] = { NARC_item_data_0045_bin, NARC_item_icon_item_icon_083_NCGR, NARC_item_icon_item_icon_084_NCLR, AGB_ITEM_HP_UP }, + [ITEM_PROTEIN] = { NARC_item_data_0046_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_086_NCLR, AGB_ITEM_PROTEIN }, + [ITEM_IRON] = { NARC_item_data_0047_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_087_NCLR, AGB_ITEM_IRON }, + [ITEM_CARBOS] = { NARC_item_data_0048_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_088_NCLR, AGB_ITEM_CARBOS }, + [ITEM_CALCIUM] = { NARC_item_data_0049_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_089_NCLR, AGB_ITEM_CALCIUM }, + [ITEM_RARE_CANDY] = { NARC_item_data_0050_bin, NARC_item_icon_item_icon_090_NCGR, NARC_item_icon_item_icon_091_NCLR, AGB_ITEM_RARE_CANDY }, + [ITEM_PP_UP] = { NARC_item_data_0051_bin, NARC_item_icon_item_icon_092_NCGR, NARC_item_icon_item_icon_093_NCLR, AGB_ITEM_PP_UP }, + [ITEM_ZINC] = { NARC_item_data_0052_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_094_NCLR, AGB_ITEM_ZINC }, + [ITEM_PP_MAX] = { NARC_item_data_0053_bin, NARC_item_icon_item_icon_095_NCGR, NARC_item_icon_item_icon_096_NCLR, AGB_ITEM_PP_MAX }, + [ITEM_OLD_GATEAU] = { NARC_item_data_0054_bin, NARC_item_icon_item_icon_466_NCGR, NARC_item_icon_item_icon_467_NCLR, AGB_ITEM_NONE }, + [ITEM_GUARD_SPEC_] = { NARC_item_data_0055_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_097_NCLR, AGB_ITEM_POKEHEARTGOLD_AGB_SPEC}, + [ITEM_DIRE_HIT] = { NARC_item_data_0056_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_098_NCLR, AGB_ITEM_DIRE_HIT }, + [ITEM_X_ATTACK] = { NARC_item_data_0057_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_099_NCLR, AGB_ITEM_X_ATTACK }, + [ITEM_X_DEFENSE] = { NARC_item_data_0058_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_101_NCLR, AGB_ITEM_X_DEFEND }, + [ITEM_X_SPEED] = { NARC_item_data_0059_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_102_NCLR, AGB_ITEM_X_SPEED }, + [ITEM_X_ACCURACY] = { NARC_item_data_0060_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_103_NCLR, AGB_ITEM_X_ACCURACY }, + [ITEM_X_SPECIAL] = { NARC_item_data_0061_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_104_NCLR, AGB_ITEM_X_SPECIAL }, + [ITEM_X_SP__DEF] = { NARC_item_data_0062_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_469_NCLR, AGB_ITEM_NONE }, + [ITEM_POKE_DOLL] = { NARC_item_data_0063_bin, NARC_item_icon_item_icon_105_NCGR, NARC_item_icon_item_icon_106_NCLR, AGB_ITEM_POKE_DOLL }, + [ITEM_FLUFFY_TAIL] = { NARC_item_data_0064_bin, NARC_item_icon_item_icon_107_NCGR, NARC_item_icon_item_icon_108_NCLR, AGB_ITEM_FLUFFY_TAIL }, + [ITEM_BLUE_FLUTE] = { NARC_item_data_0065_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_066_NCLR, AGB_ITEM_BLUE_FLUTE }, + [ITEM_YELLOW_FLUTE] = { NARC_item_data_0066_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_067_NCLR, AGB_ITEM_YELLOW_FLUTE }, + [ITEM_RED_FLUTE] = { NARC_item_data_0067_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_068_NCLR, AGB_ITEM_RED_FLUTE }, + [ITEM_BLACK_FLUTE] = { NARC_item_data_0068_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_069_NCLR, AGB_ITEM_BLACK_FLUTE }, + [ITEM_WHITE_FLUTE] = { NARC_item_data_0069_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_070_NCLR, AGB_ITEM_WHITE_FLUTE }, + [ITEM_SHOAL_SALT] = { NARC_item_data_0070_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_075_NCLR, AGB_ITEM_SHOAL_SALT }, + [ITEM_SHOAL_SHELL] = { NARC_item_data_0071_bin, NARC_item_icon_item_icon_076_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHOAL_SHELL }, + [ITEM_RED_SHARD] = { NARC_item_data_0072_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_079_NCLR, AGB_ITEM_RED_SHARD }, + [ITEM_BLUE_SHARD] = { NARC_item_data_0073_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_080_NCLR, AGB_ITEM_BLUE_SHARD }, + [ITEM_YELLOW_SHARD] = { NARC_item_data_0074_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_081_NCLR, AGB_ITEM_YELLOW_SHARD }, + [ITEM_GREEN_SHARD] = { NARC_item_data_0075_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_082_NCLR, AGB_ITEM_GREEN_SHARD }, + [ITEM_SUPER_REPEL] = { NARC_item_data_0076_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_110_NCLR, AGB_ITEM_SUPER_REPEL }, + [ITEM_MAX_REPEL] = { NARC_item_data_0077_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_111_NCLR, AGB_ITEM_MAX_REPEL }, + [ITEM_ESCAPE_ROPE] = { NARC_item_data_0078_bin, NARC_item_icon_item_icon_112_NCGR, NARC_item_icon_item_icon_113_NCLR, AGB_ITEM_ESCAPE_ROPE }, + [ITEM_REPEL] = { NARC_item_data_0079_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_114_NCLR, AGB_ITEM_REPEL }, + [ITEM_SUN_STONE] = { NARC_item_data_0080_bin, NARC_item_icon_item_icon_115_NCGR, NARC_item_icon_item_icon_116_NCLR, AGB_ITEM_SUN_STONE }, + [ITEM_MOON_STONE] = { NARC_item_data_0081_bin, NARC_item_icon_item_icon_117_NCGR, NARC_item_icon_item_icon_118_NCLR, AGB_ITEM_MOON_STONE }, + [ITEM_FIRE_STONE] = { NARC_item_data_0082_bin, NARC_item_icon_item_icon_119_NCGR, NARC_item_icon_item_icon_120_NCLR, AGB_ITEM_FIRE_STONE }, + [ITEM_THUNDERSTONE] = { NARC_item_data_0083_bin, NARC_item_icon_item_icon_121_NCGR, NARC_item_icon_item_icon_122_NCLR, AGB_ITEM_THUNDER_STONE }, + [ITEM_WATER_STONE] = { NARC_item_data_0084_bin, NARC_item_icon_item_icon_123_NCGR, NARC_item_icon_item_icon_124_NCLR, AGB_ITEM_WATER_STONE }, + [ITEM_LEAF_STONE] = { NARC_item_data_0085_bin, NARC_item_icon_item_icon_125_NCGR, NARC_item_icon_item_icon_126_NCLR, AGB_ITEM_LEAF_STONE }, + [ITEM_TINYMUSHROOM] = { NARC_item_data_0086_bin, NARC_item_icon_item_icon_127_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_TINY_MUSHROOM }, + [ITEM_BIG_MUSHROOM] = { NARC_item_data_0087_bin, NARC_item_icon_item_icon_128_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_BIG_MUSHROOM }, + [ITEM_PEARL] = { NARC_item_data_0088_bin, NARC_item_icon_item_icon_130_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_PEARL }, + [ITEM_BIG_PEARL] = { NARC_item_data_0089_bin, NARC_item_icon_item_icon_132_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_BIG_PEARL }, + [ITEM_STARDUST] = { NARC_item_data_0090_bin, NARC_item_icon_item_icon_133_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STARDUST }, + [ITEM_STAR_PIECE] = { NARC_item_data_0091_bin, NARC_item_icon_item_icon_135_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STAR_PIECE }, + [ITEM_NUGGET] = { NARC_item_data_0092_bin, NARC_item_icon_item_icon_136_NCGR, NARC_item_icon_item_icon_137_NCLR, AGB_ITEM_NUGGET }, + [ITEM_HEART_SCALE] = { NARC_item_data_0093_bin, NARC_item_icon_item_icon_138_NCGR, NARC_item_icon_item_icon_139_NCLR, AGB_ITEM_HEART_SCALE }, + [ITEM_HONEY] = { NARC_item_data_0094_bin, NARC_item_icon_item_icon_470_NCGR, NARC_item_icon_item_icon_471_NCLR, AGB_ITEM_NONE }, + [ITEM_GROWTH_MULCH] = { NARC_item_data_0095_bin, NARC_item_icon_item_icon_472_NCGR, NARC_item_icon_item_icon_473_NCLR, AGB_ITEM_NONE }, + [ITEM_DAMP_MULCH] = { NARC_item_data_0096_bin, NARC_item_icon_item_icon_474_NCGR, NARC_item_icon_item_icon_475_NCLR, AGB_ITEM_NONE }, + [ITEM_STABLE_MULCH] = { NARC_item_data_0097_bin, NARC_item_icon_item_icon_476_NCGR, NARC_item_icon_item_icon_477_NCLR, AGB_ITEM_NONE }, + [ITEM_GOOEY_MULCH] = { NARC_item_data_0098_bin, NARC_item_icon_item_icon_478_NCGR, NARC_item_icon_item_icon_479_NCLR, AGB_ITEM_NONE }, + [ITEM_ROOT_FOSSIL] = { NARC_item_data_0099_bin, NARC_item_icon_item_icon_392_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_ROOT_FOSSIL }, + [ITEM_CLAW_FOSSIL] = { NARC_item_data_0100_bin, NARC_item_icon_item_icon_394_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_CLAW_FOSSIL }, + [ITEM_HELIX_FOSSIL] = { NARC_item_data_0101_bin, NARC_item_icon_item_icon_431_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_HELIX_FOSSIL }, + [ITEM_DOME_FOSSIL] = { NARC_item_data_0102_bin, NARC_item_icon_item_icon_433_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_DOME_FOSSIL }, + [ITEM_OLD_AMBER] = { NARC_item_data_0103_bin, NARC_item_icon_item_icon_425_NCGR, NARC_item_icon_item_icon_426_NCLR, AGB_ITEM_OLD_AMBER }, + [ITEM_ARMOR_FOSSIL] = { NARC_item_data_0104_bin, NARC_item_icon_item_icon_617_NCGR, NARC_item_icon_item_icon_618_NCLR, AGB_ITEM_NONE }, + [ITEM_SKULL_FOSSIL] = { NARC_item_data_0105_bin, NARC_item_icon_item_icon_615_NCGR, NARC_item_icon_item_icon_616_NCLR, AGB_ITEM_NONE }, + [ITEM_RARE_BONE] = { NARC_item_data_0106_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_NONE }, + [ITEM_SHINY_STONE] = { NARC_item_data_0107_bin, NARC_item_icon_item_icon_480_NCGR, NARC_item_icon_item_icon_481_NCLR, AGB_ITEM_NONE }, + [ITEM_DUSK_STONE] = { NARC_item_data_0108_bin, NARC_item_icon_item_icon_482_NCGR, NARC_item_icon_item_icon_483_NCLR, AGB_ITEM_NONE }, + [ITEM_DAWN_STONE] = { NARC_item_data_0109_bin, NARC_item_icon_item_icon_484_NCGR, NARC_item_icon_item_icon_485_NCLR, AGB_ITEM_NONE }, + [ITEM_OVAL_STONE] = { NARC_item_data_0110_bin, NARC_item_icon_item_icon_486_NCGR, NARC_item_icon_item_icon_487_NCLR, AGB_ITEM_NONE }, + [ITEM_ODD_KEYSTONE] = { NARC_item_data_0111_bin, NARC_item_icon_item_icon_488_NCGR, NARC_item_icon_item_icon_489_NCLR, AGB_ITEM_NONE }, + [ITEM_GRISEOUS_ORB] = { NARC_item_data_0112_bin, NARC_item_icon_item_icon_699_NCGR, NARC_item_icon_item_icon_700_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_113] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_114] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_115] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_116] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_117] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_118] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_119] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_120] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_121] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_122] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_123] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_124] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_125] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_126] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_127] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_128] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_129] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_130] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_131] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_132] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_133] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_134] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_ADAMANT_ORB] = { NARC_item_data_0113_bin, NARC_item_icon_item_icon_648_NCGR, NARC_item_icon_item_icon_649_NCLR, AGB_ITEM_NONE }, + [ITEM_LUSTROUS_ORB] = { NARC_item_data_0114_bin, NARC_item_icon_item_icon_646_NCGR, NARC_item_icon_item_icon_647_NCLR, AGB_ITEM_NONE }, + [ITEM_GRASS_MAIL] = { NARC_item_data_0115_bin, NARC_item_icon_item_icon_140_NCGR, NARC_item_icon_item_icon_141_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_MAIL] = { NARC_item_data_0116_bin, NARC_item_icon_item_icon_142_NCGR, NARC_item_icon_item_icon_143_NCLR, AGB_ITEM_NONE }, + [ITEM_BUBBLE_MAIL] = { NARC_item_data_0117_bin, NARC_item_icon_item_icon_144_NCGR, NARC_item_icon_item_icon_145_NCLR, AGB_ITEM_NONE }, + [ITEM_BLOOM_MAIL] = { NARC_item_data_0118_bin, NARC_item_icon_item_icon_146_NCGR, NARC_item_icon_item_icon_147_NCLR, AGB_ITEM_NONE }, + [ITEM_TUNNEL_MAIL] = { NARC_item_data_0119_bin, NARC_item_icon_item_icon_148_NCGR, NARC_item_icon_item_icon_149_NCLR, AGB_ITEM_NONE }, + [ITEM_STEEL_MAIL] = { NARC_item_data_0120_bin, NARC_item_icon_item_icon_150_NCGR, NARC_item_icon_item_icon_151_NCLR, AGB_ITEM_NONE }, + [ITEM_HEART_MAIL] = { NARC_item_data_0121_bin, NARC_item_icon_item_icon_152_NCGR, NARC_item_icon_item_icon_153_NCLR, AGB_ITEM_NONE }, + [ITEM_SNOW_MAIL] = { NARC_item_data_0122_bin, NARC_item_icon_item_icon_154_NCGR, NARC_item_icon_item_icon_155_NCLR, AGB_ITEM_NONE }, + [ITEM_SPACE_MAIL] = { NARC_item_data_0123_bin, NARC_item_icon_item_icon_156_NCGR, NARC_item_icon_item_icon_157_NCLR, AGB_ITEM_NONE }, + [ITEM_AIR_MAIL] = { NARC_item_data_0124_bin, NARC_item_icon_item_icon_158_NCGR, NARC_item_icon_item_icon_159_NCLR, AGB_ITEM_NONE }, + [ITEM_MOSAIC_MAIL] = { NARC_item_data_0125_bin, NARC_item_icon_item_icon_160_NCGR, NARC_item_icon_item_icon_161_NCLR, AGB_ITEM_NONE }, + [ITEM_BRICK_MAIL] = { NARC_item_data_0126_bin, NARC_item_icon_item_icon_162_NCGR, NARC_item_icon_item_icon_163_NCLR, AGB_ITEM_NONE }, + [ITEM_CHERI_BERRY] = { NARC_item_data_0127_bin, NARC_item_icon_item_icon_164_NCGR, NARC_item_icon_item_icon_165_NCLR, AGB_ITEM_CHERI_BERRY }, + [ITEM_CHESTO_BERRY] = { NARC_item_data_0128_bin, NARC_item_icon_item_icon_166_NCGR, NARC_item_icon_item_icon_167_NCLR, AGB_ITEM_CHESTO_BERRY }, + [ITEM_PECHA_BERRY] = { NARC_item_data_0129_bin, NARC_item_icon_item_icon_168_NCGR, NARC_item_icon_item_icon_169_NCLR, AGB_ITEM_PECHA_BERRY }, + [ITEM_RAWST_BERRY] = { NARC_item_data_0130_bin, NARC_item_icon_item_icon_170_NCGR, NARC_item_icon_item_icon_171_NCLR, AGB_ITEM_RAWST_BERRY }, + [ITEM_ASPEAR_BERRY] = { NARC_item_data_0131_bin, NARC_item_icon_item_icon_172_NCGR, NARC_item_icon_item_icon_173_NCLR, AGB_ITEM_ASPEAR_BERRY }, + [ITEM_LEPPA_BERRY] = { NARC_item_data_0132_bin, NARC_item_icon_item_icon_174_NCGR, NARC_item_icon_item_icon_175_NCLR, AGB_ITEM_LEPPA_BERRY }, + [ITEM_ORAN_BERRY] = { NARC_item_data_0133_bin, NARC_item_icon_item_icon_176_NCGR, NARC_item_icon_item_icon_177_NCLR, AGB_ITEM_ORAN_BERRY }, + [ITEM_PERSIM_BERRY] = { NARC_item_data_0134_bin, NARC_item_icon_item_icon_178_NCGR, NARC_item_icon_item_icon_179_NCLR, AGB_ITEM_PERSIM_BERRY }, + [ITEM_LUM_BERRY] = { NARC_item_data_0135_bin, NARC_item_icon_item_icon_180_NCGR, NARC_item_icon_item_icon_181_NCLR, AGB_ITEM_LUM_BERRY }, + [ITEM_SITRUS_BERRY] = { NARC_item_data_0136_bin, NARC_item_icon_item_icon_182_NCGR, NARC_item_icon_item_icon_183_NCLR, AGB_ITEM_SITRUS_BERRY }, + [ITEM_FIGY_BERRY] = { NARC_item_data_0137_bin, NARC_item_icon_item_icon_184_NCGR, NARC_item_icon_item_icon_185_NCLR, AGB_ITEM_FIGY_BERRY }, + [ITEM_WIKI_BERRY] = { NARC_item_data_0138_bin, NARC_item_icon_item_icon_186_NCGR, NARC_item_icon_item_icon_187_NCLR, AGB_ITEM_WIKI_BERRY }, + [ITEM_MAGO_BERRY] = { NARC_item_data_0139_bin, NARC_item_icon_item_icon_188_NCGR, NARC_item_icon_item_icon_189_NCLR, AGB_ITEM_MAGO_BERRY }, + [ITEM_AGUAV_BERRY] = { NARC_item_data_0140_bin, NARC_item_icon_item_icon_190_NCGR, NARC_item_icon_item_icon_191_NCLR, AGB_ITEM_AGUAV_BERRY }, + [ITEM_IAPAPA_BERRY] = { NARC_item_data_0141_bin, NARC_item_icon_item_icon_192_NCGR, NARC_item_icon_item_icon_193_NCLR, AGB_ITEM_IAPAPA_BERRY }, + [ITEM_RAZZ_BERRY] = { NARC_item_data_0142_bin, NARC_item_icon_item_icon_194_NCGR, NARC_item_icon_item_icon_195_NCLR, AGB_ITEM_RAZZ_BERRY }, + [ITEM_BLUK_BERRY] = { NARC_item_data_0143_bin, NARC_item_icon_item_icon_196_NCGR, NARC_item_icon_item_icon_197_NCLR, AGB_ITEM_BLUK_BERRY }, + [ITEM_NANAB_BERRY] = { NARC_item_data_0144_bin, NARC_item_icon_item_icon_198_NCGR, NARC_item_icon_item_icon_199_NCLR, AGB_ITEM_NANAB_BERRY }, + [ITEM_WEPEAR_BERRY] = { NARC_item_data_0145_bin, NARC_item_icon_item_icon_200_NCGR, NARC_item_icon_item_icon_201_NCLR, AGB_ITEM_WEPEAR_BERRY }, + [ITEM_PINAP_BERRY] = { NARC_item_data_0146_bin, NARC_item_icon_item_icon_202_NCGR, NARC_item_icon_item_icon_203_NCLR, AGB_ITEM_PINAP_BERRY }, + [ITEM_POMEG_BERRY] = { NARC_item_data_0147_bin, NARC_item_icon_item_icon_204_NCGR, NARC_item_icon_item_icon_205_NCLR, AGB_ITEM_POMEG_BERRY }, + [ITEM_KELPSY_BERRY] = { NARC_item_data_0148_bin, NARC_item_icon_item_icon_206_NCGR, NARC_item_icon_item_icon_207_NCLR, AGB_ITEM_KELPSY_BERRY }, + [ITEM_QUALOT_BERRY] = { NARC_item_data_0149_bin, NARC_item_icon_item_icon_208_NCGR, NARC_item_icon_item_icon_209_NCLR, AGB_ITEM_QUALOT_BERRY }, + [ITEM_HONDEW_BERRY] = { NARC_item_data_0150_bin, NARC_item_icon_item_icon_210_NCGR, NARC_item_icon_item_icon_211_NCLR, AGB_ITEM_HONDEW_BERRY }, + [ITEM_GREPA_BERRY] = { NARC_item_data_0151_bin, NARC_item_icon_item_icon_212_NCGR, NARC_item_icon_item_icon_213_NCLR, AGB_ITEM_GREPA_BERRY }, + [ITEM_TAMATO_BERRY] = { NARC_item_data_0152_bin, NARC_item_icon_item_icon_214_NCGR, NARC_item_icon_item_icon_215_NCLR, AGB_ITEM_TAMATO_BERRY }, + [ITEM_CORNN_BERRY] = { NARC_item_data_0153_bin, NARC_item_icon_item_icon_216_NCGR, NARC_item_icon_item_icon_217_NCLR, AGB_ITEM_CORNN_BERRY }, + [ITEM_MAGOST_BERRY] = { NARC_item_data_0154_bin, NARC_item_icon_item_icon_218_NCGR, NARC_item_icon_item_icon_219_NCLR, AGB_ITEM_MAGOST_BERRY }, + [ITEM_RABUTA_BERRY] = { NARC_item_data_0155_bin, NARC_item_icon_item_icon_220_NCGR, NARC_item_icon_item_icon_221_NCLR, AGB_ITEM_RABUTA_BERRY }, + [ITEM_NOMEL_BERRY] = { NARC_item_data_0156_bin, NARC_item_icon_item_icon_222_NCGR, NARC_item_icon_item_icon_223_NCLR, AGB_ITEM_NOMEL_BERRY }, + [ITEM_SPELON_BERRY] = { NARC_item_data_0157_bin, NARC_item_icon_item_icon_224_NCGR, NARC_item_icon_item_icon_225_NCLR, AGB_ITEM_SPELON_BERRY }, + [ITEM_PAMTRE_BERRY] = { NARC_item_data_0158_bin, NARC_item_icon_item_icon_226_NCGR, NARC_item_icon_item_icon_227_NCLR, AGB_ITEM_PAMTRE_BERRY }, + [ITEM_WATMEL_BERRY] = { NARC_item_data_0159_bin, NARC_item_icon_item_icon_228_NCGR, NARC_item_icon_item_icon_229_NCLR, AGB_ITEM_WATMEL_BERRY }, + [ITEM_DURIN_BERRY] = { NARC_item_data_0160_bin, NARC_item_icon_item_icon_230_NCGR, NARC_item_icon_item_icon_231_NCLR, AGB_ITEM_DURIN_BERRY }, + [ITEM_BELUE_BERRY] = { NARC_item_data_0161_bin, NARC_item_icon_item_icon_232_NCGR, NARC_item_icon_item_icon_233_NCLR, AGB_ITEM_BELUE_BERRY }, + [ITEM_OCCA_BERRY] = { NARC_item_data_0162_bin, NARC_item_icon_item_icon_554_NCGR, NARC_item_icon_item_icon_555_NCLR, AGB_ITEM_NONE }, + [ITEM_PASSHO_BERRY] = { NARC_item_data_0163_bin, NARC_item_icon_item_icon_556_NCGR, NARC_item_icon_item_icon_557_NCLR, AGB_ITEM_NONE }, + [ITEM_WACAN_BERRY] = { NARC_item_data_0164_bin, NARC_item_icon_item_icon_558_NCGR, NARC_item_icon_item_icon_559_NCLR, AGB_ITEM_NONE }, + [ITEM_RINDO_BERRY] = { NARC_item_data_0165_bin, NARC_item_icon_item_icon_560_NCGR, NARC_item_icon_item_icon_561_NCLR, AGB_ITEM_NONE }, + [ITEM_YACHE_BERRY] = { NARC_item_data_0166_bin, NARC_item_icon_item_icon_562_NCGR, NARC_item_icon_item_icon_563_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOPLE_BERRY] = { NARC_item_data_0167_bin, NARC_item_icon_item_icon_564_NCGR, NARC_item_icon_item_icon_565_NCLR, AGB_ITEM_NONE }, + [ITEM_KEBIA_BERRY] = { NARC_item_data_0168_bin, NARC_item_icon_item_icon_566_NCGR, NARC_item_icon_item_icon_567_NCLR, AGB_ITEM_NONE }, + [ITEM_SHUCA_BERRY] = { NARC_item_data_0169_bin, NARC_item_icon_item_icon_568_NCGR, NARC_item_icon_item_icon_569_NCLR, AGB_ITEM_NONE }, + [ITEM_COBA_BERRY] = { NARC_item_data_0170_bin, NARC_item_icon_item_icon_570_NCGR, NARC_item_icon_item_icon_571_NCLR, AGB_ITEM_NONE }, + [ITEM_PAYAPA_BERRY] = { NARC_item_data_0171_bin, NARC_item_icon_item_icon_572_NCGR, NARC_item_icon_item_icon_573_NCLR, AGB_ITEM_NONE }, + [ITEM_TANGA_BERRY] = { NARC_item_data_0172_bin, NARC_item_icon_item_icon_574_NCGR, NARC_item_icon_item_icon_575_NCLR, AGB_ITEM_NONE }, + [ITEM_CHARTI_BERRY] = { NARC_item_data_0173_bin, NARC_item_icon_item_icon_576_NCGR, NARC_item_icon_item_icon_577_NCLR, AGB_ITEM_NONE }, + [ITEM_KASIB_BERRY] = { NARC_item_data_0174_bin, NARC_item_icon_item_icon_578_NCGR, NARC_item_icon_item_icon_579_NCLR, AGB_ITEM_NONE }, + [ITEM_HABAN_BERRY] = { NARC_item_data_0175_bin, NARC_item_icon_item_icon_580_NCGR, NARC_item_icon_item_icon_581_NCLR, AGB_ITEM_NONE }, + [ITEM_COLBUR_BERRY] = { NARC_item_data_0176_bin, NARC_item_icon_item_icon_582_NCGR, NARC_item_icon_item_icon_583_NCLR, AGB_ITEM_NONE }, + [ITEM_BABIRI_BERRY] = { NARC_item_data_0177_bin, NARC_item_icon_item_icon_584_NCGR, NARC_item_icon_item_icon_585_NCLR, AGB_ITEM_NONE }, + [ITEM_CHILAN_BERRY] = { NARC_item_data_0178_bin, NARC_item_icon_item_icon_586_NCGR, NARC_item_icon_item_icon_587_NCLR, AGB_ITEM_NONE }, + [ITEM_LIECHI_BERRY] = { NARC_item_data_0179_bin, NARC_item_icon_item_icon_234_NCGR, NARC_item_icon_item_icon_235_NCLR, AGB_ITEM_LIECHI_BERRY }, + [ITEM_GANLON_BERRY] = { NARC_item_data_0180_bin, NARC_item_icon_item_icon_236_NCGR, NARC_item_icon_item_icon_237_NCLR, AGB_ITEM_GANLON_BERRY }, + [ITEM_SALAC_BERRY] = { NARC_item_data_0181_bin, NARC_item_icon_item_icon_238_NCGR, NARC_item_icon_item_icon_239_NCLR, AGB_ITEM_SALAC_BERRY }, + [ITEM_PETAYA_BERRY] = { NARC_item_data_0182_bin, NARC_item_icon_item_icon_240_NCGR, NARC_item_icon_item_icon_241_NCLR, AGB_ITEM_PETAYA_BERRY }, + [ITEM_APICOT_BERRY] = { NARC_item_data_0183_bin, NARC_item_icon_item_icon_242_NCGR, NARC_item_icon_item_icon_243_NCLR, AGB_ITEM_APICOT_BERRY }, + [ITEM_LANSAT_BERRY] = { NARC_item_data_0184_bin, NARC_item_icon_item_icon_244_NCGR, NARC_item_icon_item_icon_245_NCLR, AGB_ITEM_LANSAT_BERRY }, + [ITEM_STARF_BERRY] = { NARC_item_data_0185_bin, NARC_item_icon_item_icon_246_NCGR, NARC_item_icon_item_icon_247_NCLR, AGB_ITEM_STARF_BERRY }, + [ITEM_ENIGMA_BERRY] = { NARC_item_data_0186_bin, NARC_item_icon_item_icon_248_NCGR, NARC_item_icon_item_icon_249_NCLR, AGB_ITEM_ENIGMA_BERRY }, + [ITEM_MICLE_BERRY] = { NARC_item_data_0187_bin, NARC_item_icon_item_icon_588_NCGR, NARC_item_icon_item_icon_589_NCLR, AGB_ITEM_NONE }, + [ITEM_CUSTAP_BERRY] = { NARC_item_data_0188_bin, NARC_item_icon_item_icon_590_NCGR, NARC_item_icon_item_icon_591_NCLR, AGB_ITEM_NONE }, + [ITEM_JABOCA_BERRY] = { NARC_item_data_0189_bin, NARC_item_icon_item_icon_592_NCGR, NARC_item_icon_item_icon_593_NCLR, AGB_ITEM_NONE }, + [ITEM_ROWAP_BERRY] = { NARC_item_data_0190_bin, NARC_item_icon_item_icon_594_NCGR, NARC_item_icon_item_icon_595_NCLR, AGB_ITEM_NONE }, + [ITEM_BRIGHTPOWDER] = { NARC_item_data_0191_bin, NARC_item_icon_item_icon_250_NCGR, NARC_item_icon_item_icon_251_NCLR, AGB_ITEM_BRIGHT_POWDER }, + [ITEM_WHITE_HERB] = { NARC_item_data_0192_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_253_NCLR, AGB_ITEM_WHITE_HERB }, + [ITEM_MACHO_BRACE] = { NARC_item_data_0193_bin, NARC_item_icon_item_icon_254_NCGR, NARC_item_icon_item_icon_255_NCLR, AGB_ITEM_MACHO_BRACE }, + [ITEM_EXP__SHARE] = { NARC_item_data_0194_bin, NARC_item_icon_item_icon_256_NCGR, NARC_item_icon_item_icon_257_NCLR, AGB_ITEM_EXP_SHARE }, + [ITEM_QUICK_CLAW] = { NARC_item_data_0195_bin, NARC_item_icon_item_icon_258_NCGR, NARC_item_icon_item_icon_259_NCLR, AGB_ITEM_QUICK_CLAW }, + [ITEM_SOOTHE_BELL] = { NARC_item_data_0196_bin, NARC_item_icon_item_icon_260_NCGR, NARC_item_icon_item_icon_261_NCLR, AGB_ITEM_SOOTHE_BELL }, + [ITEM_MENTAL_HERB] = { NARC_item_data_0197_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_262_NCLR, AGB_ITEM_MENTAL_HERB }, + [ITEM_CHOICE_BAND] = { NARC_item_data_0198_bin, NARC_item_icon_item_icon_263_NCGR, NARC_item_icon_item_icon_264_NCLR, AGB_ITEM_CHOICE_BAND }, + [ITEM_KINGS_ROCK] = { NARC_item_data_0199_bin, NARC_item_icon_item_icon_265_NCGR, NARC_item_icon_item_icon_266_NCLR, AGB_ITEM_KINGS_ROCK }, + [ITEM_SILVERPOWDER] = { NARC_item_data_0200_bin, NARC_item_icon_item_icon_267_NCGR, NARC_item_icon_item_icon_268_NCLR, AGB_ITEM_SILVER_POWDER }, + [ITEM_AMULET_COIN] = { NARC_item_data_0201_bin, NARC_item_icon_item_icon_269_NCGR, NARC_item_icon_item_icon_270_NCLR, AGB_ITEM_AMULET_COIN }, + [ITEM_CLEANSE_TAG] = { NARC_item_data_0202_bin, NARC_item_icon_item_icon_271_NCGR, NARC_item_icon_item_icon_272_NCLR, AGB_ITEM_CLEANSE_TAG }, + [ITEM_SOUL_DEW] = { NARC_item_data_0203_bin, NARC_item_icon_item_icon_273_NCGR, NARC_item_icon_item_icon_274_NCLR, AGB_ITEM_SOUL_DEW }, + [ITEM_DEEPSEATOOTH] = { NARC_item_data_0204_bin, NARC_item_icon_item_icon_275_NCGR, NARC_item_icon_item_icon_276_NCLR, AGB_ITEM_DEEP_SEA_TOOTH }, + [ITEM_DEEPSEASCALE] = { NARC_item_data_0205_bin, NARC_item_icon_item_icon_277_NCGR, NARC_item_icon_item_icon_278_NCLR, AGB_ITEM_DEEP_SEA_SCALE }, + [ITEM_SMOKE_BALL] = { NARC_item_data_0206_bin, NARC_item_icon_item_icon_279_NCGR, NARC_item_icon_item_icon_280_NCLR, AGB_ITEM_SMOKE_BALL }, + [ITEM_EVERSTONE] = { NARC_item_data_0207_bin, NARC_item_icon_item_icon_281_NCGR, NARC_item_icon_item_icon_282_NCLR, AGB_ITEM_EVERSTONE }, + [ITEM_FOCUS_BAND] = { NARC_item_data_0208_bin, NARC_item_icon_item_icon_283_NCGR, NARC_item_icon_item_icon_284_NCLR, AGB_ITEM_FOCUS_BAND }, + [ITEM_LUCKY_EGG] = { NARC_item_data_0209_bin, NARC_item_icon_item_icon_285_NCGR, NARC_item_icon_item_icon_286_NCLR, AGB_ITEM_LUCKY_EGG }, + [ITEM_SCOPE_LENS] = { NARC_item_data_0210_bin, NARC_item_icon_item_icon_287_NCGR, NARC_item_icon_item_icon_288_NCLR, AGB_ITEM_SCOPE_LENS }, + [ITEM_METAL_COAT] = { NARC_item_data_0211_bin, NARC_item_icon_item_icon_289_NCGR, NARC_item_icon_item_icon_290_NCLR, AGB_ITEM_METAL_COAT }, + [ITEM_LEFTOVERS] = { NARC_item_data_0212_bin, NARC_item_icon_item_icon_291_NCGR, NARC_item_icon_item_icon_292_NCLR, AGB_ITEM_LEFTOVERS }, + [ITEM_DRAGON_SCALE] = { NARC_item_data_0213_bin, NARC_item_icon_item_icon_293_NCGR, NARC_item_icon_item_icon_294_NCLR, AGB_ITEM_DRAGON_SCALE }, + [ITEM_LIGHT_BALL] = { NARC_item_data_0214_bin, NARC_item_icon_item_icon_295_NCGR, NARC_item_icon_item_icon_296_NCLR, AGB_ITEM_LIGHT_BALL }, + [ITEM_SOFT_SAND] = { NARC_item_data_0215_bin, NARC_item_icon_item_icon_297_NCGR, NARC_item_icon_item_icon_298_NCLR, AGB_ITEM_SOFT_SAND }, + [ITEM_HARD_STONE] = { NARC_item_data_0216_bin, NARC_item_icon_item_icon_299_NCGR, NARC_item_icon_item_icon_300_NCLR, AGB_ITEM_HARD_STONE }, + [ITEM_MIRACLE_SEED] = { NARC_item_data_0217_bin, NARC_item_icon_item_icon_301_NCGR, NARC_item_icon_item_icon_302_NCLR, AGB_ITEM_MIRACLE_SEED }, + [ITEM_BLACKGLASSES] = { NARC_item_data_0218_bin, NARC_item_icon_item_icon_303_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_GLASSES }, + [ITEM_BLACK_BELT] = { NARC_item_data_0219_bin, NARC_item_icon_item_icon_305_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_BELT }, + [ITEM_MAGNET] = { NARC_item_data_0220_bin, NARC_item_icon_item_icon_306_NCGR, NARC_item_icon_item_icon_307_NCLR, AGB_ITEM_MAGNET }, + [ITEM_MYSTIC_WATER] = { NARC_item_data_0221_bin, NARC_item_icon_item_icon_308_NCGR, NARC_item_icon_item_icon_309_NCLR, AGB_ITEM_MYSTIC_WATER }, + [ITEM_SHARP_BEAK] = { NARC_item_data_0222_bin, NARC_item_icon_item_icon_310_NCGR, NARC_item_icon_item_icon_311_NCLR, AGB_ITEM_SHARP_BEAK }, + [ITEM_POISON_BARB] = { NARC_item_data_0223_bin, NARC_item_icon_item_icon_312_NCGR, NARC_item_icon_item_icon_313_NCLR, AGB_ITEM_POISON_BARB }, + [ITEM_NEVERMELTICE] = { NARC_item_data_0224_bin, NARC_item_icon_item_icon_314_NCGR, NARC_item_icon_item_icon_315_NCLR, AGB_ITEM_NEVER_MELT_ICE }, + [ITEM_SPELL_TAG] = { NARC_item_data_0225_bin, NARC_item_icon_item_icon_316_NCGR, NARC_item_icon_item_icon_317_NCLR, AGB_ITEM_SPELL_TAG }, + [ITEM_TWISTEDSPOON] = { NARC_item_data_0226_bin, NARC_item_icon_item_icon_318_NCGR, NARC_item_icon_item_icon_319_NCLR, AGB_ITEM_TWISTED_SPOON }, + [ITEM_CHARCOAL] = { NARC_item_data_0227_bin, NARC_item_icon_item_icon_320_NCGR, NARC_item_icon_item_icon_321_NCLR, AGB_ITEM_CHARCOAL }, + [ITEM_DRAGON_FANG] = { NARC_item_data_0228_bin, NARC_item_icon_item_icon_322_NCGR, NARC_item_icon_item_icon_323_NCLR, AGB_ITEM_DRAGON_FANG }, + [ITEM_SILK_SCARF] = { NARC_item_data_0229_bin, NARC_item_icon_item_icon_324_NCGR, NARC_item_icon_item_icon_325_NCLR, AGB_ITEM_SILK_SCARF }, + [ITEM_UPGRADE] = { NARC_item_data_0230_bin, NARC_item_icon_item_icon_326_NCGR, NARC_item_icon_item_icon_327_NCLR, AGB_ITEM_UP_GRADE }, + [ITEM_SHELL_BELL] = { NARC_item_data_0231_bin, NARC_item_icon_item_icon_328_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHELL_BELL }, + [ITEM_SEA_INCENSE] = { NARC_item_data_0232_bin, NARC_item_icon_item_icon_329_NCGR, NARC_item_icon_item_icon_330_NCLR, AGB_ITEM_SEA_INCENSE }, + [ITEM_LAX_INCENSE] = { NARC_item_data_0233_bin, NARC_item_icon_item_icon_331_NCGR, NARC_item_icon_item_icon_332_NCLR, AGB_ITEM_LAX_INCENSE }, + [ITEM_LUCKY_PUNCH] = { NARC_item_data_0234_bin, NARC_item_icon_item_icon_333_NCGR, NARC_item_icon_item_icon_334_NCLR, AGB_ITEM_LUCKY_PUNCH }, + [ITEM_METAL_POWDER] = { NARC_item_data_0235_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_336_NCLR, AGB_ITEM_METAL_POWDER }, + [ITEM_THICK_CLUB] = { NARC_item_data_0236_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_THICK_CLUB }, + [ITEM_STICK] = { NARC_item_data_0237_bin, NARC_item_icon_item_icon_339_NCGR, NARC_item_icon_item_icon_340_NCLR, AGB_ITEM_STICK }, + [ITEM_RED_SCARF] = { NARC_item_data_0238_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_342_NCLR, AGB_ITEM_RED_SCARF }, + [ITEM_BLUE_SCARF] = { NARC_item_data_0239_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_343_NCLR, AGB_ITEM_BLUE_SCARF }, + [ITEM_PINK_SCARF] = { NARC_item_data_0240_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_344_NCLR, AGB_ITEM_PINK_SCARF }, + [ITEM_GREEN_SCARF] = { NARC_item_data_0241_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_345_NCLR, AGB_ITEM_GREEN_SCARF }, + [ITEM_YELLOW_SCARF] = { NARC_item_data_0242_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_346_NCLR, AGB_ITEM_YELLOW_SCARF }, + [ITEM_WIDE_LENS] = { NARC_item_data_0243_bin, NARC_item_icon_item_icon_490_NCGR, NARC_item_icon_item_icon_491_NCLR, AGB_ITEM_NONE }, + [ITEM_MUSCLE_BAND] = { NARC_item_data_0244_bin, NARC_item_icon_item_icon_492_NCGR, NARC_item_icon_item_icon_493_NCLR, AGB_ITEM_NONE }, + [ITEM_WISE_GLASSES] = { NARC_item_data_0245_bin, NARC_item_icon_item_icon_494_NCGR, NARC_item_icon_item_icon_495_NCLR, AGB_ITEM_NONE }, + [ITEM_EXPERT_BELT] = { NARC_item_data_0246_bin, NARC_item_icon_item_icon_496_NCGR, NARC_item_icon_item_icon_497_NCLR, AGB_ITEM_NONE }, + [ITEM_LIGHT_CLAY] = { NARC_item_data_0247_bin, NARC_item_icon_item_icon_611_NCGR, NARC_item_icon_item_icon_612_NCLR, AGB_ITEM_NONE }, + [ITEM_LIFE_ORB] = { NARC_item_data_0248_bin, NARC_item_icon_item_icon_498_NCGR, NARC_item_icon_item_icon_499_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_HERB] = { NARC_item_data_0249_bin, NARC_item_icon_item_icon_500_NCGR, NARC_item_icon_item_icon_501_NCLR, AGB_ITEM_NONE }, + [ITEM_TOXIC_ORB] = { NARC_item_data_0250_bin, NARC_item_icon_item_icon_502_NCGR, NARC_item_icon_item_icon_503_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_ORB] = { NARC_item_data_0251_bin, NARC_item_icon_item_icon_504_NCGR, NARC_item_icon_item_icon_505_NCLR, AGB_ITEM_NONE }, + [ITEM_QUICK_POWDER] = { NARC_item_data_0252_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_658_NCLR, AGB_ITEM_NONE }, + [ITEM_FOCUS_SASH] = { NARC_item_data_0253_bin, NARC_item_icon_item_icon_659_NCGR, NARC_item_icon_item_icon_660_NCLR, AGB_ITEM_NONE }, + [ITEM_ZOOM_LENS] = { NARC_item_data_0254_bin, NARC_item_icon_item_icon_506_NCGR, NARC_item_icon_item_icon_507_NCLR, AGB_ITEM_NONE }, + [ITEM_METRONOME] = { NARC_item_data_0255_bin, NARC_item_icon_item_icon_508_NCGR, NARC_item_icon_item_icon_509_NCLR, AGB_ITEM_NONE }, + [ITEM_IRON_BALL] = { NARC_item_data_0256_bin, NARC_item_icon_item_icon_613_NCGR, NARC_item_icon_item_icon_614_NCLR, AGB_ITEM_NONE }, + [ITEM_LAGGING_TAIL] = { NARC_item_data_0257_bin, NARC_item_icon_item_icon_650_NCGR, NARC_item_icon_item_icon_651_NCLR, AGB_ITEM_NONE }, + [ITEM_DESTINY_KNOT] = { NARC_item_data_0258_bin, NARC_item_icon_item_icon_654_NCGR, NARC_item_icon_item_icon_655_NCLR, AGB_ITEM_NONE }, + [ITEM_BLACK_SLUDGE] = { NARC_item_data_0259_bin, NARC_item_icon_item_icon_510_NCGR, NARC_item_icon_item_icon_511_NCLR, AGB_ITEM_NONE }, + [ITEM_ICY_ROCK] = { NARC_item_data_0260_bin, NARC_item_icon_item_icon_636_NCGR, NARC_item_icon_item_icon_637_NCLR, AGB_ITEM_NONE }, + [ITEM_SMOOTH_ROCK] = { NARC_item_data_0261_bin, NARC_item_icon_item_icon_638_NCGR, NARC_item_icon_item_icon_639_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAT_ROCK] = { NARC_item_data_0262_bin, NARC_item_icon_item_icon_640_NCGR, NARC_item_icon_item_icon_641_NCLR, AGB_ITEM_NONE }, + [ITEM_DAMP_ROCK] = { NARC_item_data_0263_bin, NARC_item_icon_item_icon_642_NCGR, NARC_item_icon_item_icon_643_NCLR, AGB_ITEM_NONE }, + [ITEM_GRIP_CLAW] = { NARC_item_data_0264_bin, NARC_item_icon_item_icon_652_NCGR, NARC_item_icon_item_icon_653_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOICE_SCARF] = { NARC_item_data_0265_bin, NARC_item_icon_item_icon_512_NCGR, NARC_item_icon_item_icon_513_NCLR, AGB_ITEM_NONE }, + [ITEM_STICKY_BARB] = { NARC_item_data_0266_bin, NARC_item_icon_item_icon_514_NCGR, NARC_item_icon_item_icon_515_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BRACER] = { NARC_item_data_0267_bin, NARC_item_icon_item_icon_683_NCGR, NARC_item_icon_item_icon_684_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BELT] = { NARC_item_data_0268_bin, NARC_item_icon_item_icon_691_NCGR, NARC_item_icon_item_icon_692_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_LENS] = { NARC_item_data_0269_bin, NARC_item_icon_item_icon_693_NCGR, NARC_item_icon_item_icon_694_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BAND] = { NARC_item_data_0270_bin, NARC_item_icon_item_icon_685_NCGR, NARC_item_icon_item_icon_686_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_ANKLET] = { NARC_item_data_0271_bin, NARC_item_icon_item_icon_687_NCGR, NARC_item_icon_item_icon_688_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_WEIGHT] = { NARC_item_data_0272_bin, NARC_item_icon_item_icon_689_NCGR, NARC_item_icon_item_icon_690_NCLR, AGB_ITEM_NONE }, + [ITEM_SHED_SHELL] = { NARC_item_data_0273_bin, NARC_item_icon_item_icon_516_NCGR, NARC_item_icon_item_icon_517_NCLR, AGB_ITEM_NONE }, + [ITEM_BIG_ROOT] = { NARC_item_data_0274_bin, NARC_item_icon_item_icon_518_NCGR, NARC_item_icon_item_icon_519_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOICE_SPECS] = { NARC_item_data_0275_bin, NARC_item_icon_item_icon_520_NCGR, NARC_item_icon_item_icon_521_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_PLATE] = { NARC_item_data_0276_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_620_NCLR, AGB_ITEM_NONE }, + [ITEM_SPLASH_PLATE] = { NARC_item_data_0277_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_621_NCLR, AGB_ITEM_NONE }, + [ITEM_ZAP_PLATE] = { NARC_item_data_0278_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_622_NCLR, AGB_ITEM_NONE }, + [ITEM_MEADOW_PLATE] = { NARC_item_data_0279_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_623_NCLR, AGB_ITEM_NONE }, + [ITEM_ICICLE_PLATE] = { NARC_item_data_0280_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_624_NCLR, AGB_ITEM_NONE }, + [ITEM_FIST_PLATE] = { NARC_item_data_0281_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_625_NCLR, AGB_ITEM_NONE }, + [ITEM_TOXIC_PLATE] = { NARC_item_data_0282_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_626_NCLR, AGB_ITEM_NONE }, + [ITEM_EARTH_PLATE] = { NARC_item_data_0283_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_627_NCLR, AGB_ITEM_NONE }, + [ITEM_SKY_PLATE] = { NARC_item_data_0284_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_628_NCLR, AGB_ITEM_NONE }, + [ITEM_MIND_PLATE] = { NARC_item_data_0285_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_629_NCLR, AGB_ITEM_NONE }, + [ITEM_INSECT_PLATE] = { NARC_item_data_0286_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_630_NCLR, AGB_ITEM_NONE }, + [ITEM_STONE_PLATE] = { NARC_item_data_0287_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_631_NCLR, AGB_ITEM_NONE }, + [ITEM_SPOOKY_PLATE] = { NARC_item_data_0288_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_632_NCLR, AGB_ITEM_NONE }, + [ITEM_DRACO_PLATE] = { NARC_item_data_0289_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_633_NCLR, AGB_ITEM_NONE }, + [ITEM_DREAD_PLATE] = { NARC_item_data_0290_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_634_NCLR, AGB_ITEM_NONE }, + [ITEM_IRON_PLATE] = { NARC_item_data_0291_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_635_NCLR, AGB_ITEM_NONE }, + [ITEM_ODD_INCENSE] = { NARC_item_data_0292_bin, NARC_item_icon_item_icon_522_NCGR, NARC_item_icon_item_icon_523_NCLR, AGB_ITEM_NONE }, + [ITEM_ROCK_INCENSE] = { NARC_item_data_0293_bin, NARC_item_icon_item_icon_524_NCGR, NARC_item_icon_item_icon_525_NCLR, AGB_ITEM_NONE }, + [ITEM_FULL_INCENSE] = { NARC_item_data_0294_bin, NARC_item_icon_item_icon_526_NCGR, NARC_item_icon_item_icon_527_NCLR, AGB_ITEM_NONE }, + [ITEM_WAVE_INCENSE] = { NARC_item_data_0295_bin, NARC_item_icon_item_icon_528_NCGR, NARC_item_icon_item_icon_529_NCLR, AGB_ITEM_NONE }, + [ITEM_ROSE_INCENSE] = { NARC_item_data_0296_bin, NARC_item_icon_item_icon_530_NCGR, NARC_item_icon_item_icon_531_NCLR, AGB_ITEM_NONE }, + [ITEM_LUCK_INCENSE] = { NARC_item_data_0297_bin, NARC_item_icon_item_icon_532_NCGR, NARC_item_icon_item_icon_533_NCLR, AGB_ITEM_NONE }, + [ITEM_PURE_INCENSE] = { NARC_item_data_0298_bin, NARC_item_icon_item_icon_534_NCGR, NARC_item_icon_item_icon_535_NCLR, AGB_ITEM_NONE }, + [ITEM_PROTECTOR] = { NARC_item_data_0299_bin, NARC_item_icon_item_icon_695_NCGR, NARC_item_icon_item_icon_696_NCLR, AGB_ITEM_NONE }, + [ITEM_ELECTIRIZER] = { NARC_item_data_0300_bin, NARC_item_icon_item_icon_536_NCGR, NARC_item_icon_item_icon_537_NCLR, AGB_ITEM_NONE }, + [ITEM_MAGMARIZER] = { NARC_item_data_0301_bin, NARC_item_icon_item_icon_538_NCGR, NARC_item_icon_item_icon_539_NCLR, AGB_ITEM_NONE }, + [ITEM_DUBIOUS_DISC] = { NARC_item_data_0302_bin, NARC_item_icon_item_icon_540_NCGR, NARC_item_icon_item_icon_541_NCLR, AGB_ITEM_NONE }, + [ITEM_REAPER_CLOTH] = { NARC_item_data_0303_bin, NARC_item_icon_item_icon_542_NCGR, NARC_item_icon_item_icon_543_NCLR, AGB_ITEM_NONE }, + [ITEM_RAZOR_CLAW] = { NARC_item_data_0304_bin, NARC_item_icon_item_icon_544_NCGR, NARC_item_icon_item_icon_545_NCLR, AGB_ITEM_NONE }, + [ITEM_RAZOR_FANG] = { NARC_item_data_0305_bin, NARC_item_icon_item_icon_546_NCGR, NARC_item_icon_item_icon_547_NCLR, AGB_ITEM_NONE }, + [ITEM_TM01] = { NARC_item_data_0306_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM01 }, + [ITEM_TM02] = { NARC_item_data_0307_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_TM02 }, + [ITEM_TM03] = { NARC_item_data_0308_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM03 }, + [ITEM_TM04] = { NARC_item_data_0309_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM04 }, + [ITEM_TM05] = { NARC_item_data_0310_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM05 }, + [ITEM_TM06] = { NARC_item_data_0311_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM06 }, + [ITEM_TM07] = { NARC_item_data_0312_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM07 }, + [ITEM_TM08] = { NARC_item_data_0313_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM08 }, + [ITEM_TM09] = { NARC_item_data_0314_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM09 }, + [ITEM_TM10] = { NARC_item_data_0315_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM10 }, + [ITEM_TM11] = { NARC_item_data_0316_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM11 }, + [ITEM_TM12] = { NARC_item_data_0317_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM12 }, + [ITEM_TM13] = { NARC_item_data_0318_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM13 }, + [ITEM_TM14] = { NARC_item_data_0319_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM14 }, + [ITEM_TM15] = { NARC_item_data_0320_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM15 }, + [ITEM_TM16] = { NARC_item_data_0321_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM16 }, + [ITEM_TM17] = { NARC_item_data_0322_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM17 }, + [ITEM_TM18] = { NARC_item_data_0323_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM18 }, + [ITEM_TM19] = { NARC_item_data_0324_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM19 }, + [ITEM_TM20] = { NARC_item_data_0325_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM20 }, + [ITEM_TM21] = { NARC_item_data_0326_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM21 }, + [ITEM_TM22] = { NARC_item_data_0327_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM22 }, + [ITEM_TM23] = { NARC_item_data_0328_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM23 }, + [ITEM_TM24] = { NARC_item_data_0329_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM24 }, + [ITEM_TM25] = { NARC_item_data_0330_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM25 }, + [ITEM_TM26] = { NARC_item_data_0331_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM26 }, + [ITEM_TM27] = { NARC_item_data_0332_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM27 }, + [ITEM_TM28] = { NARC_item_data_0333_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM28 }, + [ITEM_TM29] = { NARC_item_data_0334_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM29 }, + [ITEM_TM30] = { NARC_item_data_0335_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_TM30 }, + [ITEM_TM31] = { NARC_item_data_0336_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM31 }, + [ITEM_TM32] = { NARC_item_data_0337_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM32 }, + [ITEM_TM33] = { NARC_item_data_0338_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM33 }, + [ITEM_TM34] = { NARC_item_data_0339_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM34 }, + [ITEM_TM35] = { NARC_item_data_0340_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM35 }, + [ITEM_TM36] = { NARC_item_data_0341_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM36 }, + [ITEM_TM37] = { NARC_item_data_0342_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM37 }, + [ITEM_TM38] = { NARC_item_data_0343_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM38 }, + [ITEM_TM39] = { NARC_item_data_0344_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM39 }, + [ITEM_TM40] = { NARC_item_data_0345_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_TM40 }, + [ITEM_TM41] = { NARC_item_data_0346_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM41 }, + [ITEM_TM42] = { NARC_item_data_0347_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM42 }, + [ITEM_TM43] = { NARC_item_data_0348_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM43 }, + [ITEM_TM44] = { NARC_item_data_0349_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM44 }, + [ITEM_TM45] = { NARC_item_data_0350_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM45 }, + [ITEM_TM46] = { NARC_item_data_0351_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM46 }, + [ITEM_TM47] = { NARC_item_data_0352_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM47 }, + [ITEM_TM48] = { NARC_item_data_0353_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM48 }, + [ITEM_TM49] = { NARC_item_data_0354_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM49 }, + [ITEM_TM50] = { NARC_item_data_0355_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM50 }, + [ITEM_TM51] = { NARC_item_data_0356_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, + [ITEM_TM52] = { NARC_item_data_0357_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, + [ITEM_TM53] = { NARC_item_data_0358_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, + [ITEM_TM54] = { NARC_item_data_0359_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM55] = { NARC_item_data_0360_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_NONE }, + [ITEM_TM56] = { NARC_item_data_0361_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM57] = { NARC_item_data_0362_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, + [ITEM_TM58] = { NARC_item_data_0363_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM59] = { NARC_item_data_0364_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_NONE }, + [ITEM_TM60] = { NARC_item_data_0365_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, + [ITEM_TM61] = { NARC_item_data_0366_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_NONE }, + [ITEM_TM62] = { NARC_item_data_0367_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM63] = { NARC_item_data_0368_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM64] = { NARC_item_data_0369_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM65] = { NARC_item_data_0370_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_NONE }, + [ITEM_TM66] = { NARC_item_data_0371_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM67] = { NARC_item_data_0372_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM68] = { NARC_item_data_0373_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM69] = { NARC_item_data_0374_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM70] = { NARC_item_data_0375_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM71] = { NARC_item_data_0376_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM72] = { NARC_item_data_0377_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_NONE }, + [ITEM_TM73] = { NARC_item_data_0378_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, + [ITEM_TM74] = { NARC_item_data_0379_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, + [ITEM_TM75] = { NARC_item_data_0380_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM76] = { NARC_item_data_0381_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM77] = { NARC_item_data_0382_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM78] = { NARC_item_data_0383_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM79] = { NARC_item_data_0384_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM80] = { NARC_item_data_0385_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM81] = { NARC_item_data_0386_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM82] = { NARC_item_data_0387_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM83] = { NARC_item_data_0388_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM84] = { NARC_item_data_0389_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_NONE }, + [ITEM_TM85] = { NARC_item_data_0390_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, + [ITEM_TM86] = { NARC_item_data_0391_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, + [ITEM_TM87] = { NARC_item_data_0392_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM88] = { NARC_item_data_0393_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, + [ITEM_TM89] = { NARC_item_data_0394_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM90] = { NARC_item_data_0395_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM91] = { NARC_item_data_0396_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, + [ITEM_TM92] = { NARC_item_data_0397_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, + [ITEM_HM01] = { NARC_item_data_0398_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM01 }, + [ITEM_HM02] = { NARC_item_data_0399_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_HM02 }, + [ITEM_HM03] = { NARC_item_data_0400_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM03 }, + [ITEM_HM04] = { NARC_item_data_0401_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM04 }, + [ITEM_HM05] = { NARC_item_data_0402_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM05 }, + [ITEM_HM06] = { NARC_item_data_0403_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_HM06 }, + [ITEM_HM07] = { NARC_item_data_0404_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM07 }, + [ITEM_HM08] = { NARC_item_data_0405_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM08 }, + [ITEM_EXPLORER_KIT] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_LOOT_SACK] = { NARC_item_data_0406_bin, NARC_item_icon_item_icon_550_NCGR, NARC_item_icon_item_icon_551_NCLR, AGB_ITEM_NONE }, + [ITEM_RULE_BOOK] = { NARC_item_data_0407_bin, NARC_item_icon_item_icon_552_NCGR, NARC_item_icon_item_icon_553_NCLR, AGB_ITEM_NONE }, + [ITEM_POKE_RADAR] = { NARC_item_data_0408_bin, NARC_item_icon_item_icon_697_NCGR, NARC_item_icon_item_icon_698_NCLR, AGB_ITEM_NONE }, + [ITEM_POINT_CARD] = { NARC_item_data_0409_bin, NARC_item_icon_item_icon_681_NCGR, NARC_item_icon_item_icon_682_NCLR, AGB_ITEM_NONE }, + [ITEM_JOURNAL] = { NARC_item_data_0410_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, + [ITEM_SEAL_CASE] = { NARC_item_data_0411_bin, NARC_item_icon_item_icon_671_NCGR, NARC_item_icon_item_icon_672_NCLR, AGB_ITEM_NONE }, + [ITEM_FASHION_CASE] = { NARC_item_data_0412_bin, NARC_item_icon_item_icon_675_NCGR, NARC_item_icon_item_icon_676_NCLR, AGB_ITEM_NONE }, + [ITEM_SEAL_BAG] = { NARC_item_data_0413_bin, NARC_item_icon_item_icon_673_NCGR, NARC_item_icon_item_icon_674_NCLR, AGB_ITEM_NONE }, + [ITEM_PAL_PAD] = { NARC_item_data_0414_bin, NARC_item_icon_item_icon_661_NCGR, NARC_item_icon_item_icon_662_NCLR, AGB_ITEM_NONE }, + [ITEM_WORKS_KEY] = { NARC_item_data_0415_bin, NARC_item_icon_item_icon_644_NCGR, NARC_item_icon_item_icon_645_NCLR, AGB_ITEM_NONE }, + [ITEM_OLD_CHARM] = { NARC_item_data_0416_bin, NARC_item_icon_item_icon_604_NCGR, NARC_item_icon_item_icon_605_NCLR, AGB_ITEM_NONE }, + [ITEM_GALACTIC_KEY] = { NARC_item_data_0417_bin, NARC_item_icon_item_icon_656_NCGR, NARC_item_icon_item_icon_657_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_CHAIN] = { NARC_item_data_0418_bin, NARC_item_icon_item_icon_679_NCGR, NARC_item_icon_item_icon_680_NCLR, AGB_ITEM_NONE }, + [ITEM_TOWN_MAP] = { NARC_item_data_0419_bin, NARC_item_icon_item_icon_439_NCGR, NARC_item_icon_item_icon_440_NCLR, AGB_ITEM_TOWN_MAP }, + [ITEM_VS__SEEKER] = { NARC_item_data_0420_bin, NARC_item_icon_item_icon_441_NCGR, NARC_item_icon_item_icon_442_NCLR, AGB_ITEM_VS_SEEKER }, + [ITEM_COIN_CASE] = { NARC_item_data_0421_bin, NARC_item_icon_item_icon_349_NCGR, NARC_item_icon_item_icon_350_NCLR, AGB_ITEM_COIN_CASE }, + [ITEM_OLD_ROD] = { NARC_item_data_0422_bin, NARC_item_icon_item_icon_353_NCGR, NARC_item_icon_item_icon_354_NCLR, AGB_ITEM_OLD_ROD }, + [ITEM_GOOD_ROD] = { NARC_item_data_0423_bin, NARC_item_icon_item_icon_355_NCGR, NARC_item_icon_item_icon_356_NCLR, AGB_ITEM_GOOD_ROD }, + [ITEM_SUPER_ROD] = { NARC_item_data_0424_bin, NARC_item_icon_item_icon_357_NCGR, NARC_item_icon_item_icon_358_NCLR, AGB_ITEM_SUPER_ROD }, + [ITEM_SPRAYDUCK] = { NARC_item_data_0425_bin, NARC_item_icon_item_icon_363_NCGR, NARC_item_icon_item_icon_364_NCLR, AGB_ITEM_NONE }, + [ITEM_POFFIN_CASE] = { NARC_item_data_0426_bin, NARC_item_icon_item_icon_373_NCGR, NARC_item_icon_item_icon_374_NCLR, AGB_ITEM_NONE }, + [ITEM_BICYCLE] = { NARC_item_data_0427_bin, NARC_item_icon_item_icon_437_NCGR, NARC_item_icon_item_icon_438_NCLR, AGB_ITEM_BICYCLE }, + [ITEM_SUITE_KEY] = { NARC_item_data_0428_bin, NARC_item_icon_item_icon_429_NCGR, NARC_item_icon_item_icon_430_NCLR, AGB_ITEM_NONE }, + [ITEM_OAKS_LETTER] = { NARC_item_data_0429_bin, NARC_item_icon_item_icon_375_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_NONE }, + [ITEM_LUNAR_WING] = { NARC_item_data_0430_bin, NARC_item_icon_item_icon_602_NCGR, NARC_item_icon_item_icon_603_NCLR, AGB_ITEM_NONE }, + [ITEM_MEMBER_CARD] = { NARC_item_data_0431_bin, NARC_item_icon_item_icon_608_NCGR, NARC_item_icon_item_icon_609_NCLR, AGB_ITEM_NONE }, + [ITEM_AZURE_FLUTE] = { NARC_item_data_0432_bin, NARC_item_icon_item_icon_677_NCGR, NARC_item_icon_item_icon_678_NCLR, AGB_ITEM_NONE }, + [ITEM_S_S__TICKET] = { NARC_item_data_0433_bin, NARC_item_icon_item_icon_359_NCGR, NARC_item_icon_item_icon_360_NCLR, AGB_ITEM_SS_TICKET }, + [ITEM_CONTEST_PASS] = { NARC_item_data_0434_bin, NARC_item_icon_item_icon_361_NCGR, NARC_item_icon_item_icon_362_NCLR, AGB_ITEM_CONTEST_PASS }, + [ITEM_MAGMA_STONE] = { NARC_item_data_0435_bin, NARC_item_icon_item_icon_596_NCGR, NARC_item_icon_item_icon_597_NCLR, AGB_ITEM_NONE }, + [ITEM_PARCEL] = { NARC_item_data_0436_bin, NARC_item_icon_item_icon_415_NCGR, NARC_item_icon_item_icon_416_NCLR, AGB_ITEM_OAKS_PARCEL }, + [ITEM_COUPON_1] = { NARC_item_data_0437_bin, NARC_item_icon_item_icon_417_NCGR, NARC_item_icon_item_icon_418_NCLR, AGB_ITEM_NONE }, + [ITEM_COUPON_2] = { NARC_item_data_0438_bin, NARC_item_icon_item_icon_419_NCGR, NARC_item_icon_item_icon_420_NCLR, AGB_ITEM_NONE }, + [ITEM_COUPON_3] = { NARC_item_data_0439_bin, NARC_item_icon_item_icon_421_NCGR, NARC_item_icon_item_icon_422_NCLR, AGB_ITEM_NONE }, + [ITEM_STORAGE_KEY] = { NARC_item_data_0440_bin, NARC_item_icon_item_icon_598_NCGR, NARC_item_icon_item_icon_599_NCLR, AGB_ITEM_STORAGE_KEY }, + [ITEM_SECRETPOTION] = { NARC_item_data_0441_bin, NARC_item_icon_item_icon_600_NCGR, NARC_item_icon_item_icon_601_NCLR, AGB_ITEM_NONE }, + [ITEM_VS__RECORDER] = { NARC_item_data_0442_bin, NARC_item_icon_item_icon_701_NCGR, NARC_item_icon_item_icon_702_NCLR, AGB_ITEM_NONE }, + [ITEM_GRACIDEA] = { NARC_item_data_0443_bin, NARC_item_icon_item_icon_703_NCGR, NARC_item_icon_item_icon_704_NCLR, AGB_ITEM_NONE }, + [ITEM_SECRET_KEY] = { NARC_item_data_0444_bin, NARC_item_icon_item_icon_705_NCGR, NARC_item_icon_item_icon_706_NCLR, AGB_ITEM_SECRET_KEY }, + [ITEM_APRICORN_BOX] = { NARC_item_data_0445_bin, NARC_item_icon_item_icon_709_NCGR, NARC_item_icon_item_icon_710_NCLR, AGB_ITEM_NONE }, + [ITEM_UNOWN_REPORT] = { NARC_item_data_0446_bin, NARC_item_icon_item_icon_759_NCGR, NARC_item_icon_item_icon_760_NCLR, AGB_ITEM_NONE }, + [ITEM_BERRY_POTS] = { NARC_item_data_0447_bin, NARC_item_icon_item_icon_711_NCGR, NARC_item_icon_item_icon_712_NCLR, AGB_ITEM_NONE }, + [ITEM_DOWSING_MCHN] = { NARC_item_data_0448_bin, NARC_item_icon_item_icon_747_NCGR, NARC_item_icon_item_icon_748_NCLR, AGB_ITEM_ITEMFINDER }, + [ITEM_BLUE_CARD] = { NARC_item_data_0449_bin, NARC_item_icon_item_icon_761_NCGR, NARC_item_icon_item_icon_762_NCLR, AGB_ITEM_NONE }, + [ITEM_SLOWPOKETAIL] = { NARC_item_data_0450_bin, NARC_item_icon_item_icon_763_NCGR, NARC_item_icon_item_icon_764_NCLR, AGB_ITEM_NONE }, + [ITEM_CLEAR_BELL] = { NARC_item_data_0451_bin, NARC_item_icon_item_icon_765_NCGR, NARC_item_icon_item_icon_766_NCLR, AGB_ITEM_NONE }, + [ITEM_CARD_KEY] = { NARC_item_data_0452_bin, NARC_item_icon_item_icon_767_NCGR, NARC_item_icon_item_icon_768_NCLR, AGB_ITEM_CARD_KEY }, + [ITEM_BASEMENT_KEY] = { NARC_item_data_0453_bin, NARC_item_icon_item_icon_769_NCGR, NARC_item_icon_item_icon_770_NCLR, AGB_ITEM_BASEMENT_KEY }, + [ITEM_SQUIRTBOTTLE] = { NARC_item_data_0454_bin, NARC_item_icon_item_icon_713_NCGR, NARC_item_icon_item_icon_714_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_SCALE] = { NARC_item_data_0455_bin, NARC_item_icon_item_icon_771_NCGR, NARC_item_icon_item_icon_772_NCLR, AGB_ITEM_NONE }, + [ITEM_LOST_ITEM] = { NARC_item_data_0456_bin, NARC_item_icon_item_icon_773_NCGR, NARC_item_icon_item_icon_774_NCLR, AGB_ITEM_NONE }, + [ITEM_PASS] = { NARC_item_data_0457_bin, NARC_item_icon_item_icon_775_NCGR, NARC_item_icon_item_icon_776_NCLR, AGB_ITEM_NONE }, + [ITEM_MACHINE_PART] = { NARC_item_data_0458_bin, NARC_item_icon_item_icon_777_NCGR, NARC_item_icon_item_icon_778_NCLR, AGB_ITEM_NONE }, + [ITEM_SILVER_WING] = { NARC_item_data_0459_bin, NARC_item_icon_item_icon_779_NCGR, NARC_item_icon_item_icon_780_NCLR, AGB_ITEM_NONE }, + [ITEM_RAINBOW_WING] = { NARC_item_data_0460_bin, NARC_item_icon_item_icon_781_NCGR, NARC_item_icon_item_icon_782_NCLR, AGB_ITEM_NONE }, + [ITEM_MYSTERY_EGG] = { NARC_item_data_0461_bin, NARC_item_icon_item_icon_783_NCGR, NARC_item_icon_item_icon_784_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_APRICORN] = { NARC_item_data_0462_bin, NARC_item_icon_item_icon_733_NCGR, NARC_item_icon_item_icon_734_NCLR, AGB_ITEM_NONE }, + [ITEM_YLW_APRICORN] = { NARC_item_data_0463_bin, NARC_item_icon_item_icon_737_NCGR, NARC_item_icon_item_icon_738_NCLR, AGB_ITEM_NONE }, + [ITEM_BLU_APRICORN] = { NARC_item_data_0464_bin, NARC_item_icon_item_icon_735_NCGR, NARC_item_icon_item_icon_736_NCLR, AGB_ITEM_NONE }, + [ITEM_GRN_APRICORN] = { NARC_item_data_0465_bin, NARC_item_icon_item_icon_739_NCGR, NARC_item_icon_item_icon_740_NCLR, AGB_ITEM_NONE }, + [ITEM_PNK_APRICORN] = { NARC_item_data_0466_bin, NARC_item_icon_item_icon_741_NCGR, NARC_item_icon_item_icon_742_NCLR, AGB_ITEM_NONE }, + [ITEM_WHT_APRICORN] = { NARC_item_data_0467_bin, NARC_item_icon_item_icon_743_NCGR, NARC_item_icon_item_icon_744_NCLR, AGB_ITEM_NONE }, + [ITEM_BLK_APRICORN] = { NARC_item_data_0468_bin, NARC_item_icon_item_icon_745_NCGR, NARC_item_icon_item_icon_746_NCLR, AGB_ITEM_NONE }, + [ITEM_FAST_BALL] = { NARC_item_data_0469_bin, NARC_item_icon_item_icon_723_NCGR, NARC_item_icon_item_icon_724_NCLR, AGB_ITEM_NONE }, + [ITEM_LEVEL_BALL] = { NARC_item_data_0470_bin, NARC_item_icon_item_icon_717_NCGR, NARC_item_icon_item_icon_718_NCLR, AGB_ITEM_NONE }, + [ITEM_LURE_BALL] = { NARC_item_data_0471_bin, NARC_item_icon_item_icon_715_NCGR, NARC_item_icon_item_icon_716_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAVY_BALL] = { NARC_item_data_0472_bin, NARC_item_icon_item_icon_721_NCGR, NARC_item_icon_item_icon_722_NCLR, AGB_ITEM_NONE }, + [ITEM_LOVE_BALL] = { NARC_item_data_0473_bin, NARC_item_icon_item_icon_727_NCGR, NARC_item_icon_item_icon_728_NCLR, AGB_ITEM_NONE }, + [ITEM_FRIEND_BALL] = { NARC_item_data_0474_bin, NARC_item_icon_item_icon_725_NCGR, NARC_item_icon_item_icon_726_NCLR, AGB_ITEM_NONE }, + [ITEM_MOON_BALL] = { NARC_item_data_0475_bin, NARC_item_icon_item_icon_719_NCGR, NARC_item_icon_item_icon_720_NCLR, AGB_ITEM_NONE }, + [ITEM_SPORT_BALL] = { NARC_item_data_0476_bin, NARC_item_icon_item_icon_731_NCGR, NARC_item_icon_item_icon_732_NCLR, AGB_ITEM_NONE }, + [ITEM_PARK_BALL] = { NARC_item_data_0477_bin, NARC_item_icon_item_icon_729_NCGR, NARC_item_icon_item_icon_730_NCLR, AGB_ITEM_NONE }, + [ITEM_PHOTO_ALBUM] = { NARC_item_data_0478_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, + [ITEM_GB_SOUNDS] = { NARC_item_data_0479_bin, NARC_item_icon_item_icon_785_NCGR, NARC_item_icon_item_icon_786_NCLR, AGB_ITEM_NONE }, + [ITEM_TIDAL_BELL] = { NARC_item_data_0480_bin, NARC_item_icon_item_icon_787_NCGR, NARC_item_icon_item_icon_788_NCLR, AGB_ITEM_NONE }, + [ITEM_RAGECANDYBAR] = { NARC_item_data_0481_bin, NARC_item_icon_item_icon_749_NCGR, NARC_item_icon_item_icon_750_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_01] = { NARC_item_data_0482_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_02] = { NARC_item_data_0483_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_03] = { NARC_item_data_0484_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_04] = { NARC_item_data_0485_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_05] = { NARC_item_data_0486_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_06] = { NARC_item_data_0487_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_07] = { NARC_item_data_0488_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_08] = { NARC_item_data_0489_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_09] = { NARC_item_data_0490_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_10] = { NARC_item_data_0491_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_11] = { NARC_item_data_0492_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_12] = { NARC_item_data_0493_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_13] = { NARC_item_data_0494_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_14] = { NARC_item_data_0495_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_15] = { NARC_item_data_0496_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_16] = { NARC_item_data_0497_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_17] = { NARC_item_data_0498_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_18] = { NARC_item_data_0499_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_19] = { NARC_item_data_0500_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_20] = { NARC_item_data_0501_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_21] = { NARC_item_data_0502_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_22] = { NARC_item_data_0503_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_23] = { NARC_item_data_0504_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_24] = { NARC_item_data_0505_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_25] = { NARC_item_data_0506_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_26] = { NARC_item_data_0507_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_27] = { NARC_item_data_0508_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_JADE_ORB] = { NARC_item_data_0509_bin, NARC_item_icon_item_icon_755_NCGR, NARC_item_icon_item_icon_756_NCLR, AGB_ITEM_NONE }, + [ITEM_LOCK_CAPSULE] = { NARC_item_data_0510_bin, NARC_item_icon_item_icon_791_NCGR, NARC_item_icon_item_icon_792_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_ORB] = { NARC_item_data_0511_bin, NARC_item_icon_item_icon_751_NCGR, NARC_item_icon_item_icon_752_NCLR, AGB_ITEM_RED_ORB }, + [ITEM_BLUE_ORB] = { NARC_item_data_0512_bin, NARC_item_icon_item_icon_753_NCGR, NARC_item_icon_item_icon_754_NCLR, AGB_ITEM_BLUE_ORB }, + [ITEM_ENIGMA_STONE] = { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, }; void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, HeapID heapId) { diff --git a/src/mail.c b/src/mail.c index 107a4a756d..eff7985e04 100644 --- a/src/mail.c +++ b/src/mail.c @@ -27,13 +27,13 @@ struct UnkStruct_020F67A4 { }; static const struct UnkStruct_020F67A4 sFormOverrides[] = { - { 0x1EE, 0x21C, SPECIES_GIRATINA, GIRATINA_ORIGIN }, - { 0x1F3, 0x21D, SPECIES_SHAYMIN, SHAYMIN_SKY }, - { 0x1E6, 0x21E, SPECIES_ROTOM, ROTOM_HEAT }, - { 0x1E6, 0x21F, SPECIES_ROTOM, ROTOM_WASH }, - { 0x1E6, 0x220, SPECIES_ROTOM, ROTOM_FROST }, - { 0x1E6, 0x221, SPECIES_ROTOM, ROTOM_FAN }, - { 0x1E6, 0x222, SPECIES_ROTOM, ROTOM_MOW }, + {0x1EE, 0x21C, SPECIES_GIRATINA, GIRATINA_ORIGIN}, + { 0x1F3, 0x21D, SPECIES_SHAYMIN, SHAYMIN_SKY }, + { 0x1E6, 0x21E, SPECIES_ROTOM, ROTOM_HEAT }, + { 0x1E6, 0x21F, SPECIES_ROTOM, ROTOM_WASH }, + { 0x1E6, 0x220, SPECIES_ROTOM, ROTOM_FROST }, + { 0x1E6, 0x221, SPECIES_ROTOM, ROTOM_FAN }, + { 0x1E6, 0x222, SPECIES_ROTOM, ROTOM_MOW }, }; int MailArray_GetFirstEmptySlotIdx(Mail *msgs, int nmsg); diff --git a/src/map_preview_graphic.c b/src/map_preview_graphic.c index e1a884cb2d..9113019a42 100644 --- a/src/map_preview_graphic.c +++ b/src/map_preview_graphic.c @@ -54,7 +54,7 @@ typedef struct UnkStruct_0206A388 { } UnkStruct_0206A388; static MapPreviewGraphicData sMapPreviewGraphicData[] = { - // Dark Cave, North Side + // Dark Cave, North Side { .mapId = MAP_D42R0101, .unused4 = 0, @@ -82,7 +82,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 0, }, - // Dark Cave, South Side + // Dark Cave, South Side { .mapId = MAP_D42R0102, .unused4 = 0, @@ -110,7 +110,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 0, }, - // Sprout Tower + // Sprout Tower { .mapId = MAP_D15R0101, .unused4 = 0, @@ -138,7 +138,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 1, }, - // Ruins of Alph 1 + // Ruins of Alph 1 { .mapId = MAP_D24R0211, .unused4 = 0, @@ -166,7 +166,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 2, }, - // Ruins of Alph 2 + // Ruins of Alph 2 { .mapId = MAP_D24R0217, .unused4 = 0, @@ -194,7 +194,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 2, }, - // Union Cave + // Union Cave { .mapId = MAP_D25R0101, .unused4 = 0, @@ -222,7 +222,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 3, }, - // Slowpoke Well + // Slowpoke Well { .mapId = MAP_D26R0101, .unused4 = 0, @@ -250,7 +250,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 4, }, - // Ilex Forest + // Ilex Forest { .mapId = MAP_D36R0101, .unused4 = 0, @@ -278,7 +278,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 5, }, - // National Park + // National Park { .mapId = MAP_D22R0101, .unused4 = 0, @@ -306,7 +306,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 6, }, - // Burned Tower + // Burned Tower { .mapId = MAP_D18R0101, .unused4 = 0, @@ -334,7 +334,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 7, }, - // Bell Tower + // Bell Tower { .mapId = MAP_D17R0101, .unused4 = 0, @@ -362,7 +362,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 8, }, - // Whirl Islands + // Whirl Islands { .mapId = MAP_D40R0101, .unused4 = 0, @@ -390,7 +390,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 9, }, - // Mt Mortar + // Mt Mortar { .mapId = MAP_D38R0101, .unused4 = 0, @@ -418,7 +418,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 11, }, - // Ice Path + // Ice Path { .mapId = MAP_D39R0101, .unused4 = 0, @@ -446,7 +446,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 12, }, - // Dragon's Den + // Dragon's Den { .mapId = MAP_D44R0101, .unused4 = 0, @@ -474,7 +474,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 13, }, - // Tohjo Falls + // Tohjo Falls { .mapId = MAP_D45R0101, .unused4 = 0, @@ -502,7 +502,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 14, }, - // Victory Road South + // Victory Road South { .mapId = MAP_D43R0101, .unused4 = 0, @@ -530,7 +530,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 15, }, - // Victory Road North + // Victory Road North { .mapId = MAP_D43R0103, .unused4 = 0, @@ -558,7 +558,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 15, }, - // Viridian Forest + // Viridian Forest { .mapId = MAP_D46R0101, .unused4 = 0, @@ -586,7 +586,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 16, }, - // Diglett Cave + // Diglett Cave { .mapId = MAP_D01R0101, .unused4 = 0, @@ -614,7 +614,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 17, }, - // Rock Tunnel + // Rock Tunnel { .mapId = MAP_D05R0101, .unused4 = 0, @@ -642,7 +642,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 18, }, - // Mt Moon + // Mt Moon { .mapId = MAP_D02R0101, .unused4 = 0, @@ -670,7 +670,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 20, }, - // Seafoam Islands + // Seafoam Islands { .mapId = MAP_D11R0101, .unused4 = 0, @@ -698,7 +698,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 21, }, - // Mt Silver + // Mt Silver { .mapId = MAP_D41R0101, .unused4 = 0, @@ -726,7 +726,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 22, }, - // Cerulean Cave + // Cerulean Cave { .mapId = MAP_D03R0101, .unused4 = 0, diff --git a/src/message_printer.c b/src/message_printer.c index f51ba5c3e6..e48be73576 100644 --- a/src/message_printer.c +++ b/src/message_printer.c @@ -6,13 +6,13 @@ #include "gf_gfx_loader.h" static const u16 _020F5C24[][2] = { - { 0x0140, 0x0008 }, - { 0x0160, 0x0010 }, - { 0x01A0, 0x0010 }, - { 0x01E0, 0x0010 }, - { 0x0220, 0x0010 }, - { 0x0260, 0x0010 }, - { 0x02A0, 0x0010 }, + {0x0140, 0x0008}, + { 0x0160, 0x0010}, + { 0x01A0, 0x0010}, + { 0x01E0, 0x0010}, + { 0x0220, 0x0010}, + { 0x0260, 0x0010}, + { 0x02A0, 0x0010}, }; MessagePrinter *MessagePrinter_New(u32 foreground, u32 shadow, u32 background, HeapID heapId) { diff --git a/src/oaks_speech.c b/src/oaks_speech.c index d319bdc068..5347c3e61d 100644 --- a/src/oaks_speech.c +++ b/src/oaks_speech.c @@ -494,49 +494,49 @@ static const int sMultichoiceMenuParam[][4] = { }; static const int sBgPicNCGR_NCLR[10][2] = { - // undefined + // undefined { }, - // Oak + // Oak { NARC_intro_intro_00000010_NCGR, NARC_intro_intro_00000011_NCLR, }, - // Ethan 1 + // Ethan 1 { NARC_intro_intro_00000012_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 2 + // Ethan 2 { NARC_intro_intro_00000013_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 3 + // Ethan 3 { NARC_intro_intro_00000014_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 4 + // Ethan 4 { NARC_intro_intro_00000015_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Lyra 1 + // Lyra 1 { NARC_intro_intro_00000017_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 2 + // Lyra 2 { NARC_intro_intro_00000018_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 3 + // Lyra 3 { NARC_intro_intro_00000019_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 4 + // Lyra 4 { NARC_intro_intro_00000020_NCGR, NARC_intro_intro_00000021_NCLR, diff --git a/src/options_app.c b/src/options_app.c index 211c329bff..a678f4b2fd 100644 --- a/src/options_app.c +++ b/src/options_app.c @@ -118,21 +118,21 @@ static const int sMenuEntryBorderYCoords[MENU_ENTRY_COUNT] = { }; static const u16 sOptionChoiceLabelXCoords[MENU_ENTRY_COUNT][3] = { - { 124, 172, 220 }, - { 124, 172, 0 }, - { 132, 212, 0 }, - { 132, 212, 0 }, - { 132, 212, 0 }, - { 172, 0, 0 }, - { 0, 0, 0 }, + {124, 172, 220}, + { 124, 172, 0 }, + { 132, 212, 0 }, + { 132, 212, 0 }, + { 132, 212, 0 }, + { 172, 0, 0 }, + { 0, 0, 0 }, }; static const int sActiveButtonXCoords[5][3] = { - { 112, 160, 208 }, - { 112, 160, 208 }, - { 112, 192, 0 }, - { 112, 192, 0 }, - { 112, 192, 0 }, + {112, 160, 208}, + { 112, 160, 208}, + { 112, 192, 0 }, + { 112, 192, 0 }, + { 112, 192, 0 }, }; static const TouchscreenHitbox sOptionsAppTouchscreenHitboxes[16] = { @@ -155,21 +155,21 @@ static const TouchscreenHitbox sOptionsAppTouchscreenHitboxes[16] = { }; static const u32 ov54_021E6DA8[15][2] = { - { MENU_ENTRY_TEXT_SPEED, 0 }, - { MENU_ENTRY_TEXT_SPEED, 1 }, - { MENU_ENTRY_TEXT_SPEED, 2 }, - { MENU_ENTRY_BATTLE_SCENE, 0 }, - { MENU_ENTRY_BATTLE_SCENE, 1 }, - { MENU_ENTRY_BATTLE_STYLE, 0 }, - { MENU_ENTRY_BATTLE_STYLE, 1 }, - { MENU_ENTRY_SOUND_METHOD, 0 }, - { MENU_ENTRY_SOUND_METHOD, 1 }, - { MENU_ENTRY_BUTTON_MODE, 0 }, - { MENU_ENTRY_BUTTON_MODE, 1 }, - { MENU_ENTRY_FRAME, 3 }, - { MENU_ENTRY_FRAME, 4 }, - { MENU_ENTRY_6, 5 }, - { MENU_ENTRY_6, 6 }, + {MENU_ENTRY_TEXT_SPEED, 0}, + { MENU_ENTRY_TEXT_SPEED, 1}, + { MENU_ENTRY_TEXT_SPEED, 2}, + { MENU_ENTRY_BATTLE_SCENE, 0}, + { MENU_ENTRY_BATTLE_SCENE, 1}, + { MENU_ENTRY_BATTLE_STYLE, 0}, + { MENU_ENTRY_BATTLE_STYLE, 1}, + { MENU_ENTRY_SOUND_METHOD, 0}, + { MENU_ENTRY_SOUND_METHOD, 1}, + { MENU_ENTRY_BUTTON_MODE, 0}, + { MENU_ENTRY_BUTTON_MODE, 1}, + { MENU_ENTRY_FRAME, 3}, + { MENU_ENTRY_FRAME, 4}, + { MENU_ENTRY_6, 5}, + { MENU_ENTRY_6, 6}, }; static const UnkStruct_0200D2B4 ov54_021E6EAC[9] = { diff --git a/src/overlay_25.c b/src/overlay_25.c index 3bc90a47b9..5bf13bd11a 100644 --- a/src/overlay_25.c +++ b/src/overlay_25.c @@ -36,39 +36,40 @@ static const MailMessageTemplate TrainerHouse_DefaultLoseMessage = { .msg_bank = MAILMSG_BANK_0292_GMM, .msg_no = msg_0292_00000, - .ec_groups = { EC_GROUP_GREETINGS, EC_GROUP_NONE }, - .ec_words = { msg_0287_thanks, 0 }, + .ec_groups = {EC_GROUP_GREETINGS, EC_GROUP_NONE}, + .ec_words = { msg_0287_thanks, 0 }, }; static const MailMessageTemplate TrainerHouse_DefaultWinMessage = { .msg_bank = MAILMSG_BANK_0296_GMM, .msg_no = msg_0296_00007, - .ec_groups = { EC_GROUP_TRAINER, EC_GROUP_NONE }, - .ec_words = { msg_0285_victory, 0 }, + .ec_groups = {EC_GROUP_TRAINER, EC_GROUP_NONE}, + .ec_words = { msg_0285_victory, 0 }, }; static const MailMessageTemplate TrainerHouse_DefaultIntroMessage = { .msg_bank = MAILMSG_BANK_0294_GMM, .msg_no = msg_0294_00003, - .ec_groups = { EC_GROUP_TRAINER, EC_GROUP_NONE }, - .ec_words = { msg_0285_match, 0 }, + .ec_groups = {EC_GROUP_TRAINER, EC_GROUP_NONE}, + .ec_words = { msg_0285_match, 0 }, }; -#define DUMMY_TRAINER_HOUSE_MON { \ - .language = GAME_LANGUAGE, \ - .nickname = { \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - }, \ -} +#define DUMMY_TRAINER_HOUSE_MON \ + { \ + .language = GAME_LANGUAGE, \ + .nickname = { \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + }, \ + } static const TrainerHouseSet ov25_02259D9C = { .trainer = { diff --git a/src/overlay_26_022598C0.c b/src/overlay_26_022598C0.c index a84e3d7103..2a5a6512c5 100644 --- a/src/overlay_26_022598C0.c +++ b/src/overlay_26_022598C0.c @@ -10,69 +10,69 @@ static u16 GetPreviousRematchIndexForTrainer(u32 rematch_set_no, u16 rematch_no) static u16 GetRematchTrainerIdByIndexPair(u16 rematch_set_no, u32 rematch_no); static const u16 sTrainerRematchSets[][6] = { - { TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE, TRAINER_BIRD_KEEPER_GS_JOSE_3, TRAINER_BIRD_KEEPER_GS_JOSE_4, TRAINER_NONE }, - { TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN_2, TRAINER_PICNICKER_ERIN_3, TRAINER_PICNICKER_ERIN_4, TRAINER_NONE }, - { TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ_2, TRAINER_PICNICKER_LIZ_3, TRAINER_PICNICKER_LIZ_4, TRAINER_NONE }, - { TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD_2, TRAINER_SCHOOL_KID_M_CHAD_3, TRAINER_SCHOOL_KID_M_CHAD_4, TRAINER_NONE }, - { TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY_2, TRAINER_SAILOR_HUEY_3, TRAINER_SAILOR_HUEY_4, TRAINER_NONE }, - { TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE_3, TRAINER_BUG_CATCHER_WADE_2, TRAINER_BUG_CATCHER_WADE_4, TRAINER_NONE }, - { TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY_2, TRAINER_YOUNGSTER_JOEY_3, TRAINER_YOUNGSTER_JOEY_4, TRAINER_NONE }, - { TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK_2, TRAINER_SCHOOL_KID_M_JACK_3, TRAINER_SCHOOL_KID_M_JACK_4, TRAINER_NONE }, - { TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN_2, TRAINER_ACE_TRAINER_M_GAVEN_3, TRAINER_ACE_TRAINER_M_GAVEN_4, TRAINER_NONE }, - { TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI_2, TRAINER_BLACK_BELT_KENJI_3, TRAINER_BLACK_BELT_KENJI_4, TRAINER_NONE }, - { TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY_2, TRAINER_HIKER_PARRY_3, TRAINER_HIKER_PARRY_4, TRAINER_NONE }, - { TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY_2, TRAINER_PICNICKER_TIFFANY_3, TRAINER_PICNICKER_TIFFANY_4, TRAINER_NONE }, - { TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY_2, TRAINER_HIKER_ANTHONY_3, TRAINER_HIKER_ANTHONY_4, TRAINER_NONE }, - { TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA_2, TRAINER_ACE_TRAINER_F_REENA_3, TRAINER_ACE_TRAINER_F_REENA_4, TRAINER_NONE }, - { TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON_2, TRAINER_FISHERMAN_WILTON_3, TRAINER_FISHERMAN_WILTON_4, TRAINER_NONE }, - { TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE_2, TRAINER_ACE_TRAINER_F_JAMIE_3, TRAINER_ACE_TRAINER_F_JAMIE_4, TRAINER_NONE }, - { TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN_2, TRAINER_JUGGLER_IRWIN_3, TRAINER_JUGGLER_IRWIN_4, TRAINER_NONE }, - { TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT_2, TRAINER_POKE_MANIAC_BRENT_3, TRAINER_POKE_MANIAC_BRENT_4, TRAINER_NONE }, - { TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN_2, TRAINER_SCHOOL_KID_M_ALAN_3, TRAINER_SCHOOL_KID_M_ALAN_4, TRAINER_NONE }, - { TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK_2, TRAINER_POKEFAN_M_DEREK_3, TRAINER_POKEFAN_M_DEREK_4, TRAINER_NONE }, - { TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA_2, TRAINER_PICNICKER_GINA_3, TRAINER_PICNICKER_GINA_4, TRAINER_NONE }, - { TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY_2, TRAINER_FISHERMAN_TULLY_3, TRAINER_FISHERMAN_TULLY_4, TRAINER_NONE }, - { TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY_2, TRAINER_POKEFAN_BEVERLY_3, TRAINER_POKEFAN_BEVERLY_4, TRAINER_NONE }, - { TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE_2, TRAINER_BIRD_KEEPER_GS_VANCE_3, TRAINER_BIRD_KEEPER_GS_VANCE_4, TRAINER_NONE }, - { TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH_2, TRAINER_FISHERMAN_RALPH_3, TRAINER_FISHERMAN_RALPH_4, TRAINER_NONE }, - { TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD_2, TRAINER_CAMPER_TODD_3, TRAINER_CAMPER_TODD_4, TRAINER_NONE }, - { TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE_2, TRAINER_BUG_CATCHER_ARNIE_3, TRAINER_BUG_CATCHER_ARNIE_4, TRAINER_NONE }, - { TRAINER_LASS_DANA, TRAINER_LASS_DANA, TRAINER_LASS_DANA_2, TRAINER_LASS_DANA_3, TRAINER_LASS_DANA_4, TRAINER_NONE }, - { TRAINER_LASS_KRISE, TRAINER_LASS_KRISE, TRAINER_LASS_KRISE_2, TRAINER_LASS_KRISE_3, TRAINER_LASS_KRISE_4, TRAINER_NONE }, - { TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN_2, TRAINER_YOUNGSTER_IAN_3, TRAINER_YOUNGSTER_IAN_4, TRAINER_NONE }, - { TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT_2, TRAINER_FIREBREATHER_WALT_3, TRAINER_FIREBREATHER_WALT_4, TRAINER_NONE }, - { TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG_2, TRAINER_BUG_CATCHER_DOUG_3, TRAINER_BUG_CATCHER_DOUG_4, TRAINER_NONE }, - { TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB_2, TRAINER_BUG_CATCHER_ROB_3, TRAINER_BUG_CATCHER_ROB_4, TRAINER_NONE }, - { TRAINER_BIKER_REESE, TRAINER_BIKER_REESE, TRAINER_BIKER_REESE_2, TRAINER_BIKER_REESE_3, TRAINER_BIKER_REESE_4, TRAINER_NONE }, - { TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN_2, TRAINER_BIKER_AIDEN_3, TRAINER_BIKER_AIDEN_4, TRAINER_NONE }, - { TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST_2, TRAINER_BIKER_ERNEST_3, TRAINER_BIKER_ERNEST_4, TRAINER_NONE }, - { TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY_2, TRAINER_TEACHER_HILLARY_3, TRAINER_TEACHER_HILLARY_4, TRAINER_NONE }, - { TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY_2, TRAINER_SCHOOL_KID_M_BILLY_3, TRAINER_SCHOOL_KID_M_BILLY_4, TRAINER_NONE }, - { TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA_2, TRAINER_TWINS_KAY_AND_TIA_3, TRAINER_TWINS_KAY_AND_TIA_4, TRAINER_NONE }, - { TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH_2, TRAINER_BIRD_KEEPER_GS_JOSH_3, TRAINER_BIRD_KEEPER_GS_JOSH_4, TRAINER_NONE }, - { TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN_2, TRAINER_SCHOOL_KID_M_TORIN_3, TRAINER_SCHOOL_KID_M_TORIN_4, TRAINER_NONE }, - { TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_2, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_3, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_4, TRAINER_NONE }, - { TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY_2, TRAINER_HIKER_KENNY_3, TRAINER_HIKER_KENNY_4, TRAINER_NONE }, - { TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER_2, TRAINER_CAMPER_TANNER_3, TRAINER_CAMPER_TANNER_4, TRAINER_NONE }, - { TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE_2, TRAINER_FISHERMAN_KYLE_3, TRAINER_FISHERMAN_KYLE_4, TRAINER_NONE }, - { TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER_2, TRAINER_FISHERMAN_KYLER_3, TRAINER_FISHERMAN_KYLER_4, TRAINER_NONE }, - { TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED_2, TRAINER_GENTLEMAN_ALFRED_3, TRAINER_GENTLEMAN_ALFRED_4, TRAINER_NONE }, - { TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, - { TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + {TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE, TRAINER_BIRD_KEEPER_GS_JOSE_3, TRAINER_BIRD_KEEPER_GS_JOSE_4, TRAINER_NONE}, + { TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN_2, TRAINER_PICNICKER_ERIN_3, TRAINER_PICNICKER_ERIN_4, TRAINER_NONE}, + { TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ_2, TRAINER_PICNICKER_LIZ_3, TRAINER_PICNICKER_LIZ_4, TRAINER_NONE}, + { TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD_2, TRAINER_SCHOOL_KID_M_CHAD_3, TRAINER_SCHOOL_KID_M_CHAD_4, TRAINER_NONE}, + { TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY_2, TRAINER_SAILOR_HUEY_3, TRAINER_SAILOR_HUEY_4, TRAINER_NONE}, + { TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE_3, TRAINER_BUG_CATCHER_WADE_2, TRAINER_BUG_CATCHER_WADE_4, TRAINER_NONE}, + { TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY_2, TRAINER_YOUNGSTER_JOEY_3, TRAINER_YOUNGSTER_JOEY_4, TRAINER_NONE}, + { TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK_2, TRAINER_SCHOOL_KID_M_JACK_3, TRAINER_SCHOOL_KID_M_JACK_4, TRAINER_NONE}, + { TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN_2, TRAINER_ACE_TRAINER_M_GAVEN_3, TRAINER_ACE_TRAINER_M_GAVEN_4, TRAINER_NONE}, + { TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI_2, TRAINER_BLACK_BELT_KENJI_3, TRAINER_BLACK_BELT_KENJI_4, TRAINER_NONE}, + { TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY_2, TRAINER_HIKER_PARRY_3, TRAINER_HIKER_PARRY_4, TRAINER_NONE}, + { TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY_2, TRAINER_PICNICKER_TIFFANY_3, TRAINER_PICNICKER_TIFFANY_4, TRAINER_NONE}, + { TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY_2, TRAINER_HIKER_ANTHONY_3, TRAINER_HIKER_ANTHONY_4, TRAINER_NONE}, + { TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA_2, TRAINER_ACE_TRAINER_F_REENA_3, TRAINER_ACE_TRAINER_F_REENA_4, TRAINER_NONE}, + { TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON_2, TRAINER_FISHERMAN_WILTON_3, TRAINER_FISHERMAN_WILTON_4, TRAINER_NONE}, + { TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE_2, TRAINER_ACE_TRAINER_F_JAMIE_3, TRAINER_ACE_TRAINER_F_JAMIE_4, TRAINER_NONE}, + { TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN_2, TRAINER_JUGGLER_IRWIN_3, TRAINER_JUGGLER_IRWIN_4, TRAINER_NONE}, + { TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT_2, TRAINER_POKE_MANIAC_BRENT_3, TRAINER_POKE_MANIAC_BRENT_4, TRAINER_NONE}, + { TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN_2, TRAINER_SCHOOL_KID_M_ALAN_3, TRAINER_SCHOOL_KID_M_ALAN_4, TRAINER_NONE}, + { TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK_2, TRAINER_POKEFAN_M_DEREK_3, TRAINER_POKEFAN_M_DEREK_4, TRAINER_NONE}, + { TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA_2, TRAINER_PICNICKER_GINA_3, TRAINER_PICNICKER_GINA_4, TRAINER_NONE}, + { TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY_2, TRAINER_FISHERMAN_TULLY_3, TRAINER_FISHERMAN_TULLY_4, TRAINER_NONE}, + { TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY_2, TRAINER_POKEFAN_BEVERLY_3, TRAINER_POKEFAN_BEVERLY_4, TRAINER_NONE}, + { TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE_2, TRAINER_BIRD_KEEPER_GS_VANCE_3, TRAINER_BIRD_KEEPER_GS_VANCE_4, TRAINER_NONE}, + { TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH_2, TRAINER_FISHERMAN_RALPH_3, TRAINER_FISHERMAN_RALPH_4, TRAINER_NONE}, + { TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD_2, TRAINER_CAMPER_TODD_3, TRAINER_CAMPER_TODD_4, TRAINER_NONE}, + { TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE_2, TRAINER_BUG_CATCHER_ARNIE_3, TRAINER_BUG_CATCHER_ARNIE_4, TRAINER_NONE}, + { TRAINER_LASS_DANA, TRAINER_LASS_DANA, TRAINER_LASS_DANA_2, TRAINER_LASS_DANA_3, TRAINER_LASS_DANA_4, TRAINER_NONE}, + { TRAINER_LASS_KRISE, TRAINER_LASS_KRISE, TRAINER_LASS_KRISE_2, TRAINER_LASS_KRISE_3, TRAINER_LASS_KRISE_4, TRAINER_NONE}, + { TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN_2, TRAINER_YOUNGSTER_IAN_3, TRAINER_YOUNGSTER_IAN_4, TRAINER_NONE}, + { TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT_2, TRAINER_FIREBREATHER_WALT_3, TRAINER_FIREBREATHER_WALT_4, TRAINER_NONE}, + { TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG_2, TRAINER_BUG_CATCHER_DOUG_3, TRAINER_BUG_CATCHER_DOUG_4, TRAINER_NONE}, + { TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB_2, TRAINER_BUG_CATCHER_ROB_3, TRAINER_BUG_CATCHER_ROB_4, TRAINER_NONE}, + { TRAINER_BIKER_REESE, TRAINER_BIKER_REESE, TRAINER_BIKER_REESE_2, TRAINER_BIKER_REESE_3, TRAINER_BIKER_REESE_4, TRAINER_NONE}, + { TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN_2, TRAINER_BIKER_AIDEN_3, TRAINER_BIKER_AIDEN_4, TRAINER_NONE}, + { TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST_2, TRAINER_BIKER_ERNEST_3, TRAINER_BIKER_ERNEST_4, TRAINER_NONE}, + { TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY_2, TRAINER_TEACHER_HILLARY_3, TRAINER_TEACHER_HILLARY_4, TRAINER_NONE}, + { TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY_2, TRAINER_SCHOOL_KID_M_BILLY_3, TRAINER_SCHOOL_KID_M_BILLY_4, TRAINER_NONE}, + { TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA_2, TRAINER_TWINS_KAY_AND_TIA_3, TRAINER_TWINS_KAY_AND_TIA_4, TRAINER_NONE}, + { TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH_2, TRAINER_BIRD_KEEPER_GS_JOSH_3, TRAINER_BIRD_KEEPER_GS_JOSH_4, TRAINER_NONE}, + { TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN_2, TRAINER_SCHOOL_KID_M_TORIN_3, TRAINER_SCHOOL_KID_M_TORIN_4, TRAINER_NONE}, + { TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_2, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_3, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_4, TRAINER_NONE}, + { TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY_2, TRAINER_HIKER_KENNY_3, TRAINER_HIKER_KENNY_4, TRAINER_NONE}, + { TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER_2, TRAINER_CAMPER_TANNER_3, TRAINER_CAMPER_TANNER_4, TRAINER_NONE}, + { TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE_2, TRAINER_FISHERMAN_KYLE_3, TRAINER_FISHERMAN_KYLE_4, TRAINER_NONE}, + { TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER_2, TRAINER_FISHERMAN_KYLER_3, TRAINER_FISHERMAN_KYLER_4, TRAINER_NONE}, + { TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED_2, TRAINER_GENTLEMAN_ALFRED_3, TRAINER_GENTLEMAN_ALFRED_4, TRAINER_NONE}, + { TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, }; u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData *saveData, u16 trainer_id) { diff --git a/src/overlay_94.c b/src/overlay_94.c index c56b817bdc..8de383d965 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -177,12 +177,12 @@ static void _EmitParticles(IconFormChangeData *partyMenu) { } static const fx32 sPartyMonSpritePositions[][2] = { - { -16500, 12000 }, - { 5000, 11500 }, - { -16500, 5000 }, - { 5000, 3500 }, - { -16500, -3000 }, - { 5000, -4500 } + {-16500, 12000}, + { 5000, 11500}, + { -16500, 5000 }, + { 5000, 3500 }, + { -16500, -3000}, + { 5000, -4500} }; static void particleEmitCallback(SPLEmitter *emitter) { diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index a1e6280089..62e5b4a479 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -1,20 +1,166 @@ +#include "overlay_mic_test.h" + #include "font.h" #include "gf_gfx_loader.h" #include "main.h" #include "math_util.h" -#include "overlay_mic_test.h" #include "sound.h" #include "sound_02004A44.h" #include "system.h" #include "text.h" #include "title_screen.h" #include "touchscreen.h" -#include "unk_0200FA24.h" #include "unk_02005D10.h" #include "unk_0200B150.h" +#include "unk_0200FA24.h" #include "vram_transfer_manager.h" -BOOL MicTest_Init(OVY_MANAGER *overlayMan) { +#define TS_HITBOX_MIC_TEST_RETURN 0 + +static const GraphicsBanks sMicTestGraphicsBanks = { + .bg = GX_VRAM_BG_128_A, + .bgextpltt = GX_VRAM_BGEXTPLTT_NONE, + .subbg = GX_VRAM_SUB_BG_128_C, + .subbgextpltt = GX_VRAM_SUB_BGEXTPLTT_NONE, + .obj = GX_VRAM_OBJ_128_B, + .objextpltt = GX_VRAM_OBJEXTPLTT_NONE, + .subobj = GX_VRAM_SUB_OBJ_16_I, + .subobjextpltt = GX_VRAM_SUB_OBJEXTPLTT_NONE, + .tex = GX_VRAM_TEX_NONE, + .texpltt = GX_VRAM_TEXPLTT_NONE +}; + +static const struct { + BgTemplate bgTemplate; + u8 unk1C; + u8 unk1D; + u8 unk1E; + u8 unk1F; +} ov62_021E6728[] = { + { + .bgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = 1, + .colorMode = 0, + .screenBase = 0x1F, + .charBase = 0, + .bgExtPltt = 0, + .priority = 0, + .areaOver = 0, + .dummy = 0, + .mosaic = 0 }, + .unk1C = 0, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, + }, + { + .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1E, .charBase = 1, .bgExtPltt = 0, .priority = 1, .areaOver = 0, .dummy = 0, .mosaic = 0 }, + .unk1C = 1, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, + }, + { + .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1D, .charBase = 2, .bgExtPltt = 0, .priority = 2, .areaOver = 0, .dummy = 0, .mosaic = 0 }, + .unk1C = 2, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, + }, + { + .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1F, .charBase = 0, .bgExtPltt = 0, .priority = 0, .areaOver = 0, .dummy = 0, .mosaic = 0 }, + .unk1C = 4, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, + }, + { + .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1E, .charBase = 1, .bgExtPltt = 0, .priority = 1, .areaOver = 0, .dummy = 0, .mosaic = 0 }, + .unk1C = 5, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, + }, +}; + +static const UnkTemplate_0200D748 ov62_021E67C8[5] = { + {.x = 0x40, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, + { .x = 0xC0, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, + { .x = 0x80, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xB01, 0xB03, 0xB02, 0xB04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, + { .x = 0xD8, .y = 0xB0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, .resIdList = { 0xD01, 0xD03, 0xD02, 0xD04, 1, 0 }, .bgPriority = 0, .vramTransfer = 0}, + { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xC01, 0xC03, 0xC02, 0xC04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, +}; +static const u32 ov62_021E6694[7] = { 0, 1, 2, 3, 4, 4, 4 }; + +static const TouchscreenHitbox sMicTestTouchscreenHitboxes[] = { + { .rect = { 160, 192, 184, 248 } }, // Return + { .rect = { TOUCHSCREEN_RECTLIST_END } }, +}; + +static const OamManagerParam sMicTestOamManParam = { + .fromOBJmain = 0, + .numOBJmain = 128, + .fromAffineMain = 0, + .numAffineMain = 32, + .fromOBJsub = 0, + .numOBJsub = 128, + .fromAffineSub = 0, + .numAffineSub = 32 +}; + +static const OamCharTransferParam ov62_021E6668 = { + 7, + 0x20000, + 0x4000, + GX_OBJVRAMMODE_CHAR_1D_32K, + GX_OBJVRAMMODE_CHAR_1D_32K +}; + +static const SpriteResourceCountsListUnion sMicTestResCountList = { + .numChar = 32, + .numPltt = 32, + .numCell = 32, + .numAnim = 32, + .numMcel = 0, + .numManm = 0 +}; + +static const GraphicsModes sMicTestGraphicsMode = { + .dispMode = GX_DISPMODE_GRAPHICS, + .bgMode = GX_BGMODE_0, + .subMode = GX_BGMODE_0, + ._2d3dMode = GX_BG0_AS_2D +}; + +static const struct { + u8 bgId; + u8 x; + u8 y; + u8 width; + u8 height; + u8 palNum; + u16 baseTile; + u8 fontId; + u32 color; +} ov62_021E66F8[3] = { + {.bgId = 0, .x = 1, .y = 1, .width = 9, .height = 3, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200}, + { .bgId = 4, .x = 5, .y = 8, .width = 22, .height = 5, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200}, + { .bgId = 4, .x = 24, .y = 21, .width = 6, .height = 2, .palNum = 0, .baseTile = 0x6F, .fontId = 4, .color = 0xE0F00}, +}; + +const OVY_MGR_TEMPLATE gApplication_MicTest = { MicTest_Init, MicTest_Main, MicTest_Exit, FS_OVERLAY_ID_NONE }; + +static void MicTestTask_FadeOut(MicTestTaskManager *taskMan, u32 *state); +static void MicTestTask_End(MicTestTaskManager *taskMan, u32 *state); + +static void MicTest_EndTasks(MicTestData *micTest); +static int MicTest_CheckReturn(MicTestData *data); + +BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state) { CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 3 << 0x10); MicTestData *micTest = OverlayManager_CreateAndGetData(overlayMan, sizeof(MicTestData), HEAP_ID_MIC_TEST); MI_CpuFill8(micTest, 0, sizeof(MicTestData)); @@ -34,7 +180,7 @@ BOOL MicTest_Init(OVY_MANAGER *overlayMan) { return TRUE; } -BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { +BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state) { MicTestData *micTest = OverlayManager_GetData(overlayMan); ov62_021E61FC(&micTest->unkF0); ov62_021E5FA0(micTest); @@ -49,7 +195,7 @@ BOOL MicTest_Exit(OVY_MANAGER *overlayMan) { return TRUE; } -BOOL MicTest_Main(OVY_MANAGER *overlayMan) { +BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state) { MicTestData *micTest = OverlayManager_GetData(overlayMan); if (MicTestTaskMan_IsFinished(&micTest->taskMan)) { return TRUE; @@ -62,7 +208,7 @@ BOOL MicTest_Main(OVY_MANAGER *overlayMan) { } void MicTest_StartTask(MicTestTaskManager *taskMan, MicTestData *micTest, MicTestTask task) { - taskMan->micTest = micTest; + taskMan->micTest = micTest; taskMan->isFinished = FALSE; MicTest_SetTask(taskMan, task); } @@ -74,7 +220,7 @@ void MicTestTaskMan_Run(MicTestTaskManager *taskMan) { } void MicTest_SetTask(MicTestTaskManager *taskMan, MicTestTask task) { - taskMan->task = task; + taskMan->task = task; taskMan->state = 0; } @@ -120,7 +266,7 @@ void ov62_021E5B04(MicTestTaskManager *taskMan, u32 *state) { (*state) = 1; break; case 1: - if (ov62_021E6630(micTest)) { + if (MicTest_CheckReturn(micTest)) { PlaySE(SEQ_SE_DP_SELECT); (*state) = 2; } @@ -152,14 +298,14 @@ void ov62_021E5B6C(MicTestTaskManager *taskMan, u32 *state) { } break; case 2: - MicTest_SetTask(taskMan, ov62_021E5BB8); + MicTest_SetTask(taskMan, MicTestTask_FadeOut); break; default: GF_ASSERT(FALSE); } } -void ov62_021E5BB8(MicTestTaskManager *taskMan, u32 *state) { +static void MicTestTask_FadeOut(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { @@ -173,16 +319,16 @@ void ov62_021E5BB8(MicTestTaskManager *taskMan, u32 *state) { } break; case 2: - MicTest_SetTask(taskMan, ov62_021E5C20); + MicTest_SetTask(taskMan, MicTestTask_End); break; default: GF_ASSERT(FALSE); } } -void ov62_021E5C20(MicTestTaskManager *taskMan, u32 *state) { +static void MicTestTask_End(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); - ov62_021E6600(micTest); + MicTest_EndTasks(micTest); MicTestTaskMan_Finish(taskMan); } @@ -208,19 +354,17 @@ void ov62_021E5C80() { GXS_SetVisiblePlane(0); } -extern GraphicsBanks sMicTestGraphicsBanks; - void MicTest_SetBanks() { GfGfx_SetBanks(&sMicTestGraphicsBanks); } -//TODO: Is this a library struct? +// TODO: Is this a library struct? typedef struct UnkStruct_27E0000 { u8 unk_0000[0x3FF8]; u32 unk_3FF8; } UnkStruct_27E0000; -void MicTest_VBlankIntrCB(void *data){ +void MicTest_VBlankIntrCB(void *data) { MicTestData *micTest = data; NNS_GfdDoVramTransfer(); ov62_021E5FC4(micTest); @@ -229,19 +373,16 @@ void MicTest_VBlankIntrCB(void *data){ unkStruct->unk_3FF8 |= 1; } -extern Unk122_021E92FC ov62_021E66B0; -extern Unk122_021E92D0 ov62_021E6668; -extern SpriteResourceCountsListUnion ov62_021E667C; - void ov62_021E5CF4(MicTestData *micTest, HeapID heapId) { SpriteRenderer *spriteRender = SpriteRenderer_Create(heapId); + micTest->spriteRenderer = spriteRender; - sub_0200CF70(spriteRender, &ov62_021E66B0, &ov62_021E6668, 0x20); + SpriteRenderer_CreateOamCharPlttManagers(spriteRender, &sMicTestOamManParam, &ov62_021E6668, 0x20); sub_0200B2E0(heapId); sub_0200B2E8(heapId); - micTest->unk4 = SpriteRenderer_CreateGfxHandler(micTest->spriteRenderer); - sub_0200CFF4(micTest->spriteRenderer, micTest->unk4, 7); - SpriteRenderer_Init2DGfxResManagersFromCountsArray(micTest->spriteRenderer, micTest->unk4, &ov62_021E667C); + micTest->gfxHandler = SpriteRenderer_CreateGfxHandler(micTest->spriteRenderer); + SpriteRenderer_CreateSpriteList(micTest->spriteRenderer, micTest->gfxHandler, 7); + SpriteRenderer_Init2DGfxResManagersFromCountsArray(micTest->spriteRenderer, micTest->gfxHandler, (SpriteResourceCountsListUnion *)&sMicTestResCountList); GfGfx_EngineATogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); GfGfx_EngineBTogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); } @@ -255,35 +396,32 @@ void MicTest_UpdateAnimations(MicTestData *micTest) { for (u16 i = 0; i < 7; i++) { UnkImageStruct_TickSpriteAnimation1Frame(micTest->unk8[i]); } - sub_0200D020(micTest->unk4); + SpriteGfxHandler_RenderAndAnimateSprites(micTest->gfxHandler); } -extern UnkTemplate_0200D748 ov62_021E67C8[7]; -extern u32 ov62_021E6694[7]; - void MicTest_LoadResources(MicTestData *micTest) { - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 8, 0, 0xA02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 9, 0, 0xA04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 7, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xa01); - - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 10, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 12, 0, 0xB02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 13, 0, 0xB04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 11, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB01); - - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 18, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 0xD03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 20, 0, 0xD02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 21, 0, 0xD04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 19, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0xD01); - - SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC03); - SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 16, 0, 0xC02); - SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 17, 0, 0xC04); - SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->unk4, NARC_a_1_7_6, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC01); + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 8, 0, 0xA02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 9, 0, 0xA04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 7, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xa01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 10, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 12, 0, 0xB02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 13, 0, 0xB04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 11, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xB01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 18, 0, 1, NNS_G2D_VRAM_TYPE_2DSUB, 0xD03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 20, 0, 0xD02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 21, 0, 0xD04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 19, 0, NNS_G2D_VRAM_TYPE_2DSUB, 0xD01); + + SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 14, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC03); + SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 16, 0, 0xC02); + SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 17, 0, 0xC04); + SpriteRenderer_LoadCharResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 0xC01); for (u16 i = 0; i < 7; i++) { - micTest->unk8[i] = SpriteRenderer_LoadResourcesAndCreateSprite(micTest->spriteRenderer, micTest->unk4, &ov62_021E67C8[ov62_021E6694[i]]); + micTest->unk8[i] = SpriteRenderer_LoadResourcesAndCreateSprite(micTest->spriteRenderer, micTest->gfxHandler, &ov62_021E67C8[ov62_021E6694[i]]); UnkImageStruct_SetSpriteAnimActiveFlag(micTest->unk8[i], TRUE); } @@ -302,7 +440,7 @@ void ov62_021E5FA0(MicTestData *micTest) { UnkImageStruct_Delete(micTest->unk8[i]); } } - SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->spriteRenderer, micTest->unk4); + SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->spriteRenderer, micTest->gfxHandler); } void ov62_021E5FC4(MicTestData *micTest) { @@ -311,18 +449,9 @@ void ov62_021E5FC4(MicTestData *micTest) { } } -extern GraphicsModes ov62_021E6658; -extern struct { - BgTemplate bgTemplate; - u8 unk1C; - u8 unk1D; - u8 unk1E; - u8 unk1F; -} ov62_021E6728[5]; - void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { a0->bgConfig = BgConfig_Alloc(heapId); - SetBothScreensModesAndDisable(&ov62_021E6658); + SetBothScreensModesAndDisable(&sMicTestGraphicsMode); for (u32 i = 0; i < 5; i++) { InitBgFromTemplate(a0->bgConfig, ov62_021E6728[i].unk1C, &ov62_021E6728[i].bgTemplate, ov62_021E6728[i].unk1D); @@ -339,7 +468,6 @@ void ov62_021E6024(MicTestSub_B8 *a0) { } void ov62_021E6048(MicTestSub_B8 *a0) { - } void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId) { @@ -358,18 +486,6 @@ void ov62_021E60D4(MicTestSub_B8 *a0) { } } -extern struct { - u8 bgId; - u8 x; - u8 y; - u8 width; - u8 height; - u8 palNum; - u16 baseTile; - u8 fontId; - u32 color; -} ov62_021E66F8[3]; - void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { a0->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, 0xea, heapId); @@ -396,19 +512,19 @@ void ov62_021E6178(MicTestSub_B8 *a0) { void ov62_021E61AC(MicTestSub_F0 *a0, HeapID heapId, MICCallback a2, MicTestData *micTest) { Sys_SetSleepDisableFlag(8); - + void *data = AllocFromHeap(heapId, 0x120); MI_CpuFill8(data, 0, 0x120); a0->unk1C = data; - - a0->mic.type = MIC_SAMPLING_TYPE_8BIT; - a0->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? - a0->mic.size = (1 << 8); - a0->mic.rate = 0x1040; - a0->mic.loop_enable = TRUE; + + a0->mic.type = MIC_SAMPLING_TYPE_8BIT; + a0->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? + a0->mic.size = (1 << 8); + a0->mic.rate = 0x1040; + a0->mic.loop_enable = TRUE; a0->mic.full_callback = a2; - a0->mic.full_arg = micTest; - + a0->mic.full_arg = micTest; + a0->unk34 = sub_02005518(); } @@ -420,7 +536,7 @@ void ov62_021E61FC(MicTestSub_F0 *a0) { void ov62_021E620C(MicTestSub_F0 *a0) { u32 next = sub_02005518(); - if (next == 0 || a0->unk34 == 0) { + if (next == 0 || a0->unk34 == 0) { if (a0->unk30 == 0) { if (a0->unk28) { ov62_021E6278(a0); @@ -431,14 +547,14 @@ void ov62_021E620C(MicTestSub_F0 *a0) { if (next != 0 && a0->unk34 == 0) { a0->unk30 = 0; - + if (a0->unk2C) { ov62_021E625C(a0); a0->unk2C = 0; } } } - + a0->unk34 = next; } @@ -459,11 +575,11 @@ void ov62_021E6278(MicTestSub_F0 *a0) { s32 MicTest_AverageMicInput(MicTestSub_F0 *a0) { int i; u8 *buffer; - - int cnt = 0; + + int cnt = 0; int size = a0->mic.size - 1; - buffer = a0->mic.buffer; - + buffer = a0->mic.buffer; + for (i = 0; i < size; i++) { if (buffer[i] < 0x80) { cnt += 0x100 - buffer[i]; @@ -474,13 +590,13 @@ s32 MicTest_AverageMicInput(MicTestSub_F0 *a0) { return cnt / size; } -extern struct { +static struct { u32 unk0; } _021E68E0; void MicTest_MicrophoneCallback(MICResult result, void *data) { MicTestData *micTest = data; - + if (result != MIC_RESULT_SUCCESS) { return; } @@ -489,16 +605,16 @@ void MicTest_MicrophoneCallback(MICResult result, void *data) { s32 volumeAvg = MicTest_AverageMicInput(unkF0); u32 volume; - + if (unkF0->curVolume < volumeAvg) { - volume = MicTest_GetVolumeBracket(volumeAvg); + volume = MicTest_GetVolumeBracket(volumeAvg); unkF0->curVolume = volumeAvg; - unkF0->unk24 = 1; + unkF0->unk24 = 1; } else { volume = MicTest_GetVolumeBracket(unkF0->curVolume); unkF0->curVolume -= 2; } - + if (volume) { if (unkF0->unk24) { UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[2], 1); @@ -514,7 +630,7 @@ void MicTest_MicrophoneCallback(MICResult result, void *data) { micTest->unkB4 = 10; } } - + UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], volume); UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], volume); } else if (volume == 0) { @@ -522,27 +638,27 @@ void MicTest_MicrophoneCallback(MICResult result, void *data) { UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[0], 0); UnkImageStruct_SetSpriteAnimSeqNo(micTest->unk8[1], 0); } - + _021E68E0.unk0++; } -u32 MicTest_GetVolumeBracket(u8 a0) { +u32 MicTest_GetVolumeBracket(u8 volume) { u32 ret; - if (a0 <= 0x8C) { + if (volume <= 0x8C) { ret = 0; - } else if (a0 >= 0x8D && a0 <= 0x98) { + } else if (volume >= 0x8D && volume <= 0x98) { ret = 1; - } else if (a0 >= 0x99 && a0 <= 0xA6) { + } else if (volume >= 0x99 && volume <= 0xA6) { ret = 2; - } else if (a0 >= 0xA7 && a0 <= 0xBB) { + } else if (volume >= 0xA7 && volume <= 0xBB) { ret = 3; - } else if (a0 >= 0xBC) { + } else if (volume >= 0xBC) { ret = 4; } else { GF_ASSERT(FALSE); } - + return ret; } @@ -557,7 +673,7 @@ u32 ov62_021E63D0(MicTestData *micTest) { BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { UnkImageStruct *flag = 0; - MicTestSub_24 *args = NULL; + MicTestSub_24 *args = NULL; for (int i = 0; i < 3; i++) { if (micTest->unk24[i].task == NULL) { args = &micTest->unk24[i]; @@ -578,7 +694,7 @@ BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { } void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7) { - args->task = SysTask_CreateOnMainQueue(ov62_021E6570, args, 0); + args->task = SysTask_CreateOnMainQueue(ov62_021E6570, args, 0); MicTestSub_24 *data = SysTask_GetData(args->task); data->unk0 = a0; @@ -588,9 +704,9 @@ void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, data->unk8.y = FX32_CONST(y); data->unk8.z = 0; - s32 sine = GF_SinDegNoWrap(r1 + 90); + s32 sine = GF_SinDegNoWrap(r1 + 90); data->unk14.x = FX_MUL(z, sine); - sine = GF_SinDegNoWrap(r1); + sine = GF_SinDegNoWrap(r1); data->unk14.y = -FX_MUL(z, sine); data->unk14.z = 0; @@ -613,18 +729,18 @@ void ov62_021E6570(SysTask *task, void *_data) { VEC_Add(&data->unk8, &data->unk14, &data->unk8); - s16 x = data->unk8.x >> 12; - s16 y = data->unk8.y >> 12; + s16 x = data->unk8.x >> 12; + s16 y = data->unk8.y >> 12; data->unk20 = data->unk20 + data->unk24; while (data->unk20 > FX32_CONST(360)) { data->unk20 -= FX32_CONST(360); } - + x += GF_SinDegNoWrap(data->unk20 >> 12) * data->unk28 >> 12; - + UnkImageStruct_SetSpritePositionXY(data->unk0, x, y); - + if (y < -16) { UnkImageStruct_SetSpriteVisibleFlag(data->unk0, FALSE); SysTask_Destroy(task); @@ -632,7 +748,7 @@ void ov62_021E6570(SysTask *task, void *_data) { } } -void ov62_021E6600(MicTestData *micTest) { +static void MicTest_EndTasks(MicTestData *micTest) { for (int i = 0; i < 3; i++) { if (micTest->unk24[i].task != NULL) { SysTask_Destroy(micTest->unk24[i].task); @@ -641,15 +757,13 @@ void ov62_021E6600(MicTestData *micTest) { } } -extern TouchscreenHitbox _021E6650; - -int ov62_021E6620() { - return TouchscreenHitbox_FindRectAtTouchNew(&_021E6650); +static int MicTest_CheckTouchscreenInput() { + return TouchscreenHitbox_FindRectAtTouchNew(&sMicTestTouchscreenHitboxes[0]); } -int ov62_021E6630(MicTestData *data) { - if (ov62_021E6620() == 0 || (gSystem.newKeys & 2)) { +static int MicTest_CheckReturn(MicTestData *data) { + if (MicTest_CheckTouchscreenInput() == TS_HITBOX_MIC_TEST_RETURN || (gSystem.newKeys & 2)) { return TRUE; } return FALSE; -} \ No newline at end of file +} diff --git a/src/party_context_menu.c b/src/party_context_menu.c index c66228b060..9fb16cf07d 100644 --- a/src/party_context_menu.c +++ b/src/party_context_menu.c @@ -40,95 +40,95 @@ static BOOL handlePartyMenuTopLevelDpadInput(u8 *pSelection, int numItems, int d static BOOL handlePartyContextMenuDpadInput(u8 *pSelection, int numItems, int direction); static const WindowTemplate sMainWindowTemplates[] = { - { GF_BG_LYR_MAIN_1, 0x06, 0x01, 0x09, 0x02, 0x00, 0x0048 }, - { GF_BG_LYR_MAIN_1, 0x00, 0x04, 0x06, 0x02, 0x00, 0x005A }, - { GF_BG_LYR_MAIN_1, 0x07, 0x04, 0x08, 0x02, 0x00, 0x0066 }, - { GF_BG_LYR_MAIN_1, 0x08, 0x03, 0x06, 0x01, 0x03, 0x0076 }, - { GF_BG_LYR_MAIN_1, 0x06, 0x04, 0x0A, 0x02, 0x00, 0x0066 }, - { GF_BG_LYR_MAIN_1, 0x16, 0x02, 0x09, 0x02, 0x00, 0x007C }, - { GF_BG_LYR_MAIN_1, 0x10, 0x05, 0x06, 0x02, 0x00, 0x008E }, - { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A }, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, - { GF_BG_LYR_MAIN_1, 0x16, 0x05, 0x0A, 0x02, 0x00, 0x009A }, - { GF_BG_LYR_MAIN_1, 0x06, 0x07, 0x09, 0x02, 0x00, 0x00B0 }, - { GF_BG_LYR_MAIN_1, 0x00, 0x0A, 0x06, 0x02, 0x00, 0x00C2 }, - { GF_BG_LYR_MAIN_1, 0x07, 0x0A, 0x08, 0x02, 0x00, 0x00CE }, - { GF_BG_LYR_MAIN_1, 0x08, 0x09, 0x06, 0x01, 0x05, 0x00DE }, - { GF_BG_LYR_MAIN_1, 0x06, 0x0A, 0x0A, 0x02, 0x00, 0x00CE }, - { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4 }, - { GF_BG_LYR_MAIN_1, 0x10, 0x0B, 0x06, 0x02, 0x00, 0x00F6 }, - { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102 }, - { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112 }, - { GF_BG_LYR_MAIN_1, 0x16, 0x0B, 0x0A, 0x02, 0x00, 0x0102 }, - { GF_BG_LYR_MAIN_1, 0x06, 0x0D, 0x09, 0x02, 0x00, 0x0118 }, - { GF_BG_LYR_MAIN_1, 0x00, 0x10, 0x06, 0x02, 0x00, 0x012A }, - { GF_BG_LYR_MAIN_1, 0x07, 0x10, 0x08, 0x02, 0x00, 0x0136 }, - { GF_BG_LYR_MAIN_1, 0x08, 0x0F, 0x06, 0x01, 0x07, 0x0146 }, - { GF_BG_LYR_MAIN_1, 0x06, 0x10, 0x0A, 0x02, 0x00, 0x0136 }, - { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C }, - { GF_BG_LYR_MAIN_1, 0x10, 0x11, 0x06, 0x02, 0x00, 0x015E }, - { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A }, - { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A }, - { GF_BG_LYR_MAIN_1, 0x16, 0x11, 0x0A, 0x02, 0x00, 0x016A }, - { GF_BG_LYR_MAIN_1, 0x16, 0x01, 0x09, 0x02, 0x00, 0x007C }, - { GF_BG_LYR_MAIN_1, 0x11, 0x05, 0x05, 0x02, 0x00, 0x008E }, - { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A }, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, - { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4 }, - { GF_BG_LYR_MAIN_1, 0x11, 0x0B, 0x05, 0x02, 0x00, 0x00F6 }, - { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102 }, - { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112 }, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, - { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C }, - { GF_BG_LYR_MAIN_1, 0x11, 0x11, 0x05, 0x02, 0x00, 0x015E }, - { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A }, - { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A }, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, - { GF_BG_LYR_SUB_2, 0x07, 0x18, 0x0A, 0x02, 0x02, 0x0001 }, - { GF_BG_LYR_SUB_2, 0x11, 0x18, 0x06, 0x02, 0x02, 0x0015 }, - { GF_BG_LYR_SUB_2, 0x11, 0x1A, 0x0C, 0x03, 0x02, 0x0021 }, + {GF_BG_LYR_MAIN_1, 0x06, 0x01, 0x09, 0x02, 0x00, 0x0048}, + { GF_BG_LYR_MAIN_1, 0x00, 0x04, 0x06, 0x02, 0x00, 0x005A}, + { GF_BG_LYR_MAIN_1, 0x07, 0x04, 0x08, 0x02, 0x00, 0x0066}, + { GF_BG_LYR_MAIN_1, 0x08, 0x03, 0x06, 0x01, 0x03, 0x0076}, + { GF_BG_LYR_MAIN_1, 0x06, 0x04, 0x0A, 0x02, 0x00, 0x0066}, + { GF_BG_LYR_MAIN_1, 0x16, 0x02, 0x09, 0x02, 0x00, 0x007C}, + { GF_BG_LYR_MAIN_1, 0x10, 0x05, 0x06, 0x02, 0x00, 0x008E}, + { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A}, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, + { GF_BG_LYR_MAIN_1, 0x16, 0x05, 0x0A, 0x02, 0x00, 0x009A}, + { GF_BG_LYR_MAIN_1, 0x06, 0x07, 0x09, 0x02, 0x00, 0x00B0}, + { GF_BG_LYR_MAIN_1, 0x00, 0x0A, 0x06, 0x02, 0x00, 0x00C2}, + { GF_BG_LYR_MAIN_1, 0x07, 0x0A, 0x08, 0x02, 0x00, 0x00CE}, + { GF_BG_LYR_MAIN_1, 0x08, 0x09, 0x06, 0x01, 0x05, 0x00DE}, + { GF_BG_LYR_MAIN_1, 0x06, 0x0A, 0x0A, 0x02, 0x00, 0x00CE}, + { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4}, + { GF_BG_LYR_MAIN_1, 0x10, 0x0B, 0x06, 0x02, 0x00, 0x00F6}, + { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102}, + { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112}, + { GF_BG_LYR_MAIN_1, 0x16, 0x0B, 0x0A, 0x02, 0x00, 0x0102}, + { GF_BG_LYR_MAIN_1, 0x06, 0x0D, 0x09, 0x02, 0x00, 0x0118}, + { GF_BG_LYR_MAIN_1, 0x00, 0x10, 0x06, 0x02, 0x00, 0x012A}, + { GF_BG_LYR_MAIN_1, 0x07, 0x10, 0x08, 0x02, 0x00, 0x0136}, + { GF_BG_LYR_MAIN_1, 0x08, 0x0F, 0x06, 0x01, 0x07, 0x0146}, + { GF_BG_LYR_MAIN_1, 0x06, 0x10, 0x0A, 0x02, 0x00, 0x0136}, + { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C}, + { GF_BG_LYR_MAIN_1, 0x10, 0x11, 0x06, 0x02, 0x00, 0x015E}, + { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A}, + { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A}, + { GF_BG_LYR_MAIN_1, 0x16, 0x11, 0x0A, 0x02, 0x00, 0x016A}, + { GF_BG_LYR_MAIN_1, 0x16, 0x01, 0x09, 0x02, 0x00, 0x007C}, + { GF_BG_LYR_MAIN_1, 0x11, 0x05, 0x05, 0x02, 0x00, 0x008E}, + { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A}, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, + { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4}, + { GF_BG_LYR_MAIN_1, 0x11, 0x0B, 0x05, 0x02, 0x00, 0x00F6}, + { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102}, + { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112}, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, + { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C}, + { GF_BG_LYR_MAIN_1, 0x11, 0x11, 0x05, 0x02, 0x00, 0x015E}, + { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A}, + { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A}, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, + { GF_BG_LYR_SUB_2, 0x07, 0x18, 0x0A, 0x02, 0x02, 0x0001}, + { GF_BG_LYR_SUB_2, 0x11, 0x18, 0x06, 0x02, 0x02, 0x0015}, + { GF_BG_LYR_SUB_2, 0x11, 0x1A, 0x0C, 0x03, 0x02, 0x0021}, }; static const WindowTemplate sAdditionalWindowTemplates[] = { - { GF_BG_LYR_MAIN_1, 0x1A, 0x15, 0x05, 0x02, 0x00, 0x0180 }, - { GF_BG_LYR_MAIN_1, 0x19, 0x14, 0x07, 0x02, 0x00, 0x018A }, - { GF_BG_LYR_MAIN_0, 0x02, 0x15, 0x14, 0x02, 0x0D, 0x0198 }, - { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x0D, 0x04, 0x0D, 0x01C0 }, - { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x1B, 0x04, 0x0D, 0x01F4 }, - { GF_BG_LYR_MAIN_0, 0x13, 0x11, 0x0C, 0x06, 0x00, 0x0260 }, - { GF_BG_LYR_MAIN_0, 0x13, 0x0F, 0x0C, 0x08, 0x00, 0x0260 }, + {GF_BG_LYR_MAIN_1, 0x1A, 0x15, 0x05, 0x02, 0x00, 0x0180}, + { GF_BG_LYR_MAIN_1, 0x19, 0x14, 0x07, 0x02, 0x00, 0x018A}, + { GF_BG_LYR_MAIN_0, 0x02, 0x15, 0x14, 0x02, 0x0D, 0x0198}, + { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x0D, 0x04, 0x0D, 0x01C0}, + { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x1B, 0x04, 0x0D, 0x01F4}, + { GF_BG_LYR_MAIN_0, 0x13, 0x11, 0x0C, 0x06, 0x00, 0x0260}, + { GF_BG_LYR_MAIN_0, 0x13, 0x0F, 0x0C, 0x08, 0x00, 0x0260}, }; static const WindowTemplate sButtonWindowTemplates[] = { - { GF_BG_LYR_MAIN_0, 0x11, 0x04, 0x0E, 0x02, 0x02, 0x0260 }, - { GF_BG_LYR_MAIN_0, 0x11, 0x08, 0x0E, 0x02, 0x02, 0x027C }, - { GF_BG_LYR_MAIN_0, 0x11, 0x0C, 0x0E, 0x02, 0x02, 0x0298 }, - { GF_BG_LYR_MAIN_0, 0x01, 0x03, 0x0E, 0x02, 0x02, 0x02B4 }, - { GF_BG_LYR_MAIN_0, 0x01, 0x07, 0x0E, 0x02, 0x02, 0x02D0 }, - { GF_BG_LYR_MAIN_0, 0x01, 0x0B, 0x0E, 0x02, 0x02, 0x02EC }, - { GF_BG_LYR_MAIN_0, 0x01, 0x0F, 0x0E, 0x02, 0x02, 0x0308 }, - { GF_BG_LYR_MAIN_0, 0x1A, 0x14, 0x05, 0x03, 0x02, 0x0324 }, - { GF_BG_LYR_MAIN_0, 0x11, 0x03, 0x0E, 0x02, 0x02, 0x0260 }, - { GF_BG_LYR_MAIN_0, 0x11, 0x07, 0x0E, 0x02, 0x02, 0x027C }, - { GF_BG_LYR_MAIN_0, 0x11, 0x0B, 0x0E, 0x02, 0x02, 0x0298 }, - { GF_BG_LYR_MAIN_0, 0x11, 0x0F, 0x0E, 0x02, 0x02, 0x02B4 }, + {GF_BG_LYR_MAIN_0, 0x11, 0x04, 0x0E, 0x02, 0x02, 0x0260}, + { GF_BG_LYR_MAIN_0, 0x11, 0x08, 0x0E, 0x02, 0x02, 0x027C}, + { GF_BG_LYR_MAIN_0, 0x11, 0x0C, 0x0E, 0x02, 0x02, 0x0298}, + { GF_BG_LYR_MAIN_0, 0x01, 0x03, 0x0E, 0x02, 0x02, 0x02B4}, + { GF_BG_LYR_MAIN_0, 0x01, 0x07, 0x0E, 0x02, 0x02, 0x02D0}, + { GF_BG_LYR_MAIN_0, 0x01, 0x0B, 0x0E, 0x02, 0x02, 0x02EC}, + { GF_BG_LYR_MAIN_0, 0x01, 0x0F, 0x0E, 0x02, 0x02, 0x0308}, + { GF_BG_LYR_MAIN_0, 0x1A, 0x14, 0x05, 0x03, 0x02, 0x0324}, + { GF_BG_LYR_MAIN_0, 0x11, 0x03, 0x0E, 0x02, 0x02, 0x0260}, + { GF_BG_LYR_MAIN_0, 0x11, 0x07, 0x0E, 0x02, 0x02, 0x027C}, + { GF_BG_LYR_MAIN_0, 0x11, 0x0B, 0x0E, 0x02, 0x02, 0x0298}, + { GF_BG_LYR_MAIN_0, 0x11, 0x0F, 0x0E, 0x02, 0x02, 0x02B4}, }; static const u8 sButtonRects[][4] = { - // x, y, width, height - { 0x10, 0x03, 0x10, 0x04 }, - { 0x10, 0x07, 0x10, 0x04 }, - { 0x10, 0x0B, 0x10, 0x04 }, - { 0x00, 0x02, 0x10, 0x04 }, - { 0x00, 0x06, 0x10, 0x04 }, - { 0x00, 0x0A, 0x10, 0x04 }, - { 0x00, 0x0E, 0x10, 0x04 }, - { 0x19, 0x13, 0x07, 0x05 }, - { 0x10, 0x02, 0x10, 0x04 }, - { 0x10, 0x06, 0x10, 0x04 }, - { 0x10, 0x0A, 0x10, 0x04 }, - { 0x10, 0x0E, 0x10, 0x04 }, + // x, y, width, height + {0x10, 0x03, 0x10, 0x04}, + { 0x10, 0x07, 0x10, 0x04}, + { 0x10, 0x0B, 0x10, 0x04}, + { 0x00, 0x02, 0x10, 0x04}, + { 0x00, 0x06, 0x10, 0x04}, + { 0x00, 0x0A, 0x10, 0x04}, + { 0x00, 0x0E, 0x10, 0x04}, + { 0x19, 0x13, 0x07, 0x05}, + { 0x10, 0x02, 0x10, 0x04}, + { 0x10, 0x06, 0x10, 0x04}, + { 0x10, 0x0A, 0x10, 0x04}, + { 0x10, 0x0E, 0x10, 0x04}, }; static const s8 sButtonWindowIDs[][2][8] = { @@ -175,12 +175,12 @@ static const u16 sButtonFrameTileOffsets[] = { // which derives from BufferMonNickname. // they could've just gotten MON_DATA_NICKNAME_STRING static const u16 sMonNicknameMsgIds[][4] = { - { msg_0300_00008, msg_0300_00002, msg_0300_00020, msg_0300_00014 }, - { msg_0300_00009, msg_0300_00003, msg_0300_00021, msg_0300_00015 }, - { msg_0300_00010, msg_0300_00004, msg_0300_00022, msg_0300_00016 }, - { msg_0300_00011, msg_0300_00005, msg_0300_00023, msg_0300_00017 }, - { msg_0300_00012, msg_0300_00006, msg_0300_00024, msg_0300_00018 }, - { msg_0300_00013, msg_0300_00007, msg_0300_00025, msg_0300_00019 }, + {msg_0300_00008, msg_0300_00002, msg_0300_00020, msg_0300_00014}, + { msg_0300_00009, msg_0300_00003, msg_0300_00021, msg_0300_00015}, + { msg_0300_00010, msg_0300_00004, msg_0300_00022, msg_0300_00016}, + { msg_0300_00011, msg_0300_00005, msg_0300_00023, msg_0300_00017}, + { msg_0300_00012, msg_0300_00006, msg_0300_00024, msg_0300_00018}, + { msg_0300_00013, msg_0300_00007, msg_0300_00025, msg_0300_00019}, }; static int sDpadNavParam_ContextMenu[][5][2] = { diff --git a/src/party_menu.c b/src/party_menu.c index 2001dd617d..4e7cb94c82 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -158,47 +158,47 @@ static const UnkStruct_0207A22C _0210150C[2][6] = { }; static const UnkStruct_02020654 _0210140C[8] = { - { 0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01 }, - { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02 }, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x07, 0x03, 0x05 }, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x07, 0x04, 0x07 }, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0x05, 0x00 }, + {0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01}, + { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02}, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x07, 0x03, 0x05}, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x07, 0x04, 0x07}, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0x05, 0x00}, }; static const UnkStruct_02020654 _0210144C[8] = { - { 0x40, 0x19, 0x00, 0x00, 0x04, 0x02, 0x01, 0x01 }, - { 0xC0, 0x19, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00 }, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x03, 0x03 }, - { 0xC0, 0x49, 0x00, 0x00, 0x01, 0x05, 0x02, 0x02 }, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x05, 0x05 }, - { 0xC0, 0x79, 0x00, 0x00, 0x03, 0x07, 0x04, 0x04 }, - { 0xE0, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0xFF, 0xFF }, + {0x40, 0x19, 0x00, 0x00, 0x04, 0x02, 0x01, 0x01}, + { 0xC0, 0x19, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00}, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x03, 0x03}, + { 0xC0, 0x49, 0x00, 0x00, 0x01, 0x05, 0x02, 0x02}, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x05, 0x05}, + { 0xC0, 0x79, 0x00, 0x00, 0x03, 0x07, 0x04, 0x04}, + { 0xE0, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0xFF, 0xFF}, }; static const UnkStruct_02020654 _0210148C[8] = { - { 0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01 }, - { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02 }, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x06, 0x03, 0x05 }, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x06, 0x04, 0x06 }, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x07, 0x05, 0x07 }, - { 0xE0, 0xB8, 0x00, 0x00, 0x06, 0x01, 0x06, 0x00 }, + {0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01}, + { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02}, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x06, 0x03, 0x05}, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x06, 0x04, 0x06}, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x07, 0x05, 0x07}, + { 0xE0, 0xB8, 0x00, 0x00, 0x06, 0x01, 0x06, 0x00}, }; static const UnkStruct_02020654 _021014CC[8] = { - { 0x40, 0x19, 0x00, 0x00, 0x05, 0x02, 0x05, 0x01 }, - { 0xC0, 0x21, 0x00, 0x00, 0x05, 0x03, 0x00, 0x02 }, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x03, 0x05 }, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00 }, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + {0x40, 0x19, 0x00, 0x00, 0x05, 0x02, 0x05, 0x01}, + { 0xC0, 0x21, 0x00, 0x00, 0x05, 0x03, 0x00, 0x02}, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x03, 0x05}, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00}, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, }; static const u16 sFieldMoves[PARTY_MON_CONTEXT_MENU_FIELD_MOVES_COUNT] = { @@ -1298,10 +1298,10 @@ static void sub_0207A89C(PartyMenu *partyMenu) { } static const u8 _021012CC[][6] = { - { 0, 2, 4, 1, 3, 5 }, - { 1, 3, 5, 0, 2, 4 }, - { 4, 2, 0, 5, 3, 1 }, - { 5, 3, 1, 4, 2, 0 }, + {0, 2, 4, 1, 3, 5}, + { 1, 3, 5, 0, 2, 4}, + { 4, 2, 0, 5, 3, 1}, + { 5, 3, 1, 4, 2, 0}, }; static u8 sub_0207A8FC(PartyMenu *partyMenu) { @@ -2134,12 +2134,12 @@ static u8 sub_0207BB88(PartyMenu *partyMenu) { } static const u8 _021012B0[][2] = { - { 1, 3 }, - { 26, 3 }, - { 1, 10 }, - { 26, 10 }, - { 1, 17 }, - { 26, 17 }, + {1, 3 }, + { 26, 3 }, + { 1, 10}, + { 26, 10}, + { 1, 17}, + { 26, 17}, }; static void sub_0207BBFC(u8 a0, s16 *px, s16 *py) { diff --git a/src/pokemon.c b/src/pokemon.c index ba3bb1dc84..230fc84124 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -64,37 +64,37 @@ void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u #define DECRYPT_PTY(mon) MonDecryptSegment(ENCRY_ARGS_PTY(mon)) #define DECRYPT_BOX(boxMon) MonDecryptSegment(ENCRY_ARGS_BOX(boxMon)) #define CHECKSUM(boxMon) CalcMonChecksum((u16 *)(boxMon)->substructs, sizeof((boxMon)->substructs)) -#define SHINY_CHECK(otid, pid) (( \ - ((((otid) & 0xFFFF0000u) >> 16u)) ^ (((otid) & 0xFFFFu)) ^ ((((pid) & 0xFFFF0000u) >> 16u)) ^ (((pid) & 0xFFFFu))) \ +#define SHINY_CHECK(otid, pid) (( \ + (((otid) & 0xFFFF0000u) >> 16u) ^ ((otid) & 0xFFFFu) ^ (((pid) & 0xFFFF0000u) >> 16u) ^ ((pid) & 0xFFFFu)) \ < 8u) #define CALC_UNOWN_LETTER(pid) ((u32)((((pid) & 0x3000000) >> 18) | (((pid) & 0x30000) >> 12) | (((pid) & 0x300) >> 6) | (((pid) & 0x3) >> 0)) % 28u) static const s8 sFlavorPreferencesByNature[NATURE_NUM][FLAVOR_MAX] = { - { 0, 0, 0, 0, 0 }, - { 1, 0, 0, 0, -1 }, - { 1, 0, -1, 0, 0 }, - { 1, -1, 0, 0, 0 }, - { 1, 0, 0, -1, 0 }, - { -1, 0, 0, 0, 1 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, -1, 0, 1 }, - { 0, -1, 0, 0, 1 }, - { 0, 0, 0, -1, 1 }, - { -1, 0, 1, 0, 0 }, - { 0, 0, 1, 0, -1 }, - { 0, 0, 0, 0, 0 }, - { 0, -1, 1, 0, 0 }, - { 0, 0, 1, -1, 0 }, - { -1, 1, 0, 0, 0 }, - { 0, 1, 0, 0, -1 }, - { 0, 1, -1, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 1, 0, -1, 0 }, - { -1, 0, 0, 1, 0 }, - { 0, 0, 0, 1, -1 }, - { 0, 0, -1, 1, 0 }, - { 0, -1, 0, 1, 0 }, - { 0, 0, 0, 0, 0 }, + {0, 0, 0, 0, 0 }, + { 1, 0, 0, 0, -1}, + { 1, 0, -1, 0, 0 }, + { 1, -1, 0, 0, 0 }, + { 1, 0, 0, -1, 0 }, + { -1, 0, 0, 0, 1 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, -1, 0, 1 }, + { 0, -1, 0, 0, 1 }, + { 0, 0, 0, -1, 1 }, + { -1, 0, 1, 0, 0 }, + { 0, 0, 1, 0, -1}, + { 0, 0, 0, 0, 0 }, + { 0, -1, 1, 0, 0 }, + { 0, 0, 1, -1, 0 }, + { -1, 1, 0, 0, 0 }, + { 0, 1, 0, 0, -1}, + { 0, 1, -1, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 1, 0, -1, 0 }, + { -1, 0, 0, 1, 0 }, + { 0, 0, 0, 1, -1}, + { 0, 0, -1, 1, 0 }, + { 0, -1, 0, 1, 0 }, + { 0, 0, 0, 0, 0 }, }; void ZeroMonData(Pokemon *mon) { @@ -1960,31 +1960,31 @@ u8 GetNatureFromPersonality(u32 pid) { } const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS] = { - { 0, 0, 0, 0, 0 }, - { 1, -1, 0, 0, 0 }, - { 1, 0, -1, 0, 0 }, - { 1, 0, 0, -1, 0 }, - { 1, 0, 0, 0, -1 }, - { -1, 1, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 1, -1, 0, 0 }, - { 0, 1, 0, -1, 0 }, - { 0, 1, 0, 0, -1 }, - { -1, 0, 1, 0, 0 }, - { 0, -1, 1, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, 1, -1, 0 }, - { 0, 0, 1, 0, -1 }, - { -1, 0, 0, 1, 0 }, - { 0, -1, 0, 1, 0 }, - { 0, 0, -1, 1, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, 0, 1, -1 }, - { -1, 0, 0, 0, 1 }, - { 0, -1, 0, 0, 1 }, - { 0, 0, -1, 0, 1 }, - { 0, 0, 0, -1, 1 }, - { 0, 0, 0, 0, 0 }, + {0, 0, 0, 0, 0 }, + { 1, -1, 0, 0, 0 }, + { 1, 0, -1, 0, 0 }, + { 1, 0, 0, -1, 0 }, + { 1, 0, 0, 0, -1}, + { -1, 1, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 1, -1, 0, 0 }, + { 0, 1, 0, -1, 0 }, + { 0, 1, 0, 0, -1}, + { -1, 0, 1, 0, 0 }, + { 0, -1, 1, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 1, -1, 0 }, + { 0, 0, 1, 0, -1}, + { -1, 0, 0, 1, 0 }, + { 0, -1, 0, 1, 0 }, + { 0, 0, -1, 1, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 1, -1}, + { -1, 0, 0, 0, 1 }, + { 0, -1, 0, 0, 1 }, + { 0, 0, -1, 0, 1 }, + { 0, 0, 0, -1, 1 }, + { 0, 0, 0, 0, 0 }, }; u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { @@ -2014,16 +2014,16 @@ u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { } static const s8 sFriendshipModTable[FRIENDSHIP_EVENT_NUM][FRIENDSHIP_TIER_NUM] = { - { 5, 3, 2 }, // FRIENDSHIP_EVENT_GROW_LEVEL - { 5, 3, 2 }, // FRIENDSHIP_EVENT_VITAMIN - { 1, 1, 0 }, // FRIENDSHIP_EVENT_BATTLE_ITEM - { 3, 2, 1 }, // FRIENDSHIP_EVENT_LEAGUE_BATTLE - { 1, 1, 0 }, // FRIENDSHIP_EVENT_LEARN_TMHM - { 1, 1, 1 }, // FRIENDSHIP_EVENT_WALKING - { -1, -1, -1 }, // FRIENDSHIP_EVENT_FAINT_SMALL - { -5, -5, -10 }, // FRIENDSHIP_EVENT_HEAL_FIELD_PSN - { -5, -5, -10 }, // FRIENDSHIP_EVENT_FAINT_LARGE - { 3, 2, 1 }, // FRIENDHSIP_EVENT_CONTEST_WIN + {5, 3, 2 }, // FRIENDSHIP_EVENT_GROW_LEVEL + { 5, 3, 2 }, // FRIENDSHIP_EVENT_VITAMIN + { 1, 1, 0 }, // FRIENDSHIP_EVENT_BATTLE_ITEM + { 3, 2, 1 }, // FRIENDSHIP_EVENT_LEAGUE_BATTLE + { 1, 1, 0 }, // FRIENDSHIP_EVENT_LEARN_TMHM + { 1, 1, 1 }, // FRIENDSHIP_EVENT_WALKING + { -1, -1, -1 }, // FRIENDSHIP_EVENT_FAINT_SMALL + { -5, -5, -10}, // FRIENDSHIP_EVENT_HEAL_FIELD_PSN + { -5, -5, -10}, // FRIENDSHIP_EVENT_FAINT_LARGE + { 3, 2, 1 }, // FRIENDHSIP_EVENT_CONTEST_WIN }; void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location) { @@ -2675,7 +2675,7 @@ u8 GetMonPicHeightBySpeciesGenderForm_PBR(u16 species, u8 gender, u8 whichFacing } static const struct UnkTemplate_0200D748 _020FF588 = { - 0, 0, 0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, { 0x4E2F, 0x4E2A, 0x4E27, 0x4E27, -1u, -1u }, + 0, 0, 0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, {0x4E2F, 0x4E2A, 0x4E27, 0x4E27, -1u, -1u}, 2, 1 }; @@ -3733,8 +3733,8 @@ void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u } static const u16 sItemOdds[2][2] = { - { 45, 95 }, - { 20, 80 }, + {45, 95}, + { 20, 80}, }; void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2) { @@ -3949,38 +3949,38 @@ u32 CalcMonChecksum(void *_data, u32 size) { PokemonDataBlock *GetSubstruct(BoxPokemon *boxMon, u32 pid, u8 which) { static const u8 offsets[32][4] = { - { 0x00, 0x20, 0x40, 0x60 }, - { 0x00, 0x20, 0x60, 0x40 }, - { 0x00, 0x40, 0x20, 0x60 }, - { 0x00, 0x60, 0x20, 0x40 }, - { 0x00, 0x40, 0x60, 0x20 }, - { 0x00, 0x60, 0x40, 0x20 }, - { 0x20, 0x00, 0x40, 0x60 }, - { 0x20, 0x00, 0x60, 0x40 }, - { 0x40, 0x00, 0x20, 0x60 }, - { 0x60, 0x00, 0x20, 0x40 }, - { 0x40, 0x00, 0x60, 0x20 }, - { 0x60, 0x00, 0x40, 0x20 }, - { 0x20, 0x40, 0x00, 0x60 }, - { 0x20, 0x60, 0x00, 0x40 }, - { 0x40, 0x20, 0x00, 0x60 }, - { 0x60, 0x20, 0x00, 0x40 }, - { 0x40, 0x60, 0x00, 0x20 }, - { 0x60, 0x40, 0x00, 0x20 }, - { 0x20, 0x40, 0x60, 0x00 }, - { 0x20, 0x60, 0x40, 0x00 }, - { 0x40, 0x20, 0x60, 0x00 }, - { 0x60, 0x20, 0x40, 0x00 }, - { 0x40, 0x60, 0x20, 0x00 }, - { 0x60, 0x40, 0x20, 0x00 }, - { 0x00, 0x20, 0x40, 0x60 }, - { 0x00, 0x20, 0x60, 0x40 }, - { 0x00, 0x40, 0x20, 0x60 }, - { 0x00, 0x60, 0x20, 0x40 }, - { 0x00, 0x40, 0x60, 0x20 }, - { 0x00, 0x60, 0x40, 0x20 }, - { 0x20, 0x00, 0x40, 0x60 }, - { 0x20, 0x00, 0x60, 0x40 }, + {0x00, 0x20, 0x40, 0x60}, + { 0x00, 0x20, 0x60, 0x40}, + { 0x00, 0x40, 0x20, 0x60}, + { 0x00, 0x60, 0x20, 0x40}, + { 0x00, 0x40, 0x60, 0x20}, + { 0x00, 0x60, 0x40, 0x20}, + { 0x20, 0x00, 0x40, 0x60}, + { 0x20, 0x00, 0x60, 0x40}, + { 0x40, 0x00, 0x20, 0x60}, + { 0x60, 0x00, 0x20, 0x40}, + { 0x40, 0x00, 0x60, 0x20}, + { 0x60, 0x00, 0x40, 0x20}, + { 0x20, 0x40, 0x00, 0x60}, + { 0x20, 0x60, 0x00, 0x40}, + { 0x40, 0x20, 0x00, 0x60}, + { 0x60, 0x20, 0x00, 0x40}, + { 0x40, 0x60, 0x00, 0x20}, + { 0x60, 0x40, 0x00, 0x20}, + { 0x20, 0x40, 0x60, 0x00}, + { 0x20, 0x60, 0x40, 0x00}, + { 0x40, 0x20, 0x60, 0x00}, + { 0x60, 0x20, 0x40, 0x00}, + { 0x40, 0x60, 0x20, 0x00}, + { 0x60, 0x40, 0x20, 0x00}, + { 0x00, 0x20, 0x40, 0x60}, + { 0x00, 0x20, 0x60, 0x40}, + { 0x00, 0x40, 0x20, 0x60}, + { 0x00, 0x60, 0x20, 0x40}, + { 0x00, 0x40, 0x60, 0x20}, + { 0x00, 0x60, 0x40, 0x20}, + { 0x20, 0x00, 0x40, 0x60}, + { 0x20, 0x00, 0x60, 0x40}, }; pid = ((pid & 0x3E000) >> 13); @@ -4938,31 +4938,31 @@ static const u16 sPokeathlonPerformanceArcIdxs[] = { }; static const s8 sPokeathlonPerformanceNatureMods[NATURE_NUM][5] = { - { 10, 0, 0, 0, -10 }, - { 35, -35, 0, 0, 0 }, - { 35, 0, 0, 0, -35 }, - { 35, 0, 0, -35, 0 }, - { 35, 0, -35, 0, 0 }, - { -35, 35, 0, 0, 0 }, - { 0, 10, 0, -10, 0 }, - { 0, 35, 0, 0, -35 }, - { 0, 35, 0, -35, 0 }, - { 0, 35, -35, 0, 0 }, - { -35, 0, 0, 0, 35 }, - { 0, -35, 0, 0, 35 }, - { 0, 0, -10, 0, 10 }, - { 0, 0, 0, -35, 35 }, - { 0, 0, -35, 0, 35 }, - { -35, 0, 0, 35, 0 }, - { 0, -35, 0, 35, 0 }, - { 0, 0, 0, 35, -35 }, - { -10, 0, 0, 10, 0 }, - { 0, 0, -35, 35, 0 }, - { -35, 0, 35, 0, 0 }, - { 0, -35, 35, 0, 0 }, - { 0, 0, 35, 0, -35 }, - { 0, 0, 35, -35, 0 }, - { 0, -10, 10, 0, 0 }, + {10, 0, 0, 0, -10}, + { 35, -35, 0, 0, 0 }, + { 35, 0, 0, 0, -35}, + { 35, 0, 0, -35, 0 }, + { 35, 0, -35, 0, 0 }, + { -35, 35, 0, 0, 0 }, + { 0, 10, 0, -10, 0 }, + { 0, 35, 0, 0, -35}, + { 0, 35, 0, -35, 0 }, + { 0, 35, -35, 0, 0 }, + { -35, 0, 0, 0, 35 }, + { 0, -35, 0, 0, 35 }, + { 0, 0, -10, 0, 10 }, + { 0, 0, 0, -35, 35 }, + { 0, 0, -35, 0, 35 }, + { -35, 0, 0, 35, 0 }, + { 0, -35, 0, 35, 0 }, + { 0, 0, 0, 35, -35}, + { -10, 0, 0, 10, 0 }, + { 0, 0, -35, 35, 0 }, + { -35, 0, 35, 0, 0 }, + { 0, -35, 35, 0, 0 }, + { 0, 0, 35, 0, -35}, + { 0, 0, 35, -35, 0 }, + { 0, -10, 10, 0, 0 }, }; void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest) { diff --git a/src/pokepic.c b/src/pokepic.c index 79e5c6853f..f026eb5cfc 100644 --- a/src/pokepic.c +++ b/src/pokepic.c @@ -20,248 +20,248 @@ static void UnscanPokepic_PtHGSS(u8 *pRawCharData); static void UnscanPokepic_DP(u8 *pRawCharData); static const u8 sSpindaSpot1Coords[][2] = { - { 0x1B, 0x0F }, - { 0x1C, 0x0F }, - { 0x1D, 0x0F }, - { 0x1E, 0x0F }, - { 0x1A, 0x10 }, - { 0x1B, 0x10 }, - { 0x1C, 0x10 }, - { 0x1D, 0x10 }, - { 0x1E, 0x10 }, - { 0x1F, 0x10 }, - { 0x19, 0x11 }, - { 0x1A, 0x11 }, - { 0x1B, 0x11 }, - { 0x1C, 0x11 }, - { 0x1D, 0x11 }, - { 0x1E, 0x11 }, - { 0x1F, 0x11 }, - { 0x20, 0x11 }, - { 0x19, 0x12 }, - { 0x1A, 0x12 }, - { 0x1B, 0x12 }, - { 0x1C, 0x12 }, - { 0x1D, 0x12 }, - { 0x1E, 0x12 }, - { 0x1F, 0x12 }, - { 0x20, 0x12 }, - { 0x19, 0x13 }, - { 0x1A, 0x13 }, - { 0x1B, 0x13 }, - { 0x1C, 0x13 }, - { 0x1D, 0x13 }, - { 0x1E, 0x13 }, - { 0x1F, 0x13 }, - { 0x20, 0x13 }, - { 0x19, 0x14 }, - { 0x1A, 0x14 }, - { 0x1B, 0x14 }, - { 0x1C, 0x14 }, - { 0x1D, 0x14 }, - { 0x1E, 0x14 }, - { 0x1F, 0x14 }, - { 0x20, 0x14 }, - { 0x1A, 0x15 }, - { 0x1B, 0x15 }, - { 0x1C, 0x15 }, - { 0x1D, 0x15 }, - { 0x1E, 0x15 }, - { 0x1F, 0x15 }, - { 0x1B, 0x16 }, - { 0x1C, 0x16 }, - { 0x1D, 0x16 }, - { 0x1E, 0x16 }, - { 0xFF, 0xFF }, + {0x1B, 0x0F}, + { 0x1C, 0x0F}, + { 0x1D, 0x0F}, + { 0x1E, 0x0F}, + { 0x1A, 0x10}, + { 0x1B, 0x10}, + { 0x1C, 0x10}, + { 0x1D, 0x10}, + { 0x1E, 0x10}, + { 0x1F, 0x10}, + { 0x19, 0x11}, + { 0x1A, 0x11}, + { 0x1B, 0x11}, + { 0x1C, 0x11}, + { 0x1D, 0x11}, + { 0x1E, 0x11}, + { 0x1F, 0x11}, + { 0x20, 0x11}, + { 0x19, 0x12}, + { 0x1A, 0x12}, + { 0x1B, 0x12}, + { 0x1C, 0x12}, + { 0x1D, 0x12}, + { 0x1E, 0x12}, + { 0x1F, 0x12}, + { 0x20, 0x12}, + { 0x19, 0x13}, + { 0x1A, 0x13}, + { 0x1B, 0x13}, + { 0x1C, 0x13}, + { 0x1D, 0x13}, + { 0x1E, 0x13}, + { 0x1F, 0x13}, + { 0x20, 0x13}, + { 0x19, 0x14}, + { 0x1A, 0x14}, + { 0x1B, 0x14}, + { 0x1C, 0x14}, + { 0x1D, 0x14}, + { 0x1E, 0x14}, + { 0x1F, 0x14}, + { 0x20, 0x14}, + { 0x1A, 0x15}, + { 0x1B, 0x15}, + { 0x1C, 0x15}, + { 0x1D, 0x15}, + { 0x1E, 0x15}, + { 0x1F, 0x15}, + { 0x1B, 0x16}, + { 0x1C, 0x16}, + { 0x1D, 0x16}, + { 0x1E, 0x16}, + { 0xFF, 0xFF}, }; static const u8 sSpindaSpot2Coords[][2] = { - { 0x33, 0x11 }, - { 0x34, 0x11 }, - { 0x35, 0x11 }, - { 0x36, 0x11 }, - { 0x32, 0x12 }, - { 0x33, 0x12 }, - { 0x34, 0x12 }, - { 0x35, 0x12 }, - { 0x36, 0x12 }, - { 0x37, 0x12 }, - { 0x31, 0x13 }, - { 0x32, 0x13 }, - { 0x33, 0x13 }, - { 0x34, 0x13 }, - { 0x35, 0x13 }, - { 0x36, 0x13 }, - { 0x37, 0x13 }, - { 0x38, 0x13 }, - { 0x31, 0x14 }, - { 0x32, 0x14 }, - { 0x33, 0x14 }, - { 0x34, 0x14 }, - { 0x35, 0x14 }, - { 0x36, 0x14 }, - { 0x37, 0x14 }, - { 0x38, 0x14 }, - { 0x31, 0x15 }, - { 0x32, 0x15 }, - { 0x33, 0x15 }, - { 0x34, 0x15 }, - { 0x35, 0x15 }, - { 0x36, 0x15 }, - { 0x37, 0x15 }, - { 0x38, 0x15 }, - { 0x31, 0x16 }, - { 0x32, 0x16 }, - { 0x33, 0x16 }, - { 0x34, 0x16 }, - { 0x35, 0x16 }, - { 0x36, 0x16 }, - { 0x37, 0x16 }, - { 0x38, 0x16 }, - { 0x32, 0x17 }, - { 0x33, 0x17 }, - { 0x34, 0x17 }, - { 0x35, 0x17 }, - { 0x36, 0x17 }, - { 0x37, 0x17 }, - { 0x33, 0x18 }, - { 0x34, 0x18 }, - { 0x35, 0x18 }, - { 0x36, 0x18 }, - { 0xFF, 0xFF }, + {0x33, 0x11}, + { 0x34, 0x11}, + { 0x35, 0x11}, + { 0x36, 0x11}, + { 0x32, 0x12}, + { 0x33, 0x12}, + { 0x34, 0x12}, + { 0x35, 0x12}, + { 0x36, 0x12}, + { 0x37, 0x12}, + { 0x31, 0x13}, + { 0x32, 0x13}, + { 0x33, 0x13}, + { 0x34, 0x13}, + { 0x35, 0x13}, + { 0x36, 0x13}, + { 0x37, 0x13}, + { 0x38, 0x13}, + { 0x31, 0x14}, + { 0x32, 0x14}, + { 0x33, 0x14}, + { 0x34, 0x14}, + { 0x35, 0x14}, + { 0x36, 0x14}, + { 0x37, 0x14}, + { 0x38, 0x14}, + { 0x31, 0x15}, + { 0x32, 0x15}, + { 0x33, 0x15}, + { 0x34, 0x15}, + { 0x35, 0x15}, + { 0x36, 0x15}, + { 0x37, 0x15}, + { 0x38, 0x15}, + { 0x31, 0x16}, + { 0x32, 0x16}, + { 0x33, 0x16}, + { 0x34, 0x16}, + { 0x35, 0x16}, + { 0x36, 0x16}, + { 0x37, 0x16}, + { 0x38, 0x16}, + { 0x32, 0x17}, + { 0x33, 0x17}, + { 0x34, 0x17}, + { 0x35, 0x17}, + { 0x36, 0x17}, + { 0x37, 0x17}, + { 0x33, 0x18}, + { 0x34, 0x18}, + { 0x35, 0x18}, + { 0x36, 0x18}, + { 0xFF, 0xFF}, }; static const u8 sSpindaSpot3Coords[][2] = { - { 0x1E, 0x21 }, - { 0x1F, 0x21 }, - { 0x20, 0x21 }, - { 0x1D, 0x22 }, - { 0x1E, 0x22 }, - { 0x1F, 0x22 }, - { 0x20, 0x22 }, - { 0x21, 0x22 }, - { 0x1C, 0x23 }, - { 0x1D, 0x23 }, - { 0x1E, 0x23 }, - { 0x1F, 0x23 }, - { 0x20, 0x23 }, - { 0x21, 0x23 }, - { 0x22, 0x23 }, - { 0x1C, 0x24 }, - { 0x1D, 0x24 }, - { 0x1E, 0x24 }, - { 0x1F, 0x24 }, - { 0x20, 0x24 }, - { 0x21, 0x24 }, - { 0x22, 0x24 }, - { 0x1C, 0x25 }, - { 0x1D, 0x25 }, - { 0x1E, 0x25 }, - { 0x1F, 0x25 }, - { 0x20, 0x25 }, - { 0x21, 0x25 }, - { 0x22, 0x25 }, - { 0x1C, 0x26 }, - { 0x1D, 0x26 }, - { 0x1E, 0x26 }, - { 0x1F, 0x26 }, - { 0x20, 0x26 }, - { 0x21, 0x26 }, - { 0x22, 0x26 }, - { 0x1C, 0x27 }, - { 0x1D, 0x27 }, - { 0x1E, 0x27 }, - { 0x1F, 0x27 }, - { 0x20, 0x27 }, - { 0x21, 0x27 }, - { 0x22, 0x27 }, - { 0x1D, 0x28 }, - { 0x1E, 0x28 }, - { 0x1F, 0x28 }, - { 0x20, 0x28 }, - { 0x21, 0x28 }, - { 0x1E, 0x29 }, - { 0x1F, 0x29 }, - { 0x20, 0x29 }, - { 0xFF, 0xFF }, + {0x1E, 0x21}, + { 0x1F, 0x21}, + { 0x20, 0x21}, + { 0x1D, 0x22}, + { 0x1E, 0x22}, + { 0x1F, 0x22}, + { 0x20, 0x22}, + { 0x21, 0x22}, + { 0x1C, 0x23}, + { 0x1D, 0x23}, + { 0x1E, 0x23}, + { 0x1F, 0x23}, + { 0x20, 0x23}, + { 0x21, 0x23}, + { 0x22, 0x23}, + { 0x1C, 0x24}, + { 0x1D, 0x24}, + { 0x1E, 0x24}, + { 0x1F, 0x24}, + { 0x20, 0x24}, + { 0x21, 0x24}, + { 0x22, 0x24}, + { 0x1C, 0x25}, + { 0x1D, 0x25}, + { 0x1E, 0x25}, + { 0x1F, 0x25}, + { 0x20, 0x25}, + { 0x21, 0x25}, + { 0x22, 0x25}, + { 0x1C, 0x26}, + { 0x1D, 0x26}, + { 0x1E, 0x26}, + { 0x1F, 0x26}, + { 0x20, 0x26}, + { 0x21, 0x26}, + { 0x22, 0x26}, + { 0x1C, 0x27}, + { 0x1D, 0x27}, + { 0x1E, 0x27}, + { 0x1F, 0x27}, + { 0x20, 0x27}, + { 0x21, 0x27}, + { 0x22, 0x27}, + { 0x1D, 0x28}, + { 0x1E, 0x28}, + { 0x1F, 0x28}, + { 0x20, 0x28}, + { 0x21, 0x28}, + { 0x1E, 0x29}, + { 0x1F, 0x29}, + { 0x20, 0x29}, + { 0xFF, 0xFF}, }; static const u8 sSpindaSpot4Coords[][2] = { - { 0x2B, 0x21 }, - { 0x2C, 0x21 }, - { 0x2D, 0x21 }, - { 0x29, 0x22 }, - { 0x2A, 0x22 }, - { 0x2B, 0x22 }, - { 0x2C, 0x22 }, - { 0x2D, 0x22 }, - { 0x2E, 0x22 }, - { 0x2F, 0x22 }, - { 0x28, 0x23 }, - { 0x29, 0x23 }, - { 0x2A, 0x23 }, - { 0x2B, 0x23 }, - { 0x2C, 0x23 }, - { 0x2D, 0x23 }, - { 0x2E, 0x23 }, - { 0x2F, 0x23 }, - { 0x30, 0x23 }, - { 0x28, 0x24 }, - { 0x29, 0x24 }, - { 0x2A, 0x24 }, - { 0x2B, 0x24 }, - { 0x2C, 0x24 }, - { 0x2D, 0x24 }, - { 0x2E, 0x24 }, - { 0x2F, 0x24 }, - { 0x30, 0x24 }, - { 0x28, 0x25 }, - { 0x29, 0x25 }, - { 0x2A, 0x25 }, - { 0x2B, 0x25 }, - { 0x2C, 0x25 }, - { 0x2D, 0x25 }, - { 0x2E, 0x25 }, - { 0x2F, 0x25 }, - { 0x30, 0x25 }, - { 0x28, 0x26 }, - { 0x29, 0x26 }, - { 0x2A, 0x26 }, - { 0x2B, 0x26 }, - { 0x2C, 0x26 }, - { 0x2D, 0x26 }, - { 0x2E, 0x26 }, - { 0x2F, 0x26 }, - { 0x30, 0x26 }, - { 0x28, 0x27 }, - { 0x29, 0x27 }, - { 0x2A, 0x27 }, - { 0x2B, 0x27 }, - { 0x2C, 0x27 }, - { 0x2D, 0x27 }, - { 0x2E, 0x27 }, - { 0x2F, 0x27 }, - { 0x30, 0x27 }, - { 0x28, 0x28 }, - { 0x29, 0x28 }, - { 0x2A, 0x28 }, - { 0x2B, 0x28 }, - { 0x2C, 0x28 }, - { 0x2D, 0x28 }, - { 0x2E, 0x28 }, - { 0x2F, 0x28 }, - { 0x30, 0x28 }, - { 0x29, 0x29 }, - { 0x2A, 0x29 }, - { 0x2B, 0x29 }, - { 0x2C, 0x29 }, - { 0x2D, 0x29 }, - { 0x2E, 0x29 }, - { 0x2F, 0x29 }, - { 0x2B, 0x2A }, - { 0x2C, 0x2A }, - { 0x2D, 0x2A }, - { 0xFF, 0xFF }, + {0x2B, 0x21}, + { 0x2C, 0x21}, + { 0x2D, 0x21}, + { 0x29, 0x22}, + { 0x2A, 0x22}, + { 0x2B, 0x22}, + { 0x2C, 0x22}, + { 0x2D, 0x22}, + { 0x2E, 0x22}, + { 0x2F, 0x22}, + { 0x28, 0x23}, + { 0x29, 0x23}, + { 0x2A, 0x23}, + { 0x2B, 0x23}, + { 0x2C, 0x23}, + { 0x2D, 0x23}, + { 0x2E, 0x23}, + { 0x2F, 0x23}, + { 0x30, 0x23}, + { 0x28, 0x24}, + { 0x29, 0x24}, + { 0x2A, 0x24}, + { 0x2B, 0x24}, + { 0x2C, 0x24}, + { 0x2D, 0x24}, + { 0x2E, 0x24}, + { 0x2F, 0x24}, + { 0x30, 0x24}, + { 0x28, 0x25}, + { 0x29, 0x25}, + { 0x2A, 0x25}, + { 0x2B, 0x25}, + { 0x2C, 0x25}, + { 0x2D, 0x25}, + { 0x2E, 0x25}, + { 0x2F, 0x25}, + { 0x30, 0x25}, + { 0x28, 0x26}, + { 0x29, 0x26}, + { 0x2A, 0x26}, + { 0x2B, 0x26}, + { 0x2C, 0x26}, + { 0x2D, 0x26}, + { 0x2E, 0x26}, + { 0x2F, 0x26}, + { 0x30, 0x26}, + { 0x28, 0x27}, + { 0x29, 0x27}, + { 0x2A, 0x27}, + { 0x2B, 0x27}, + { 0x2C, 0x27}, + { 0x2D, 0x27}, + { 0x2E, 0x27}, + { 0x2F, 0x27}, + { 0x30, 0x27}, + { 0x28, 0x28}, + { 0x29, 0x28}, + { 0x2A, 0x28}, + { 0x2B, 0x28}, + { 0x2C, 0x28}, + { 0x2D, 0x28}, + { 0x2E, 0x28}, + { 0x2F, 0x28}, + { 0x30, 0x28}, + { 0x29, 0x29}, + { 0x2A, 0x29}, + { 0x2B, 0x29}, + { 0x2C, 0x29}, + { 0x2D, 0x29}, + { 0x2E, 0x29}, + { 0x2F, 0x29}, + { 0x2B, 0x2A}, + { 0x2C, 0x2A}, + { 0x2D, 0x2A}, + { 0xFF, 0xFF}, }; static const u8 (*sSpindaSpotsCoordsPtrs[4])[2] = { @@ -291,10 +291,10 @@ static const int sPokepicUVParams[4][2][4] = { }; static const int sPokepicShadowUVParams[4][4] = { - { 0xA0, 0xA0, 0xE0, 0xB0 }, - { 0xA0, 0xA0, 0xE0, 0xB0 }, - { 0xA0, 0xB0, 0xE0, 0xC0 }, - { 0xA0, 0xC0, 0xE0, 0xD0 }, + {0xA0, 0xA0, 0xE0, 0xB0}, + { 0xA0, 0xA0, 0xE0, 0xB0}, + { 0xA0, 0xB0, 0xE0, 0xC0}, + { 0xA0, 0xC0, 0xE0, 0xD0}, }; PokepicManager *PokepicManager_Create(HeapID heapId) { diff --git a/src/register_hall_of_fame.c b/src/register_hall_of_fame.c index 2abf73f323..2b4f9efa30 100644 --- a/src/register_hall_of_fame.c +++ b/src/register_hall_of_fame.c @@ -766,33 +766,33 @@ static const WindowTemplate sIndivMonsSceneWindowTemplates[7] = { }; static const RegHOFSpritePosScaleAnimParam sPicPosScaleAnimParams[27] = { - { 168, -40, 96, 120, 1.0f, 1.0f }, - { -92, 88, 160, 120, 1.0f, 1.0f }, - { 348, 88, 56, 104, 1.0f, 1.0f }, - { 88, -40, 200, 104, 1.0f, 1.0f }, - { 336, 0, 40, 80, 1.0f, 1.0f }, - { -80, 0, 216, 80, 1.0f, 1.0f }, - { 93, 110, 99, 110, 1.0f, 1.0f }, - { 157, 110, 163, 110, 1.0f, 1.0f }, - { 53, 96, 59, 96, 1.0f, 1.0f }, - { 197, 96, 203, 96, 1.0f, 1.0f }, - { 37, 72, 43, 72, 1.0f, 1.0f }, - { 213, 72, 219, 72, 1.0f, 1.0f }, - { 125, 120, 131, 120, 1.0f, 1.0f }, - { 96, 120, 108, 100, 1.0f, 0.8f }, - { 160, 120, 148, 100, 1.0f, 0.8f }, - { 56, 104, 84, 90, 1.0f, 0.75f }, - { 200, 104, 170, 90, 1.0f, 0.75f }, - { 40, 80, 64, 75, 1.0f, 0.7f }, - { 216, 80, 190, 75, 1.0f, 0.7f }, - { 128, 128, 128, 120, 1.0f, 0.7f }, - { 96, 90, 108, 100, 1.0f, 0.9f }, - { 160, 90, 148, 100, 1.0f, 0.9f }, - { 56, 80, 84, 90, 1.0f, 0.8f }, - { 200, 80, 170, 90, 1.0f, 0.8f }, - { 40, 60, 64, 75, 1.0f, 0.75f }, - { 216, 60, 190, 75, 1.0f, 0.75f }, - { 128, 100, 128, 120, 1.0f, 0.8f }, + {168, -40, 96, 120, 1.0f, 1.0f }, + { -92, 88, 160, 120, 1.0f, 1.0f }, + { 348, 88, 56, 104, 1.0f, 1.0f }, + { 88, -40, 200, 104, 1.0f, 1.0f }, + { 336, 0, 40, 80, 1.0f, 1.0f }, + { -80, 0, 216, 80, 1.0f, 1.0f }, + { 93, 110, 99, 110, 1.0f, 1.0f }, + { 157, 110, 163, 110, 1.0f, 1.0f }, + { 53, 96, 59, 96, 1.0f, 1.0f }, + { 197, 96, 203, 96, 1.0f, 1.0f }, + { 37, 72, 43, 72, 1.0f, 1.0f }, + { 213, 72, 219, 72, 1.0f, 1.0f }, + { 125, 120, 131, 120, 1.0f, 1.0f }, + { 96, 120, 108, 100, 1.0f, 0.8f }, + { 160, 120, 148, 100, 1.0f, 0.8f }, + { 56, 104, 84, 90, 1.0f, 0.75f}, + { 200, 104, 170, 90, 1.0f, 0.75f}, + { 40, 80, 64, 75, 1.0f, 0.7f }, + { 216, 80, 190, 75, 1.0f, 0.7f }, + { 128, 128, 128, 120, 1.0f, 0.7f }, + { 96, 90, 108, 100, 1.0f, 0.9f }, + { 160, 90, 148, 100, 1.0f, 0.9f }, + { 56, 80, 84, 90, 1.0f, 0.8f }, + { 200, 80, 170, 90, 1.0f, 0.8f }, + { 40, 60, 64, 75, 1.0f, 0.75f}, + { 216, 60, 190, 75, 1.0f, 0.75f}, + { 128, 100, 128, 120, 1.0f, 0.8f }, }; static const UnkTemplate_0200D748 sPicTemplates[21] = { @@ -812,27 +812,27 @@ static const UnkTemplate_0200D748 sPicTemplates[21] = { [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, - .vramTransfer = 0 }, - [1] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 1, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [2] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 2, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [3] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 3, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [4] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 4, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55518, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [5] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 5, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55519, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [6] = { .x = 168, .y = -40, .z = 0, .animation = 0, .spritePriority = 20, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55512, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [7] = { .x = -92, .y = 88, .z = 0, .animation = 0, .spritePriority = 21, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [8] = { .x = 348, .y = 88, .z = 0, .animation = 0, .spritePriority = 22, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [9] = { .x = 88, .y = -40, .z = 0, .animation = 0, .spritePriority = 23, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [10] = { .x = 336, .y = 0, .z = 0, .animation = 0, .spritePriority = 24, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55516, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [11] = { .x = -80, .y = 0, .z = 0, .animation = 0, .spritePriority = 25, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55517, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [12] = { .x = 93, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [13] = { .x = 157, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [14] = { .x = 53, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [15] = { .x = 197, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [16] = { .x = 37, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [17] = { .x = 213, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [18] = { .x = 128, .y = 128, .z = 0, .animation = 0, .spritePriority = 10, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55520, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, - [19] = { .x = 125, .y = 120, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, - [20] = { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55520, [GF_GFX_RES_TYPE_PLTT] = 55522, [GF_GFX_RES_TYPE_CELL] = 55515, [GF_GFX_RES_TYPE_ANIM] = 55515, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 } + .vramTransfer = 0 }, + [1] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 1, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [2] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 2, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [3] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 3, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [4] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 4, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55518, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [5] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 5, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55519, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [6] = { .x = 168, .y = -40, .z = 0, .animation = 0, .spritePriority = 20, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55512, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [7] = { .x = -92, .y = 88, .z = 0, .animation = 0, .spritePriority = 21, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [8] = { .x = 348, .y = 88, .z = 0, .animation = 0, .spritePriority = 22, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [9] = { .x = 88, .y = -40, .z = 0, .animation = 0, .spritePriority = 23, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [10] = { .x = 336, .y = 0, .z = 0, .animation = 0, .spritePriority = 24, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55516, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [11] = { .x = -80, .y = 0, .z = 0, .animation = 0, .spritePriority = 25, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55517, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [12] = { .x = 93, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [13] = { .x = 157, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [14] = { .x = 53, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [15] = { .x = 197, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [16] = { .x = 37, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [17] = { .x = 213, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [18] = { .x = 128, .y = 128, .z = 0, .animation = 0, .spritePriority = 10, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55520, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, + [19] = { .x = 125, .y = 120, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, + [20] = { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55520, [GF_GFX_RES_TYPE_PLTT] = 55522, [GF_GFX_RES_TYPE_CELL] = 55515, [GF_GFX_RES_TYPE_ANIM] = 55515, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0} }; BOOL RegisterHallOfFame_Init(OVY_MANAGER *man, int *state) { diff --git a/src/ribbon.c b/src/ribbon.c index c4c084643f..2cd9d19bf6 100644 --- a/src/ribbon.c +++ b/src/ribbon.c @@ -27,86 +27,86 @@ struct RibbonData { }; static const struct RibbonData sRibbonInfo[] = { - { MON_DATA_HOENN_CHAMPION_RIBBON, 72, 0, msg_0424_00000, RIBBON_DESC(FALSE, msg_0424_00080) }, - { MON_DATA_HOENN_COOL_RIBBON, 73, 0, msg_0424_00001, RIBBON_DESC(FALSE, msg_0424_00081) }, - { MON_DATA_HOENN_COOL_RIBBON_SUPER, 74, 0, msg_0424_00002, RIBBON_DESC(FALSE, msg_0424_00082) }, - { MON_DATA_HOENN_COOL_RIBBON_HYPER, 75, 0, msg_0424_00003, RIBBON_DESC(FALSE, msg_0424_00083) }, - { MON_DATA_HOENN_COOL_RIBBON_MASTER, 76, 0, msg_0424_00004, RIBBON_DESC(FALSE, msg_0424_00084) }, - { MON_DATA_HOENN_BEAUTY_RIBBON, 73, 1, msg_0424_00005, RIBBON_DESC(FALSE, msg_0424_00085) }, - { MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, 74, 1, msg_0424_00006, RIBBON_DESC(FALSE, msg_0424_00086) }, - { MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, 75, 1, msg_0424_00007, RIBBON_DESC(FALSE, msg_0424_00087) }, - { MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, 76, 1, msg_0424_00008, RIBBON_DESC(FALSE, msg_0424_00088) }, - { MON_DATA_HOENN_CUTE_RIBBON, 73, 2, msg_0424_00009, RIBBON_DESC(FALSE, msg_0424_00089) }, - { MON_DATA_HOENN_CUTE_RIBBON_SUPER, 74, 2, msg_0424_00010, RIBBON_DESC(FALSE, msg_0424_00090) }, - { MON_DATA_HOENN_CUTE_RIBBON_HYPER, 75, 2, msg_0424_00011, RIBBON_DESC(FALSE, msg_0424_00091) }, - { MON_DATA_HOENN_CUTE_RIBBON_MASTER, 76, 2, msg_0424_00012, RIBBON_DESC(FALSE, msg_0424_00092) }, - { MON_DATA_HOENN_SMART_RIBBON, 73, 3, msg_0424_00013, RIBBON_DESC(FALSE, msg_0424_00093) }, - { MON_DATA_HOENN_SMART_RIBBON_SUPER, 74, 3, msg_0424_00014, RIBBON_DESC(FALSE, msg_0424_00094) }, - { MON_DATA_HOENN_SMART_RIBBON_HYPER, 75, 3, msg_0424_00015, RIBBON_DESC(FALSE, msg_0424_00095) }, - { MON_DATA_HOENN_SMART_RIBBON_MASTER, 76, 3, msg_0424_00016, RIBBON_DESC(FALSE, msg_0424_00096) }, - { MON_DATA_HOENN_TOUGH_RIBBON, 73, 4, msg_0424_00017, RIBBON_DESC(FALSE, msg_0424_00097) }, - { MON_DATA_HOENN_TOUGH_RIBBON_SUPER, 74, 4, msg_0424_00018, RIBBON_DESC(FALSE, msg_0424_00098) }, - { MON_DATA_HOENN_TOUGH_RIBBON_HYPER, 75, 4, msg_0424_00019, RIBBON_DESC(FALSE, msg_0424_00099) }, - { MON_DATA_HOENN_TOUGH_RIBBON_MASTER, 76, 4, msg_0424_00020, RIBBON_DESC(FALSE, msg_0424_00100) }, - { MON_DATA_HOENN_WINNING_RIBBON, 78, 0, msg_0424_00021, RIBBON_DESC(FALSE, msg_0424_00101) }, - { MON_DATA_HOENN_VICTORY_RIBBON, 77, 0, msg_0424_00022, RIBBON_DESC(FALSE, msg_0424_00102) }, - { MON_DATA_HOENN_ARTIST_RIBBON, 79, 1, msg_0424_00023, RIBBON_DESC(FALSE, msg_0424_00103) }, - { MON_DATA_HOENN_EFFORT_RIBBON, 80, 2, msg_0424_00024, RIBBON_DESC(FALSE, msg_0424_00104) }, - { MON_DATA_HOENN_MARINE_RIBBON, 81, 1, msg_0424_00025, RIBBON_DESC(TRUE, 0) }, - { MON_DATA_HOENN_LAND_RIBBON, 81, 3, msg_0424_00026, RIBBON_DESC(TRUE, 1) }, - { MON_DATA_HOENN_SKY_RIBBON, 81, 4, msg_0424_00027, RIBBON_DESC(TRUE, 2) }, - { MON_DATA_HOENN_COUNTRY_RIBBON, 82, 3, msg_0424_00028, RIBBON_DESC(FALSE, msg_0424_00178) }, - { MON_DATA_HOENN_NATIONAL_RIBBON, 82, 4, msg_0424_00029, RIBBON_DESC(FALSE, msg_0424_00190) }, - { MON_DATA_HOENN_EARTH_RIBBON, 83, 0, msg_0424_00030, RIBBON_DESC(FALSE, msg_0424_00191) }, - { MON_DATA_HOENN_WORLD_RIBBON, 83, 1, msg_0424_00031, RIBBON_DESC(FALSE, msg_0424_00178) }, - { MON_DATA_SINNOH_CHAMP_RIBBON, 88, 0, msg_0424_00032, RIBBON_DESC(FALSE, msg_0424_00105) }, - { MON_DATA_COOL_RIBBON, 89, 0, msg_0424_00033, RIBBON_DESC(FALSE, msg_0424_00106) }, - { MON_DATA_COOL_RIBBON_GREAT, 90, 0, msg_0424_00034, RIBBON_DESC(FALSE, msg_0424_00107) }, - { MON_DATA_COOL_RIBBON_ULTRA, 91, 0, msg_0424_00035, RIBBON_DESC(FALSE, msg_0424_00108) }, - { MON_DATA_COOL_RIBBON_MASTER, 92, 0, msg_0424_00036, RIBBON_DESC(FALSE, msg_0424_00109) }, - { MON_DATA_BEAUTY_RIBBON, 89, 1, msg_0424_00037, RIBBON_DESC(FALSE, msg_0424_00110) }, - { MON_DATA_BEAUTY_RIBBON_GREAT, 90, 1, msg_0424_00038, RIBBON_DESC(FALSE, msg_0424_00111) }, - { MON_DATA_BEAUTY_RIBBON_ULTRA, 91, 1, msg_0424_00039, RIBBON_DESC(FALSE, msg_0424_00112) }, - { MON_DATA_BEAUTY_RIBBON_MASTER, 92, 1, msg_0424_00040, RIBBON_DESC(FALSE, msg_0424_00113) }, - { MON_DATA_CUTE_RIBBON, 89, 2, msg_0424_00041, RIBBON_DESC(FALSE, msg_0424_00114) }, - { MON_DATA_CUTE_RIBBON_GREAT, 90, 2, msg_0424_00042, RIBBON_DESC(FALSE, msg_0424_00115) }, - { MON_DATA_CUTE_RIBBON_ULTRA, 91, 2, msg_0424_00043, RIBBON_DESC(FALSE, msg_0424_00116) }, - { MON_DATA_CUTE_RIBBON_MASTER, 92, 2, msg_0424_00044, RIBBON_DESC(FALSE, msg_0424_00117) }, - { MON_DATA_SMART_RIBBON, 89, 3, msg_0424_00045, RIBBON_DESC(FALSE, msg_0424_00118) }, - { MON_DATA_SMART_RIBBON_GREAT, 90, 3, msg_0424_00046, RIBBON_DESC(FALSE, msg_0424_00119) }, - { MON_DATA_SMART_RIBBON_ULTRA, 91, 3, msg_0424_00047, RIBBON_DESC(FALSE, msg_0424_00120) }, - { MON_DATA_SMART_RIBBON_MASTER, 92, 3, msg_0424_00048, RIBBON_DESC(FALSE, msg_0424_00121) }, - { MON_DATA_TOUGH_RIBBON, 89, 4, msg_0424_00049, RIBBON_DESC(FALSE, msg_0424_00122) }, - { MON_DATA_TOUGH_RIBBON_GREAT, 90, 4, msg_0424_00050, RIBBON_DESC(FALSE, msg_0424_00123) }, - { MON_DATA_TOUGH_RIBBON_ULTRA, 91, 4, msg_0424_00051, RIBBON_DESC(FALSE, msg_0424_00124) }, - { MON_DATA_TOUGH_RIBBON_MASTER, 92, 4, msg_0424_00052, RIBBON_DESC(FALSE, msg_0424_00125) }, - { MON_DATA_ABILITY_RIBBON, 93, 0, msg_0424_00053, RIBBON_DESC(FALSE, msg_0424_00126) }, - { MON_DATA_GREAT_ABILITY_RIBBON, 94, 0, msg_0424_00054, RIBBON_DESC(FALSE, msg_0424_00127) }, - { MON_DATA_DOUBLE_ABILITY_RIBBON, 95, 0, msg_0424_00055, RIBBON_DESC(FALSE, msg_0424_00128) }, - { MON_DATA_MULTI_ABILITY_RIBBON, 96, 0, msg_0424_00056, RIBBON_DESC(FALSE, msg_0424_00129) }, - { MON_DATA_PAIR_ABILITY_RIBBON, 97, 0, msg_0424_00057, RIBBON_DESC(FALSE, msg_0424_00130) }, - { MON_DATA_WORLD_ABILITY_RIBBON, 98, 0, msg_0424_00058, RIBBON_DESC(FALSE, msg_0424_00131) }, - { MON_DATA_ALERT_RIBBON, 99, 2, msg_0424_00059, RIBBON_DESC(FALSE, msg_0424_00132) }, - { MON_DATA_SHOCK_RIBBON, 100, 0, msg_0424_00060, RIBBON_DESC(FALSE, msg_0424_00133) }, - { MON_DATA_DOWNCAST_RIBBON, 101, 1, msg_0424_00061, RIBBON_DESC(FALSE, msg_0424_00134) }, - { MON_DATA_CARELESS_RIBBON, 102, 2, msg_0424_00062, RIBBON_DESC(FALSE, msg_0424_00135) }, - { MON_DATA_RELAX_RIBBON, 103, 3, msg_0424_00063, RIBBON_DESC(FALSE, msg_0424_00136) }, - { MON_DATA_SNOOZE_RIBBON, 104, 0, msg_0424_00064, RIBBON_DESC(FALSE, msg_0424_00137) }, - { MON_DATA_SMILE_RIBBON, 105, 2, msg_0424_00065, RIBBON_DESC(FALSE, msg_0424_00138) }, - { MON_DATA_GORGEOUS_RIBBON, 106, 1, msg_0424_00066, RIBBON_DESC(FALSE, msg_0424_00139) }, - { MON_DATA_ROYAL_RIBBON, 107, 3, msg_0424_00067, RIBBON_DESC(FALSE, msg_0424_00140) }, - { MON_DATA_GORGEOUS_ROYAL_RIBBON, 108, 0, msg_0424_00068, RIBBON_DESC(FALSE, msg_0424_00141) }, - { MON_DATA_FOOTPRINT_RIBBON, 109, 0, msg_0424_00069, RIBBON_DESC(FALSE, msg_0424_00142) }, - { MON_DATA_RECORD_RIBBON, 110, 1, msg_0424_00070, RIBBON_DESC(FALSE, msg_0424_00143) }, - { MON_DATA_HISTORY_RIBBON, 111, 3, msg_0424_00071, RIBBON_DESC(FALSE, msg_0424_00144) }, - { MON_DATA_LEGEND_RIBBON, 112, 0, msg_0424_00072, RIBBON_DESC(FALSE, msg_0424_00145) }, - { MON_DATA_RED_RIBBON, 113, 0, msg_0424_00073, RIBBON_DESC(TRUE, 7) }, - { MON_DATA_GREEN_RIBBON, 114, 3, msg_0424_00074, RIBBON_DESC(TRUE, 8) }, - { MON_DATA_BLUE_RIBBON, 115, 1, msg_0424_00075, RIBBON_DESC(TRUE, 9) }, - { MON_DATA_FESTIVAL_RIBBON, 116, 1, msg_0424_00076, RIBBON_DESC(TRUE, 10) }, - { MON_DATA_CARNIVAL_RIBBON, 117, 0, msg_0424_00077, RIBBON_DESC(TRUE, 11) }, - { MON_DATA_CLASSIC_RIBBON, 118, 1, msg_0424_00078, RIBBON_DESC(TRUE, 12) }, - { MON_DATA_PREMIER_RIBBON, 119, 0, msg_0424_00079, RIBBON_DESC(TRUE, 13) }, + {MON_DATA_HOENN_CHAMPION_RIBBON, 72, 0, msg_0424_00000, RIBBON_DESC(FALSE, msg_0424_00080)}, + { MON_DATA_HOENN_COOL_RIBBON, 73, 0, msg_0424_00001, RIBBON_DESC(FALSE, msg_0424_00081)}, + { MON_DATA_HOENN_COOL_RIBBON_SUPER, 74, 0, msg_0424_00002, RIBBON_DESC(FALSE, msg_0424_00082)}, + { MON_DATA_HOENN_COOL_RIBBON_HYPER, 75, 0, msg_0424_00003, RIBBON_DESC(FALSE, msg_0424_00083)}, + { MON_DATA_HOENN_COOL_RIBBON_MASTER, 76, 0, msg_0424_00004, RIBBON_DESC(FALSE, msg_0424_00084)}, + { MON_DATA_HOENN_BEAUTY_RIBBON, 73, 1, msg_0424_00005, RIBBON_DESC(FALSE, msg_0424_00085)}, + { MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, 74, 1, msg_0424_00006, RIBBON_DESC(FALSE, msg_0424_00086)}, + { MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, 75, 1, msg_0424_00007, RIBBON_DESC(FALSE, msg_0424_00087)}, + { MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, 76, 1, msg_0424_00008, RIBBON_DESC(FALSE, msg_0424_00088)}, + { MON_DATA_HOENN_CUTE_RIBBON, 73, 2, msg_0424_00009, RIBBON_DESC(FALSE, msg_0424_00089)}, + { MON_DATA_HOENN_CUTE_RIBBON_SUPER, 74, 2, msg_0424_00010, RIBBON_DESC(FALSE, msg_0424_00090)}, + { MON_DATA_HOENN_CUTE_RIBBON_HYPER, 75, 2, msg_0424_00011, RIBBON_DESC(FALSE, msg_0424_00091)}, + { MON_DATA_HOENN_CUTE_RIBBON_MASTER, 76, 2, msg_0424_00012, RIBBON_DESC(FALSE, msg_0424_00092)}, + { MON_DATA_HOENN_SMART_RIBBON, 73, 3, msg_0424_00013, RIBBON_DESC(FALSE, msg_0424_00093)}, + { MON_DATA_HOENN_SMART_RIBBON_SUPER, 74, 3, msg_0424_00014, RIBBON_DESC(FALSE, msg_0424_00094)}, + { MON_DATA_HOENN_SMART_RIBBON_HYPER, 75, 3, msg_0424_00015, RIBBON_DESC(FALSE, msg_0424_00095)}, + { MON_DATA_HOENN_SMART_RIBBON_MASTER, 76, 3, msg_0424_00016, RIBBON_DESC(FALSE, msg_0424_00096)}, + { MON_DATA_HOENN_TOUGH_RIBBON, 73, 4, msg_0424_00017, RIBBON_DESC(FALSE, msg_0424_00097)}, + { MON_DATA_HOENN_TOUGH_RIBBON_SUPER, 74, 4, msg_0424_00018, RIBBON_DESC(FALSE, msg_0424_00098)}, + { MON_DATA_HOENN_TOUGH_RIBBON_HYPER, 75, 4, msg_0424_00019, RIBBON_DESC(FALSE, msg_0424_00099)}, + { MON_DATA_HOENN_TOUGH_RIBBON_MASTER, 76, 4, msg_0424_00020, RIBBON_DESC(FALSE, msg_0424_00100)}, + { MON_DATA_HOENN_WINNING_RIBBON, 78, 0, msg_0424_00021, RIBBON_DESC(FALSE, msg_0424_00101)}, + { MON_DATA_HOENN_VICTORY_RIBBON, 77, 0, msg_0424_00022, RIBBON_DESC(FALSE, msg_0424_00102)}, + { MON_DATA_HOENN_ARTIST_RIBBON, 79, 1, msg_0424_00023, RIBBON_DESC(FALSE, msg_0424_00103)}, + { MON_DATA_HOENN_EFFORT_RIBBON, 80, 2, msg_0424_00024, RIBBON_DESC(FALSE, msg_0424_00104)}, + { MON_DATA_HOENN_MARINE_RIBBON, 81, 1, msg_0424_00025, RIBBON_DESC(TRUE, 0) }, + { MON_DATA_HOENN_LAND_RIBBON, 81, 3, msg_0424_00026, RIBBON_DESC(TRUE, 1) }, + { MON_DATA_HOENN_SKY_RIBBON, 81, 4, msg_0424_00027, RIBBON_DESC(TRUE, 2) }, + { MON_DATA_HOENN_COUNTRY_RIBBON, 82, 3, msg_0424_00028, RIBBON_DESC(FALSE, msg_0424_00178)}, + { MON_DATA_HOENN_NATIONAL_RIBBON, 82, 4, msg_0424_00029, RIBBON_DESC(FALSE, msg_0424_00190)}, + { MON_DATA_HOENN_EARTH_RIBBON, 83, 0, msg_0424_00030, RIBBON_DESC(FALSE, msg_0424_00191)}, + { MON_DATA_HOENN_WORLD_RIBBON, 83, 1, msg_0424_00031, RIBBON_DESC(FALSE, msg_0424_00178)}, + { MON_DATA_SINNOH_CHAMP_RIBBON, 88, 0, msg_0424_00032, RIBBON_DESC(FALSE, msg_0424_00105)}, + { MON_DATA_COOL_RIBBON, 89, 0, msg_0424_00033, RIBBON_DESC(FALSE, msg_0424_00106)}, + { MON_DATA_COOL_RIBBON_GREAT, 90, 0, msg_0424_00034, RIBBON_DESC(FALSE, msg_0424_00107)}, + { MON_DATA_COOL_RIBBON_ULTRA, 91, 0, msg_0424_00035, RIBBON_DESC(FALSE, msg_0424_00108)}, + { MON_DATA_COOL_RIBBON_MASTER, 92, 0, msg_0424_00036, RIBBON_DESC(FALSE, msg_0424_00109)}, + { MON_DATA_BEAUTY_RIBBON, 89, 1, msg_0424_00037, RIBBON_DESC(FALSE, msg_0424_00110)}, + { MON_DATA_BEAUTY_RIBBON_GREAT, 90, 1, msg_0424_00038, RIBBON_DESC(FALSE, msg_0424_00111)}, + { MON_DATA_BEAUTY_RIBBON_ULTRA, 91, 1, msg_0424_00039, RIBBON_DESC(FALSE, msg_0424_00112)}, + { MON_DATA_BEAUTY_RIBBON_MASTER, 92, 1, msg_0424_00040, RIBBON_DESC(FALSE, msg_0424_00113)}, + { MON_DATA_CUTE_RIBBON, 89, 2, msg_0424_00041, RIBBON_DESC(FALSE, msg_0424_00114)}, + { MON_DATA_CUTE_RIBBON_GREAT, 90, 2, msg_0424_00042, RIBBON_DESC(FALSE, msg_0424_00115)}, + { MON_DATA_CUTE_RIBBON_ULTRA, 91, 2, msg_0424_00043, RIBBON_DESC(FALSE, msg_0424_00116)}, + { MON_DATA_CUTE_RIBBON_MASTER, 92, 2, msg_0424_00044, RIBBON_DESC(FALSE, msg_0424_00117)}, + { MON_DATA_SMART_RIBBON, 89, 3, msg_0424_00045, RIBBON_DESC(FALSE, msg_0424_00118)}, + { MON_DATA_SMART_RIBBON_GREAT, 90, 3, msg_0424_00046, RIBBON_DESC(FALSE, msg_0424_00119)}, + { MON_DATA_SMART_RIBBON_ULTRA, 91, 3, msg_0424_00047, RIBBON_DESC(FALSE, msg_0424_00120)}, + { MON_DATA_SMART_RIBBON_MASTER, 92, 3, msg_0424_00048, RIBBON_DESC(FALSE, msg_0424_00121)}, + { MON_DATA_TOUGH_RIBBON, 89, 4, msg_0424_00049, RIBBON_DESC(FALSE, msg_0424_00122)}, + { MON_DATA_TOUGH_RIBBON_GREAT, 90, 4, msg_0424_00050, RIBBON_DESC(FALSE, msg_0424_00123)}, + { MON_DATA_TOUGH_RIBBON_ULTRA, 91, 4, msg_0424_00051, RIBBON_DESC(FALSE, msg_0424_00124)}, + { MON_DATA_TOUGH_RIBBON_MASTER, 92, 4, msg_0424_00052, RIBBON_DESC(FALSE, msg_0424_00125)}, + { MON_DATA_ABILITY_RIBBON, 93, 0, msg_0424_00053, RIBBON_DESC(FALSE, msg_0424_00126)}, + { MON_DATA_GREAT_ABILITY_RIBBON, 94, 0, msg_0424_00054, RIBBON_DESC(FALSE, msg_0424_00127)}, + { MON_DATA_DOUBLE_ABILITY_RIBBON, 95, 0, msg_0424_00055, RIBBON_DESC(FALSE, msg_0424_00128)}, + { MON_DATA_MULTI_ABILITY_RIBBON, 96, 0, msg_0424_00056, RIBBON_DESC(FALSE, msg_0424_00129)}, + { MON_DATA_PAIR_ABILITY_RIBBON, 97, 0, msg_0424_00057, RIBBON_DESC(FALSE, msg_0424_00130)}, + { MON_DATA_WORLD_ABILITY_RIBBON, 98, 0, msg_0424_00058, RIBBON_DESC(FALSE, msg_0424_00131)}, + { MON_DATA_ALERT_RIBBON, 99, 2, msg_0424_00059, RIBBON_DESC(FALSE, msg_0424_00132)}, + { MON_DATA_SHOCK_RIBBON, 100, 0, msg_0424_00060, RIBBON_DESC(FALSE, msg_0424_00133)}, + { MON_DATA_DOWNCAST_RIBBON, 101, 1, msg_0424_00061, RIBBON_DESC(FALSE, msg_0424_00134)}, + { MON_DATA_CARELESS_RIBBON, 102, 2, msg_0424_00062, RIBBON_DESC(FALSE, msg_0424_00135)}, + { MON_DATA_RELAX_RIBBON, 103, 3, msg_0424_00063, RIBBON_DESC(FALSE, msg_0424_00136)}, + { MON_DATA_SNOOZE_RIBBON, 104, 0, msg_0424_00064, RIBBON_DESC(FALSE, msg_0424_00137)}, + { MON_DATA_SMILE_RIBBON, 105, 2, msg_0424_00065, RIBBON_DESC(FALSE, msg_0424_00138)}, + { MON_DATA_GORGEOUS_RIBBON, 106, 1, msg_0424_00066, RIBBON_DESC(FALSE, msg_0424_00139)}, + { MON_DATA_ROYAL_RIBBON, 107, 3, msg_0424_00067, RIBBON_DESC(FALSE, msg_0424_00140)}, + { MON_DATA_GORGEOUS_ROYAL_RIBBON, 108, 0, msg_0424_00068, RIBBON_DESC(FALSE, msg_0424_00141)}, + { MON_DATA_FOOTPRINT_RIBBON, 109, 0, msg_0424_00069, RIBBON_DESC(FALSE, msg_0424_00142)}, + { MON_DATA_RECORD_RIBBON, 110, 1, msg_0424_00070, RIBBON_DESC(FALSE, msg_0424_00143)}, + { MON_DATA_HISTORY_RIBBON, 111, 3, msg_0424_00071, RIBBON_DESC(FALSE, msg_0424_00144)}, + { MON_DATA_LEGEND_RIBBON, 112, 0, msg_0424_00072, RIBBON_DESC(FALSE, msg_0424_00145)}, + { MON_DATA_RED_RIBBON, 113, 0, msg_0424_00073, RIBBON_DESC(TRUE, 7) }, + { MON_DATA_GREEN_RIBBON, 114, 3, msg_0424_00074, RIBBON_DESC(TRUE, 8) }, + { MON_DATA_BLUE_RIBBON, 115, 1, msg_0424_00075, RIBBON_DESC(TRUE, 9) }, + { MON_DATA_FESTIVAL_RIBBON, 116, 1, msg_0424_00076, RIBBON_DESC(TRUE, 10) }, + { MON_DATA_CARNIVAL_RIBBON, 117, 0, msg_0424_00077, RIBBON_DESC(TRUE, 11) }, + { MON_DATA_CLASSIC_RIBBON, 118, 1, msg_0424_00078, RIBBON_DESC(TRUE, 12) }, + { MON_DATA_PREMIER_RIBBON, 119, 0, msg_0424_00079, RIBBON_DESC(TRUE, 13) }, }; u32 GetRibbonAttr(u8 ribbon, RibbonAttr attr) { diff --git a/src/safari_zone.c b/src/safari_zone.c index 79442fc960..9181d11256 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -9,16 +9,16 @@ #include "string_util.h" static const u8 sSafariZoneDefaultAreaSets[10][SAFARI_ZONE_MAX_AREAS_PER_SET] = { - { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_FOREST }, - { SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SWAMP }, - { SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MARSHLAND }, - { SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND }, - { SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MOUNTAIN }, - { SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SAVANNAH }, - { SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_PLAINS }, - { SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MEADOW }, - { SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WETLAND }, - { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND }, + {SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_FOREST }, + { SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SWAMP }, + { SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MARSHLAND}, + { SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND}, + { SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MOUNTAIN }, + { SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SAVANNAH }, + { SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_PLAINS }, + { SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MEADOW }, + { SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WETLAND }, + { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND}, }; u32 Save_SafariZone_sizeof(void) { diff --git a/src/save_misc.c b/src/save_misc.c index 9230c95ce1..e1b02b9371 100644 --- a/src/save_misc.c +++ b/src/save_misc.c @@ -107,9 +107,9 @@ void SaveMisc_GetFavoriteMon(SAVE_MISC_DATA *saveMiscData, int *species, int *fo } static const u8 _020F677C[3][2] = { - { 0, 4 }, - { 4, 2 }, - { 6, 2 }, + {0, 4}, + { 4, 2}, + { 6, 2}, }; BOOL sub_0202AA44(SAVE_MISC_DATA *saveMiscData, int a1, int a2) { diff --git a/src/save_rankings.c b/src/save_rankings.c index 1fab48e0b4..0a9d5cbb0e 100644 --- a/src/save_rankings.c +++ b/src/save_rankings.c @@ -43,9 +43,9 @@ static void SaveRankings_GetSorted(SaveRankings *saveRankings, SaveRankingsSortB static void SaveRankings_GetSortedScoped(SaveRankings *saveRankings, int groupId, u8 statIdx, SaveRankingsEntry **filteredEntries, u8 filteredEntriesCnt, HeapID heapId); static const u8 sPageOffsets[][2] = { - { RANKINGS_RECORD_BATTLE_TOWER_COUNT, RANKINGS_RECORD_BATTLE_TOWER_BEGIN }, - { RANKINGS_RECORD_POKEMON_COUNT, RANKINGS_RECORD_POKEMON_BEGIN }, - { RANKINGS_RECORD_CONTEST_COUNT, RANKINGS_RECORD_CONTEST_BEGIN }, + {RANKINGS_RECORD_BATTLE_TOWER_COUNT, RANKINGS_RECORD_BATTLE_TOWER_BEGIN}, + { RANKINGS_RECORD_POKEMON_COUNT, RANKINGS_RECORD_POKEMON_BEGIN }, + { RANKINGS_RECORD_CONTEST_COUNT, RANKINGS_RECORD_CONTEST_BEGIN }, }; static const int sStatIDs[] = { diff --git a/src/save_wifi_history.c b/src/save_wifi_history.c index fab72dfe9f..80c3e1fb20 100644 --- a/src/save_wifi_history.c +++ b/src/save_wifi_history.c @@ -12,7 +12,7 @@ struct SaveWiFiHistory { u8 country; u8 region; u8 seenLocations[SAVE_WIFI_HISTORY_COUNTRY_MAX * SAVE_WIFI_HISTORY_REGION_WIDTH]; // does not match as a 2d array -}; // size: 0xFF8 +}; // size: 0xFF8 u32 Save_WiFiHistory_sizeof(void) { return sizeof(SaveWiFiHistory); diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index c5ed7f3374..8dd5962003 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -51,53 +51,53 @@ typedef struct WinStreakBP { } WinStreakBP; static const WinStreakBP battleHallWinStreakBP[] = { - { 10, 1 }, - { 30, 3 }, - { 50, 5 }, - { 100, 5 }, - { 150, 5 }, - { 200, 5 }, - { 250, 5 }, - { 300, 5 }, - { 350, 5 }, - { 400, 5 }, - { 450, 5 }, - { 500, 10 }, - { 600, 10 }, - { 700, 10 }, - { 800, 10 }, - { 900, 10 }, - { 1000, 10 }, - { 1200, 30 }, - { 1400, 30 }, - { 1600, 30 }, - { 1800, 30 }, - { 2000, 50 }, - { 2500, 50 }, - { 3000, 50 }, - { 3500, 50 }, - { 4000, 50 }, - { 4500, 50 }, - { 5000, 50 }, - { 5500, 50 }, - { 6000, 50 }, - { 6500, 50 }, - { 7000, 50 }, - { 7500, 50 }, - { 8000, 50 }, - { 8500, 50 }, - { 9000, 50 }, - { 9500, 50 }, - { 10000, 100 }, - { 20000, 200 }, - { 30000, 300 }, - { 40000, 400 }, - { 50000, 500 }, - { 60000, 600 }, - { 70000, 700 }, - { 80000, 800 }, - { 90000, 900 }, - { 100000, 1000 }, + {10, 1 }, + { 30, 3 }, + { 50, 5 }, + { 100, 5 }, + { 150, 5 }, + { 200, 5 }, + { 250, 5 }, + { 300, 5 }, + { 350, 5 }, + { 400, 5 }, + { 450, 5 }, + { 500, 10 }, + { 600, 10 }, + { 700, 10 }, + { 800, 10 }, + { 900, 10 }, + { 1000, 10 }, + { 1200, 30 }, + { 1400, 30 }, + { 1600, 30 }, + { 1800, 30 }, + { 2000, 50 }, + { 2500, 50 }, + { 3000, 50 }, + { 3500, 50 }, + { 4000, 50 }, + { 4500, 50 }, + { 5000, 50 }, + { 5500, 50 }, + { 6000, 50 }, + { 6500, 50 }, + { 7000, 50 }, + { 7500, 50 }, + { 8000, 50 }, + { 8500, 50 }, + { 9000, 50 }, + { 9500, 50 }, + { 10000, 100 }, + { 20000, 200 }, + { 30000, 300 }, + { 40000, 400 }, + { 50000, 500 }, + { 60000, 600 }, + { 70000, 700 }, + { 80000, 800 }, + { 90000, 900 }, + { 100000, 1000}, }; static BOOL BattleHall_DoesPartyContainEligibleMons(s32, SaveData *); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index bce772f324..86ce378990 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -132,13 +132,13 @@ static const WindowTemplate _020FAC94 = { }; static const u8 sConditionTable[6][3] = { - //< = > - { 1, 0, 0 }, // lt - { 0, 1, 0 }, // eq - { 0, 0, 1 }, // gt - { 1, 1, 0 }, // le - { 0, 1, 1 }, // ge - { 1, 0, 1 }, // ne + //< = > + {1, 0, 0}, // lt + { 0, 1, 0}, // eq + { 0, 0, 1}, // gt + { 1, 1, 0}, // le + { 0, 1, 1}, // ge + { 1, 0, 1}, // ne }; static u8 _021D415C; @@ -4755,9 +4755,9 @@ BOOL ScrCmd_OpenPhotoAlbum(ScriptContext *ctx) { BOOL ScrCmd_PlaceStarterBallsInElmsLab(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; const VecFx32 ballCoords[3] = { - { FX32_CONST(131), 0, FX32_CONST(65) }, - { FX32_CONST(141), 0, FX32_CONST(65) }, - { FX32_CONST(136), 0, FX32_CONST(72) }, + {FX32_CONST(131), 0, FX32_CONST(65)}, + { FX32_CONST(141), 0, FX32_CONST(65)}, + { FX32_CONST(136), 0, FX32_CONST(72)}, }; int n, i; diff --git a/src/scrcmd_dppl_prizes.c b/src/scrcmd_dppl_prizes.c index 48d1e9690d..73384c8760 100644 --- a/src/scrcmd_dppl_prizes.c +++ b/src/scrcmd_dppl_prizes.c @@ -1,25 +1,25 @@ #include "scrcmd.h" static const u16 sDPPlGameCornerPrizeMap[][2] = { - { ITEM_SILK_SCARF, 1000 }, - { ITEM_WIDE_LENS, 1000 }, - { ITEM_ZOOM_LENS, 1000 }, - { ITEM_METRONOME, 1000 }, - { ITEM_TM90, 2000 }, - { ITEM_TM58, 2000 }, - { ITEM_TM75, 4000 }, - { ITEM_TM32, 4000 }, - { ITEM_TM44, 6000 }, - { ITEM_TM89, 6000 }, - { ITEM_TM10, 6000 }, - { ITEM_TM27, 8000 }, - { ITEM_TM21, 8000 }, - { ITEM_TM35, 10000 }, - { ITEM_TM24, 10000 }, - { ITEM_TM13, 10000 }, - { ITEM_TM29, 10000 }, - { ITEM_TM74, 15000 }, - { ITEM_TM68, 20000 }, + {ITEM_SILK_SCARF, 1000 }, + { ITEM_WIDE_LENS, 1000 }, + { ITEM_ZOOM_LENS, 1000 }, + { ITEM_METRONOME, 1000 }, + { ITEM_TM90, 2000 }, + { ITEM_TM58, 2000 }, + { ITEM_TM75, 4000 }, + { ITEM_TM32, 4000 }, + { ITEM_TM44, 6000 }, + { ITEM_TM89, 6000 }, + { ITEM_TM10, 6000 }, + { ITEM_TM27, 8000 }, + { ITEM_TM21, 8000 }, + { ITEM_TM35, 10000}, + { ITEM_TM24, 10000}, + { ITEM_TM13, 10000}, + { ITEM_TM29, 10000}, + { ITEM_TM74, 15000}, + { ITEM_TM68, 20000}, }; BOOL ScrCmd_GetDPPlPrizeItemIdAndCost(ScriptContext *ctx) { diff --git a/src/scrcmd_fossils.c b/src/scrcmd_fossils.c index cbf0b914aa..837fdd7c8c 100644 --- a/src/scrcmd_fossils.c +++ b/src/scrcmd_fossils.c @@ -6,13 +6,13 @@ #include "scrcmd.h" static const u16 sFossilPokemonMap[7][2] = { - { ITEM_OLD_AMBER, SPECIES_AERODACTYL }, - { ITEM_HELIX_FOSSIL, SPECIES_OMANYTE }, - { ITEM_DOME_FOSSIL, SPECIES_KABUTO }, - { ITEM_ROOT_FOSSIL, SPECIES_LILEEP }, - { ITEM_CLAW_FOSSIL, SPECIES_ANORITH }, - { ITEM_ARMOR_FOSSIL, SPECIES_SHIELDON }, - { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, + {ITEM_OLD_AMBER, SPECIES_AERODACTYL}, + { ITEM_HELIX_FOSSIL, SPECIES_OMANYTE }, + { ITEM_DOME_FOSSIL, SPECIES_KABUTO }, + { ITEM_ROOT_FOSSIL, SPECIES_LILEEP }, + { ITEM_CLAW_FOSSIL, SPECIES_ANORITH }, + { ITEM_ARMOR_FOSSIL, SPECIES_SHIELDON }, + { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, }; BOOL ScrCmd_CountFossils(ScriptContext *ctx) { diff --git a/src/scrcmd_mart.c b/src/scrcmd_mart.c index 4b4c58c3bd..ad8ebb9aab 100644 --- a/src/scrcmd_mart.c +++ b/src/scrcmd_mart.c @@ -15,25 +15,25 @@ struct BadgeMartItems { }; const struct BadgeMartItems _020FBF22[] = { - { ITEM_POKE_BALL, 1 }, - { ITEM_GREAT_BALL, 3 }, - { ITEM_ULTRA_BALL, 4 }, - { ITEM_POTION, 1 }, - { ITEM_SUPER_POTION, 2 }, - { ITEM_HYPER_POTION, 4 }, - { ITEM_MAX_POTION, 5 }, - { ITEM_FULL_RESTORE, 6 }, - { ITEM_REVIVE, 3 }, - { ITEM_ANTIDOTE, 1 }, - { ITEM_PARLYZ_HEAL, 1 }, - { ITEM_AWAKENING, 2 }, - { ITEM_BURN_HEAL, 2 }, - { ITEM_ICE_HEAL, 2 }, - { ITEM_FULL_HEAL, 4 }, - { ITEM_ESCAPE_ROPE, 2 }, - { ITEM_REPEL, 2 }, - { ITEM_SUPER_REPEL, 3 }, - { ITEM_MAX_REPEL, 4 }, + {ITEM_POKE_BALL, 1}, + { ITEM_GREAT_BALL, 3}, + { ITEM_ULTRA_BALL, 4}, + { ITEM_POTION, 1}, + { ITEM_SUPER_POTION, 2}, + { ITEM_HYPER_POTION, 4}, + { ITEM_MAX_POTION, 5}, + { ITEM_FULL_RESTORE, 6}, + { ITEM_REVIVE, 3}, + { ITEM_ANTIDOTE, 1}, + { ITEM_PARLYZ_HEAL, 1}, + { ITEM_AWAKENING, 2}, + { ITEM_BURN_HEAL, 2}, + { ITEM_ICE_HEAL, 2}, + { ITEM_FULL_HEAL, 4}, + { ITEM_ESCAPE_ROPE, 2}, + { ITEM_REPEL, 2}, + { ITEM_SUPER_REPEL, 3}, + { ITEM_MAX_REPEL, 4}, }; BOOL ScrCmd_MartBuy(ScriptContext *ctx) { @@ -218,172 +218,172 @@ BOOL ScrCmd_SealMart(ScriptContext *ctx) { } const struct MartItem _020FBCD6[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_MOON_STONE, 3000 }, - { ITEM_RARE_CANDY, 2000 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_MOON_STONE, 3000}, + { ITEM_RARE_CANDY, 2000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBCF2[] = { - { ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_FIRE_STONE, 2500 }, - { ITEM_PP_UP, 1000 }, - { 0xFFFF, 0 }, + {ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_FIRE_STONE, 2500}, + { ITEM_PP_UP, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD2A[] = { - { ITEM_BLU_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_WATER_STONE, 2500 }, - { ITEM_HEART_SCALE, 1000 }, - { 0xFFFF, 0 }, + {ITEM_BLU_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_WATER_STONE, 2500}, + { ITEM_HEART_SCALE, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD46[] = { - { ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_THUNDERSTONE, 2500 }, - { ITEM_PP_UP, 1000 }, - { 0xFFFF, 0 }, + {ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_THUNDERSTONE, 2500}, + { ITEM_PP_UP, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD62[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_YLW_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_METAL_COAT, 2500 }, - { ITEM_NUGGET, 500 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_METAL_COAT, 2500}, + { ITEM_NUGGET, 500 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD7E[] = { - { ITEM_GRN_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_LEAF_STONE, 2500 }, - { ITEM_RARE_CANDY, 2000 }, - { 0xFFFF, 0 }, + {ITEM_GRN_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_LEAF_STONE, 2500}, + { ITEM_RARE_CANDY, 2000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBC82[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_KINGS_ROCK, 3000 }, - { ITEM_HEART_SCALE, 1000 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_KINGS_ROCK, 3000}, + { ITEM_HEART_SCALE, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBDB6[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_KINGS_ROCK, 3000 }, - { ITEM_HEART_SCALE, 1000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_NUGGET, 500 }, - { ITEM_SUN_STONE, 3000 }, - { ITEM_FIRE_STONE, 2500 }, - { ITEM_SHINY_STONE, 3000 }, - { ITEM_DAWN_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_KINGS_ROCK, 3000}, + { ITEM_HEART_SCALE, 1000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_NUGGET, 500 }, + { ITEM_SUN_STONE, 3000}, + { ITEM_FIRE_STONE, 2500}, + { ITEM_SHINY_STONE, 3000}, + { ITEM_DAWN_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBDEA[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_MOON_STONE, 3000 }, - { ITEM_RARE_CANDY, 2000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_KINGS_ROCK, 3000 }, - { ITEM_SUN_STONE, 3000 }, - { ITEM_WATER_STONE, 2500 }, - { ITEM_SHINY_STONE, 3000 }, - { ITEM_DUSK_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_MOON_STONE, 3000}, + { ITEM_RARE_CANDY, 2000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_KINGS_ROCK, 3000}, + { ITEM_SUN_STONE, 3000}, + { ITEM_WATER_STONE, 2500}, + { ITEM_SHINY_STONE, 3000}, + { ITEM_DUSK_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE1E[] = { - { ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_FIRE_STONE, 2500 }, - { ITEM_PP_UP, 1000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_METAL_COAT, 2500 }, - { ITEM_WATER_STONE, 2500 }, - { ITEM_LEAF_STONE, 2500 }, - { ITEM_DUSK_STONE, 3000 }, - { ITEM_DAWN_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_FIRE_STONE, 2500}, + { ITEM_PP_UP, 1000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_METAL_COAT, 2500}, + { ITEM_WATER_STONE, 2500}, + { ITEM_LEAF_STONE, 2500}, + { ITEM_DUSK_STONE, 3000}, + { ITEM_DAWN_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE52[] = { - { ITEM_BLU_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_WATER_STONE, 2500 }, - { ITEM_HEART_SCALE, 1000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_DRAGON_SCALE, 2500 }, - { ITEM_THUNDERSTONE, 2500 }, - { ITEM_MOON_STONE, 3000 }, - { ITEM_SHINY_STONE, 3000 }, - { ITEM_DAWN_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_BLU_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_WATER_STONE, 2500}, + { ITEM_HEART_SCALE, 1000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_DRAGON_SCALE, 2500}, + { ITEM_THUNDERSTONE, 2500}, + { ITEM_MOON_STONE, 3000}, + { ITEM_SHINY_STONE, 3000}, + { ITEM_DAWN_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE86[] = { - { ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_THUNDERSTONE, 2500 }, - { ITEM_PP_UP, 1000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_KINGS_ROCK, 3000 }, - { ITEM_FIRE_STONE, 2500 }, - { ITEM_LEAF_STONE, 2500 }, - { ITEM_SHINY_STONE, 3000 }, - { ITEM_DUSK_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_THUNDERSTONE, 2500}, + { ITEM_PP_UP, 1000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_KINGS_ROCK, 3000}, + { ITEM_FIRE_STONE, 2500}, + { ITEM_LEAF_STONE, 2500}, + { ITEM_SHINY_STONE, 3000}, + { ITEM_DUSK_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBEBA[] = { - { ITEM_RED_APRICORN, 200 }, - { ITEM_YLW_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_METAL_COAT, 2500 }, - { ITEM_NUGGET, 500 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_DRAGON_SCALE, 2500 }, - { ITEM_WATER_STONE, 2500 }, - { ITEM_SUN_STONE, 3000 }, - { ITEM_DUSK_STONE, 3000 }, - { ITEM_DAWN_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_RED_APRICORN, 200 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_METAL_COAT, 2500}, + { ITEM_NUGGET, 500 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_DRAGON_SCALE, 2500}, + { ITEM_WATER_STONE, 2500}, + { ITEM_SUN_STONE, 3000}, + { ITEM_DUSK_STONE, 3000}, + { ITEM_DAWN_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBEEE[] = { - { ITEM_GRN_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_LEAF_STONE, 2500 }, - { ITEM_RARE_CANDY, 2000 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_METAL_COAT, 2500 }, - { ITEM_THUNDERSTONE, 2500 }, - { ITEM_SHINY_STONE, 3000 }, - { ITEM_DUSK_STONE, 3000 }, - { ITEM_DAWN_STONE, 3000 }, - { 0xFFFF, 0 }, + {ITEM_GRN_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_LEAF_STONE, 2500}, + { ITEM_RARE_CANDY, 2000}, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_METAL_COAT, 2500}, + { ITEM_THUNDERSTONE, 2500}, + { ITEM_SHINY_STONE, 3000}, + { ITEM_DUSK_STONE, 3000}, + { ITEM_DAWN_STONE, 3000}, + { 0xFFFF, 0 }, }; const struct MartItem *_0210FA04[] = { @@ -420,46 +420,46 @@ BOOL ScrCmd_771(ScriptContext *ctx) { } const struct MartItem _020FBCBA[] = { - { ITEM_DATA_CARD_01, 500 }, - { ITEM_DATA_CARD_02, 500 }, - { ITEM_DATA_CARD_03, 1000 }, - { ITEM_DATA_CARD_04, 1000 }, - { ITEM_DATA_CARD_05, 500 }, - { ITEM_DATA_CARD_06, 500 }, - { 0xFFFF, 0 }, + {ITEM_DATA_CARD_01, 500 }, + { ITEM_DATA_CARD_02, 500 }, + { ITEM_DATA_CARD_03, 1000}, + { ITEM_DATA_CARD_04, 1000}, + { ITEM_DATA_CARD_05, 500 }, + { ITEM_DATA_CARD_06, 500 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD0E[] = { - { ITEM_DATA_CARD_07, 1000 }, - { ITEM_DATA_CARD_08, 1000 }, - { ITEM_DATA_CARD_09, 1000 }, - { ITEM_DATA_CARD_10, 1000 }, - { ITEM_DATA_CARD_11, 1000 }, - { ITEM_DATA_CARD_12, 1000 }, - { 0xFFFF, 0 }, + {ITEM_DATA_CARD_07, 1000}, + { ITEM_DATA_CARD_08, 1000}, + { ITEM_DATA_CARD_09, 1000}, + { ITEM_DATA_CARD_10, 1000}, + { ITEM_DATA_CARD_11, 1000}, + { ITEM_DATA_CARD_12, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD9A[] = { - { ITEM_DATA_CARD_13, 1500 }, - { ITEM_DATA_CARD_14, 1500 }, - { ITEM_DATA_CARD_15, 1500 }, - { ITEM_DATA_CARD_16, 1000 }, - { ITEM_DATA_CARD_17, 1000 }, - { ITEM_DATA_CARD_18, 1000 }, - { 0xFFFF, 0 }, + {ITEM_DATA_CARD_13, 1500}, + { ITEM_DATA_CARD_14, 1500}, + { ITEM_DATA_CARD_15, 1500}, + { ITEM_DATA_CARD_16, 1000}, + { ITEM_DATA_CARD_17, 1000}, + { ITEM_DATA_CARD_18, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBC9E[] = { - { ITEM_DATA_CARD_19, 500 }, - { ITEM_DATA_CARD_20, 500 }, - { ITEM_DATA_CARD_21, 2000 }, - { ITEM_DATA_CARD_22, 2000 }, - { ITEM_DATA_CARD_23, 1000 }, - { ITEM_DATA_CARD_24, 1000 }, - { 0xFFFF, 0 }, + {ITEM_DATA_CARD_19, 500 }, + { ITEM_DATA_CARD_20, 500 }, + { ITEM_DATA_CARD_21, 2000}, + { ITEM_DATA_CARD_22, 2000}, + { ITEM_DATA_CARD_23, 1000}, + { ITEM_DATA_CARD_24, 1000}, + { 0xFFFF, 0 }, }; const struct MartItem _020FBBA4[] = { - { ITEM_DATA_CARD_25, 2000 }, - { ITEM_DATA_CARD_26, 3000 }, - { ITEM_DATA_CARD_27, 9999 }, - { 0xFFFF, 0 }, + {ITEM_DATA_CARD_25, 2000}, + { ITEM_DATA_CARD_26, 3000}, + { ITEM_DATA_CARD_27, 9999}, + { 0xFFFF, 0 }, }; const struct MartItem *_0210F9D4[] = { diff --git a/src/scrcmd_move_tutor.c b/src/scrcmd_move_tutor.c index 99c62ff043..d5fed63591 100644 --- a/src/scrcmd_move_tutor.c +++ b/src/scrcmd_move_tutor.c @@ -36,58 +36,58 @@ typedef struct MoveTutorLearnset { #define MAX_TUTOR_MOVES_PER_PAGE (6); static const TutorMove sTutorMoves[] = { - { MOVE_DIVE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_MUD_SLAP, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_FURY_CUTTER, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_ICY_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_ROLLOUT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_THUNDER_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_FIRE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SUPERPOWER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ICE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_IRON_HEAD, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_AQUA_TAIL, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_OMINOUS_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_GASTRO_ACID, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SNORE, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_SPITE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_AIR_CUTTER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HELPING_HAND, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_ENDEAVOR, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_OUTRAGE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ANCIENT_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SYNTHESIS, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_SIGNAL_BEAM, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ZEN_HEADBUTT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_VACUUM_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_EARTH_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_GUNK_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_TWISTER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SEED_BOMB, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_IRON_DEFENSE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_MAGNET_RISE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_LAST_RESORT, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_BOUNCE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_TRICK, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HEAT_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_KNOCK_OFF, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SUCKER_PUNCH, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SWIFT, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_UPROAR, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_SUPER_FANG, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_PAIN_SPLIT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_STRING_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_TAILWIND, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_GRAVITY, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_WORRY_SEED, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_MAGIC_COAT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_ROLE_PLAY, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_HEAL_BELL, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_LOW_KICK, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SKY_ATTACK, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_BLOCK, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, - { MOVE_BUG_BITE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HEADBUTT, 0, MOVE_TUTOR_NPC_HEADBUTT }, + {MOVE_DIVE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_MUD_SLAP, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_FURY_CUTTER, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_ICY_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_ROLLOUT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_THUNDER_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_FIRE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SUPERPOWER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ICE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_IRON_HEAD, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_AQUA_TAIL, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_OMINOUS_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_GASTRO_ACID, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SNORE, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_SPITE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_AIR_CUTTER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HELPING_HAND, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_ENDEAVOR, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_OUTRAGE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ANCIENT_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SYNTHESIS, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_SIGNAL_BEAM, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ZEN_HEADBUTT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_VACUUM_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_EARTH_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_GUNK_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_TWISTER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SEED_BOMB, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_IRON_DEFENSE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_MAGNET_RISE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_LAST_RESORT, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_BOUNCE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_TRICK, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HEAT_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_KNOCK_OFF, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SUCKER_PUNCH, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SWIFT, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_UPROAR, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_SUPER_FANG, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_PAIN_SPLIT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_STRING_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_TAILWIND, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_GRAVITY, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_WORRY_SEED, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_MAGIC_COAT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_ROLE_PLAY, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_HEAL_BELL, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_LOW_KICK, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SKY_ATTACK, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_BLOCK, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, + { MOVE_BUG_BITE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HEADBUTT, 0, MOVE_TUTOR_NPC_HEADBUTT }, }; static u16 GetMoveTutorLearnsetIndex(u16 species, u8 form); diff --git a/src/scrcmd_mystery_gift.c b/src/scrcmd_mystery_gift.c index b77e687f36..b05897f660 100644 --- a/src/scrcmd_mystery_gift.c +++ b/src/scrcmd_mystery_gift.c @@ -94,21 +94,21 @@ static void MGMessageSuccess_MemorialPhoto(struct GetMysteryGiftGmmState *gmmSta static void MGMessageFailure_MemorialPhoto(struct GetMysteryGiftGmmState *gmmState, u16 *pMsgBank, u16 *pMsgNum); static const struct ScriptMysteryGiftFuncs sScriptMysteryGiftActionTable[MG_TAG_MAX - 1] = { - { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, - { MGCheck_PartySpace, MGGive_Egg, MGMessageSuccess_Egg, MGMessageFailure_GiveMon }, - { MGCheck_Item, MGGive_Item, MGMessageSuccess_Item, MGMessageFailure_Item }, - { MGCheck_BattleRules, MGGive_BattleRules, MGMessageSuccess_BattleRules, MGMessageFailure_BattleRules }, - { MGCheck_Decoration, MGGive_Decoration, MGMessageSuccess_Decoration, MGMessageFailure_Decoration }, - { MGCheck_MonDeco, MGGive_MonDeco, MGMessageSuccess_MonDeco, MGMessageFailure_MonDeco }, - { MGCheck_PartySpace, MGGive_ManaphyEgg, MGMessageSuccess_ManaphyEgg, MGMessageFailure_GiveMon }, - { MGCheck_MemberCard, MGGive_MemberCard, MGMessageSuccess_MemberCard, MGMessageFailure_MemberCard }, - { MGCheck_OaksLetter, MGGive_OaksLetter, MGMessageSuccess_OaksLetter, MGMessageFailure_OaksLetter }, - { MGCheck_AzureFlute, MGGive_AzureFlute, MGMessageSuccess_AzureFlute, MGMessageFailure_AzureFlute }, - { MGCheck_PoketchApp, MGGive_PoketchApp, MGMessageSuccess_PoketchApp, MGMessageFailure_PoketchApp }, - { MGCheck_SecretKey, MGGive_SecretKey, MGMessageSuccess_SecretKey, MGMessageFailure_SecretKey }, - { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, - { MGCheck_PokewalkerCourse, MGGive_PokewalkerCourse, MGMessageSuccess_PokewalkerCourse, MGMessageFailure_PokewalkerCourse }, - { MGCheck_MemorialPhoto, MGGive_MemorialPhoto, MGMessageSuccess_MemorialPhoto, MGMessageFailure_MemorialPhoto }, + {MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, + { MGCheck_PartySpace, MGGive_Egg, MGMessageSuccess_Egg, MGMessageFailure_GiveMon }, + { MGCheck_Item, MGGive_Item, MGMessageSuccess_Item, MGMessageFailure_Item }, + { MGCheck_BattleRules, MGGive_BattleRules, MGMessageSuccess_BattleRules, MGMessageFailure_BattleRules }, + { MGCheck_Decoration, MGGive_Decoration, MGMessageSuccess_Decoration, MGMessageFailure_Decoration }, + { MGCheck_MonDeco, MGGive_MonDeco, MGMessageSuccess_MonDeco, MGMessageFailure_MonDeco }, + { MGCheck_PartySpace, MGGive_ManaphyEgg, MGMessageSuccess_ManaphyEgg, MGMessageFailure_GiveMon }, + { MGCheck_MemberCard, MGGive_MemberCard, MGMessageSuccess_MemberCard, MGMessageFailure_MemberCard }, + { MGCheck_OaksLetter, MGGive_OaksLetter, MGMessageSuccess_OaksLetter, MGMessageFailure_OaksLetter }, + { MGCheck_AzureFlute, MGGive_AzureFlute, MGMessageSuccess_AzureFlute, MGMessageFailure_AzureFlute }, + { MGCheck_PoketchApp, MGGive_PoketchApp, MGMessageSuccess_PoketchApp, MGMessageFailure_PoketchApp }, + { MGCheck_SecretKey, MGGive_SecretKey, MGMessageSuccess_SecretKey, MGMessageFailure_SecretKey }, + { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, + { MGCheck_PokewalkerCourse, MGGive_PokewalkerCourse, MGMessageSuccess_PokewalkerCourse, MGMessageFailure_PokewalkerCourse}, + { MGCheck_MemorialPhoto, MGGive_MemorialPhoto, MGMessageSuccess_MemorialPhoto, MGMessageFailure_MemorialPhoto }, }; static void FieldSystem_InitGetMysteryGiftGmmState(struct GetMysteryGiftGmmState *state, FieldSystem *fieldSys, MessageFormat *msgFormat, MysteryGiftData *mgData) { diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index a5566e443f..fa65bdc19c 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -8,22 +8,22 @@ #include "script_state_misc.h" static const u16 sBigMonSizeTable[][3] = { - { 290, 1, 0 }, - { 300, 1, 10 }, - { 400, 2, 110 }, - { 500, 4, 310 }, - { 600, 20, 710 }, - { 700, 50, 2710 }, - { 800, 100, 7710 }, - { 900, 150, 17710 }, - { 1000, 150, 32710 }, - { 1100, 100, 47710 }, - { 1200, 50, 57710 }, - { 1300, 20, 62710 }, - { 1400, 5, 64710 }, - { 1500, 2, 65210 }, - { 1600, 1, 65410 }, - { 1700, 1, 65510 }, + {290, 1, 0 }, + { 300, 1, 10 }, + { 400, 2, 110 }, + { 500, 4, 310 }, + { 600, 20, 710 }, + { 700, 50, 2710 }, + { 800, 100, 7710 }, + { 900, 150, 17710}, + { 1000, 150, 32710}, + { 1100, 100, 47710}, + { 1200, 50, 57710}, + { 1300, 20, 62710}, + { 1400, 5, 64710}, + { 1500, 2, 65210}, + { 1600, 1, 65410}, + { 1700, 1, 65510}, }; static u32 GetMonSizeHash(Pokemon *mon) { diff --git a/src/start_menu.c b/src/start_menu.c index 2e027181a6..2d08bfea50 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -117,8 +117,8 @@ typedef struct StartMenuAfterEvoPartySlotBak { int partySlot; } StartMenuAfterEvoPartySlotBak; -#define STARTMENUTASKFUNC_CANCEL ((TaskFunc) - 2) -#define STARTMENUTASKFUNC_NONE ((TaskFunc) - 1) +#define STARTMENUTASKFUNC_CANCEL ((TaskFunc)-2) +#define STARTMENUTASKFUNC_NONE ((TaskFunc)-1) static StartMenuTaskData *StartMenu_Create(void); static u32 FieldSystem_GetStartMenuButtonInhibitFlags_Normal(FieldSystem *fieldSystem); @@ -194,19 +194,19 @@ static const int sActionToIconIndex[] = { }; static const StartMenuActionFunc sStartMenuActions[] = { - [START_MENU_ACTION_POKEDEX] = { .ident = msg_0196_00000, .func = Task_StartMenu_HandleSelection_Pokedex }, - [START_MENU_ACTION_POKEMON] = { .ident = msg_0196_00001, .func = Task_StartMenu_HandleSelection_Pokemon }, - [START_MENU_ACTION_BAG] = { .ident = msg_0196_00002, .func = Task_StartMenu_HandleSelection_Bag }, - [START_MENU_ACTION_TRAINER_CARD] = { .ident = msg_0196_00003, .func = Task_StartMenu_HandleSelection_TrainerCard }, - [START_MENU_ACTION_SAVE] = { .ident = msg_0196_00004, .func = Task_StartMenu_HandleSelection_Save }, - [START_MENU_ACTION_OPTIONS] = { .ident = msg_0196_00005, .func = Task_StartMenu_HandleSelection_Options }, - [START_MENU_ACTION_RUNNING_SHOES] = { .ident = msg_0196_00006, .func = STARTMENUTASKFUNC_CANCEL }, - [START_MENU_ACTION_7] = { .ident = msg_0196_00007, .func = Task_StartMenu_HandleSelection_RemovedEasyChatThing }, - [START_MENU_ACTION_RETIRE] = { .ident = msg_0196_00008, .func = Task_StartMenu_HandleSelection_Retire }, - [START_MENU_ACTION_9] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_10] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_POKEGEAR] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_12] = { .ident = msg_0196_00014, .func = sub_0203D2CC }, + [START_MENU_ACTION_POKEDEX] = {.ident = msg_0196_00000, .func = Task_StartMenu_HandleSelection_Pokedex }, + [START_MENU_ACTION_POKEMON] = { .ident = msg_0196_00001, .func = Task_StartMenu_HandleSelection_Pokemon }, + [START_MENU_ACTION_BAG] = { .ident = msg_0196_00002, .func = Task_StartMenu_HandleSelection_Bag }, + [START_MENU_ACTION_TRAINER_CARD] = { .ident = msg_0196_00003, .func = Task_StartMenu_HandleSelection_TrainerCard }, + [START_MENU_ACTION_SAVE] = { .ident = msg_0196_00004, .func = Task_StartMenu_HandleSelection_Save }, + [START_MENU_ACTION_OPTIONS] = { .ident = msg_0196_00005, .func = Task_StartMenu_HandleSelection_Options }, + [START_MENU_ACTION_RUNNING_SHOES] = { .ident = msg_0196_00006, .func = STARTMENUTASKFUNC_CANCEL }, + [START_MENU_ACTION_7] = { .ident = msg_0196_00007, .func = Task_StartMenu_HandleSelection_RemovedEasyChatThing}, + [START_MENU_ACTION_RETIRE] = { .ident = msg_0196_00008, .func = Task_StartMenu_HandleSelection_Retire }, + [START_MENU_ACTION_9] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_10] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_POKEGEAR] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_12] = { .ident = msg_0196_00014, .func = sub_0203D2CC }, }; static const u8 _020FA0AC[] = { diff --git a/src/sys_flags.c b/src/sys_flags.c index 342a9f8c6a..9734f06cab 100644 --- a/src/sys_flags.c +++ b/src/sys_flags.c @@ -13,19 +13,19 @@ struct MusicOverride { }; static const struct MusicOverride sMusicOverrideMap[] = { - { MAP_D22R0101, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE_D5 }, - { MAP_R35R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, - { MAP_R36R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, - { MAP_T04GYM0101, FLAG_UNK_994, SEQ_GS_EYE_ROCKET }, - { MAP_R24, FLAG_UNK_995, SEQ_GS_EYE_ROCKET }, - { MAP_D10R0101, FLAG_UNK_999, SEQ_GS_SAFARI_FIELD }, - { MAP_D23R0101, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0102, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0103, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0104, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0105, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0106, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0107, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + {MAP_D22R0101, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE_D5}, + { MAP_R35R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, + { MAP_R36R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, + { MAP_T04GYM0101, FLAG_UNK_994, SEQ_GS_EYE_ROCKET }, + { MAP_R24, FLAG_UNK_995, SEQ_GS_EYE_ROCKET }, + { MAP_D10R0101, FLAG_UNK_999, SEQ_GS_SAFARI_FIELD}, + { MAP_D23R0101, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0102, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0103, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0104, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0105, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0106, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0107, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, }; void SetScriptFlag(SaveVarsFlags *state, u16 flag_id) { diff --git a/src/system.c b/src/system.c index 713facc003..06ca428cff 100644 --- a/src/system.c +++ b/src/system.c @@ -84,10 +84,10 @@ void HBlankIntrRegsToggle(BOOL enable) { } static const struct HeapParam sDefaultHeapSpec[] = { - { 0xD200, OS_ARENA_MAIN }, - { 0x23600, OS_ARENA_MAIN }, - { 0x10, OS_ARENA_MAIN }, - { 0x11D000, OS_ARENA_MAIN }, + {0xD200, OS_ARENA_MAIN}, + { 0x23600, OS_ARENA_MAIN}, + { 0x10, OS_ARENA_MAIN}, + { 0x11D000, OS_ARENA_MAIN}, }; void sub_0201A1B4(void) { diff --git a/src/trainer_memo.c b/src/trainer_memo.c index 34c86b9273..b1a7d26bb6 100644 --- a/src/trainer_memo.c +++ b/src/trainer_memo.c @@ -53,12 +53,12 @@ static const u16 sFlavorMsgs[6] = { }; static const u16 sCharactersticMsgs[6][5] = { - { msg_0302_00071, msg_0302_00072, msg_0302_00073, msg_0302_00074, msg_0302_00075 }, - { msg_0302_00076, msg_0302_00077, msg_0302_00078, msg_0302_00079, msg_0302_00080 }, - { msg_0302_00081, msg_0302_00082, msg_0302_00083, msg_0302_00084, msg_0302_00085 }, - { msg_0302_00086, msg_0302_00087, msg_0302_00088, msg_0302_00089, msg_0302_00090 }, - { msg_0302_00091, msg_0302_00092, msg_0302_00093, msg_0302_00094, msg_0302_00095 }, - { msg_0302_00096, msg_0302_00097, msg_0302_00098, msg_0302_00099, msg_0302_00100 }, + {msg_0302_00071, msg_0302_00072, msg_0302_00073, msg_0302_00074, msg_0302_00075}, + { msg_0302_00076, msg_0302_00077, msg_0302_00078, msg_0302_00079, msg_0302_00080}, + { msg_0302_00081, msg_0302_00082, msg_0302_00083, msg_0302_00084, msg_0302_00085}, + { msg_0302_00086, msg_0302_00087, msg_0302_00088, msg_0302_00089, msg_0302_00090}, + { msg_0302_00091, msg_0302_00092, msg_0302_00093, msg_0302_00094, msg_0302_00095}, + { msg_0302_00096, msg_0302_00097, msg_0302_00098, msg_0302_00099, msg_0302_00100}, }; static MetCondition MonMetCondition(Pokemon *mon, BOOL isMine); diff --git a/src/unk_02013FDC.c b/src/unk_02013FDC.c index 9b65f04150..ed3187c76a 100644 --- a/src/unk_02013FDC.c +++ b/src/unk_02013FDC.c @@ -157,12 +157,12 @@ static void sub_02014350(int srcWidth, int srcHeight, const UnkStruct_02014E30 * static void sub_02014374(NarcId narcId, s32 fileId, HeapID heapId, int x, int y, int width, int height, void *dest) { UnkStruct_02014E30 sp1C[6] = { - { 0, 0, 8, 8 }, - { 8, 0, 2, 4 }, - { 8, 4, 2, 4 }, - { 0, 8, 4, 2 }, - { 4, 8, 4, 2 }, - { 8, 8, 2, 2 }, + {0, 0, 8, 8}, + { 8, 0, 2, 4}, + { 8, 4, 2, 4}, + { 0, 8, 4, 2}, + { 4, 8, 4, 2}, + { 8, 8, 2, 2}, }; int sp18 = 0; @@ -200,12 +200,12 @@ void *sub_02014450(NarcId narcId, s32 fileId, HeapID heapId) { void sub_02014494(NarcId narcId, s32 fileId, HeapID heapId, int x, int y, int width, int height, void *dest, u32 pid, BOOL isAnimated, int whichFacing, int species) { UnkStruct_02014E30 sp2C[6] = { - { 0, 0, 8, 8 }, - { 8, 0, 2, 4 }, - { 8, 4, 2, 4 }, - { 0, 8, 4, 2 }, - { 4, 8, 4, 2 }, - { 8, 8, 2, 2 }, + {0, 0, 8, 8}, + { 8, 0, 2, 4}, + { 8, 4, 2, 4}, + { 0, 8, 4, 2}, + { 4, 8, 4, 2}, + { 8, 8, 2, 2}, }; int sp28 = 0; diff --git a/src/unk_0204B538.c b/src/unk_0204B538.c index f612227383..8171aa8413 100644 --- a/src/unk_0204B538.c +++ b/src/unk_0204B538.c @@ -37,89 +37,89 @@ static void GetFrontierMon(FrontierMon *mon, u32 frontierMonIndex); static const u16 _020FBFA4[] = { ITEM_BRIGHTPOWDER, ITEM_LUM_BERRY, ITEM_LEFTOVERS, ITEM_QUICK_CLAW }; static const u16 _020FBFAC[][2] = { - { 0, 99 }, - { 80, 119 }, - { 100, 139 }, - { 120, 159 }, - { 140, 179 }, - { 160, 199 }, - { 180, 219 }, - { 200, 299 }, + {0, 99 }, + { 80, 119}, + { 100, 139}, + { 120, 159}, + { 140, 179}, + { 160, 199}, + { 180, 219}, + { 200, 299}, }; static const u16 _020FBFEC[][2] = { - { 90, 141 }, - { 91, 142 }, - { 92, 143 }, - { 93, 144 }, - { 94, 145 }, - { 2, 4 }, - { 3, 6 }, - { 60, 3 }, - { 61, 8 }, - { 32, 62 }, - { 33, 63 }, - { 4, 52 }, - { 5, 53 }, - { 44, 1 }, - { 45, 2 }, - { 20, 15 }, - { 21, 16 }, - { 81, 59 }, - { 26, 60 }, - { 16, 9 }, - { 17, 12 }, - { 83, 23 }, - { 84, 22 }, - { 71, 41 }, - { 18, 42 }, - { 12, 38 }, - { 13, 39 }, - { 14, 51 }, - { 10, 7 }, - { 27, 17 }, - { 35, 37 }, - { 49, 70 }, - { 50, 70 }, - { 39, 11 }, - { 40, 14 }, - { 24, 11 }, - { 25, 14 }, - { 53, 68 }, - { 54, 69 }, - { 29, 11 }, - { 6, 5 }, - { 28, 1 }, - { 19, 45 }, - { 11, 54 }, - { 46, 56 }, - { 9, 20 }, - { 48, 50 }, - { 52, 10 }, - { 37, 19 }, - { 57, 31 }, - { 78, 29 }, - { 34, 36 }, - { 59, 40 }, - { 58, 43 }, - { 38, 34 }, - { 51, 62 }, - { 69, 14 }, - { 80, 55 }, - { 36, 13 }, - { 7, 12 }, - { 85, 35 }, - { 15, 44 }, - { 22, 71 }, + {90, 141}, + { 91, 142}, + { 92, 143}, + { 93, 144}, + { 94, 145}, + { 2, 4 }, + { 3, 6 }, + { 60, 3 }, + { 61, 8 }, + { 32, 62 }, + { 33, 63 }, + { 4, 52 }, + { 5, 53 }, + { 44, 1 }, + { 45, 2 }, + { 20, 15 }, + { 21, 16 }, + { 81, 59 }, + { 26, 60 }, + { 16, 9 }, + { 17, 12 }, + { 83, 23 }, + { 84, 22 }, + { 71, 41 }, + { 18, 42 }, + { 12, 38 }, + { 13, 39 }, + { 14, 51 }, + { 10, 7 }, + { 27, 17 }, + { 35, 37 }, + { 49, 70 }, + { 50, 70 }, + { 39, 11 }, + { 40, 14 }, + { 24, 11 }, + { 25, 14 }, + { 53, 68 }, + { 54, 69 }, + { 29, 11 }, + { 6, 5 }, + { 28, 1 }, + { 19, 45 }, + { 11, 54 }, + { 46, 56 }, + { 9, 20 }, + { 48, 50 }, + { 52, 10 }, + { 37, 19 }, + { 57, 31 }, + { 78, 29 }, + { 34, 36 }, + { 59, 40 }, + { 58, 43 }, + { 38, 34 }, + { 51, 62 }, + { 69, 14 }, + { 80, 55 }, + { 36, 13 }, + { 7, 12 }, + { 85, 35 }, + { 15, 44 }, + { 22, 71 }, }; static const u16 _020FBFCC[][2] = { - { 100, 119 }, - { 120, 139 }, - { 140, 159 }, - { 160, 179 }, - { 180, 199 }, - { 200, 219 }, - { 220, 239 }, - { 200, 299 }, + {100, 119}, + { 120, 139}, + { 140, 159}, + { 160, 179}, + { 180, 199}, + { 200, 219}, + { 220, 239}, + { 200, 299}, }; MessageFormat *sub_0204B538(SaveData *saveData, u16 numEligiblePokemon, u16 a2, u8 a3, u8 *numLegendaryPokemonSeen) { diff --git a/src/unk_0205B3DC.c b/src/unk_0205B3DC.c index e50225b041..5e9ce4de88 100644 --- a/src/unk_0205B3DC.c +++ b/src/unk_0205B3DC.c @@ -12,38 +12,38 @@ // you'll be offered a different set of 4 choices // for avatar and trainer class. static const u8 sPlayerAvatarIndexChoices[][4] = { - { 0, 1, 2, 3 }, - { 1, 6, 7, 0 }, - { 2, 3, 4, 5 }, - { 3, 0, 5, 6 }, - { 4, 1, 2, 7 }, - { 5, 2, 7, 0 }, - { 6, 3, 4, 1 }, - { 7, 4, 5, 6 }, + {0, 1, 2, 3}, + { 1, 6, 7, 0}, + { 2, 3, 4, 5}, + { 3, 0, 5, 6}, + { 4, 1, 2, 7}, + { 5, 2, 7, 0}, + { 6, 3, 4, 1}, + { 7, 4, 5, 6}, }; // The above array indexes into this table // which defines the sprite, trainer class, // and... the same trainer class again? static const u8 sPlayerAvatarAttributes[][3] = { - // Male - { SPRITE_BOY1, TRAINERCLASS_SCHOOL_KID_M, TRAINERCLASS_SCHOOL_KID_M }, - { SPRITE_BOY3, TRAINERCLASS_BUG_CATCHER, TRAINERCLASS_BUG_CATCHER }, - { SPRITE_MAN3, TRAINERCLASS_ACE_TRAINER_M, TRAINERCLASS_ACE_TRAINER_M }, - { SPRITE_BADMAN, TRAINERCLASS_ROUGHNECK, TRAINERCLASS_ROUGHNECK }, - { SPRITE_EXPLORE, TRAINERCLASS_RUIN_MANIAC, TRAINERCLASS_RUIN_MANIAC }, - { SPRITE_FIGHTER, TRAINERCLASS_BLACK_BELT, TRAINERCLASS_BLACK_BELT }, - { SPRITE_GORGGEOUSM, TRAINERCLASS_RICH_BOY, TRAINERCLASS_RICH_BOY }, - { SPRITE_MYSTERY, TRAINERCLASS_PSYCHIC_M, TRAINERCLASS_PSYCHIC_M }, - // Female - { SPRITE_GIRL1, TRAINERCLASS_LASS, TRAINERCLASS_LASS }, - { SPRITE_GIRL2, TRAINERCLASS_BATTLE_GIRL, TRAINERCLASS_BATTLE_GIRL }, - { SPRITE_WOMAN2, TRAINERCLASS_BEAUTY, TRAINERCLASS_BEAUTY }, - { SPRITE_WOMAN3, TRAINERCLASS_ACE_TRAINER_F, TRAINERCLASS_ACE_TRAINER_F }, - { SPRITE_IDOL, TRAINERCLASS_IDOL, TRAINERCLASS_IDOL }, - { SPRITE_LADY, TRAINERCLASS_SOCIALITE, TRAINERCLASS_SOCIALITE }, - { SPRITE_COWGIRL, TRAINERCLASS_COWGIRL, TRAINERCLASS_COWGIRL }, - { SPRITE_GORGGEOUSW, TRAINERCLASS_LADY, TRAINERCLASS_LADY }, + // Male + {SPRITE_BOY1, TRAINERCLASS_SCHOOL_KID_M, TRAINERCLASS_SCHOOL_KID_M }, + { SPRITE_BOY3, TRAINERCLASS_BUG_CATCHER, TRAINERCLASS_BUG_CATCHER }, + { SPRITE_MAN3, TRAINERCLASS_ACE_TRAINER_M, TRAINERCLASS_ACE_TRAINER_M}, + { SPRITE_BADMAN, TRAINERCLASS_ROUGHNECK, TRAINERCLASS_ROUGHNECK }, + { SPRITE_EXPLORE, TRAINERCLASS_RUIN_MANIAC, TRAINERCLASS_RUIN_MANIAC }, + { SPRITE_FIGHTER, TRAINERCLASS_BLACK_BELT, TRAINERCLASS_BLACK_BELT }, + { SPRITE_GORGGEOUSM, TRAINERCLASS_RICH_BOY, TRAINERCLASS_RICH_BOY }, + { SPRITE_MYSTERY, TRAINERCLASS_PSYCHIC_M, TRAINERCLASS_PSYCHIC_M }, + // Female + { SPRITE_GIRL1, TRAINERCLASS_LASS, TRAINERCLASS_LASS }, + { SPRITE_GIRL2, TRAINERCLASS_BATTLE_GIRL, TRAINERCLASS_BATTLE_GIRL }, + { SPRITE_WOMAN2, TRAINERCLASS_BEAUTY, TRAINERCLASS_BEAUTY }, + { SPRITE_WOMAN3, TRAINERCLASS_ACE_TRAINER_F, TRAINERCLASS_ACE_TRAINER_F}, + { SPRITE_IDOL, TRAINERCLASS_IDOL, TRAINERCLASS_IDOL }, + { SPRITE_LADY, TRAINERCLASS_SOCIALITE, TRAINERCLASS_SOCIALITE }, + { SPRITE_COWGIRL, TRAINERCLASS_COWGIRL, TRAINERCLASS_COWGIRL }, + { SPRITE_GORGGEOUSW, TRAINERCLASS_LADY, TRAINERCLASS_LADY }, }; void BufferUnionRoomAvatarChoicesNames(u32 trainerId, u32 playerGender, MessageFormat *msgFmt) { diff --git a/src/unk_02091054.c b/src/unk_02091054.c index 7dca5f2f7e..7e686172ed 100644 --- a/src/unk_02091054.c +++ b/src/unk_02091054.c @@ -11,87 +11,87 @@ typedef struct { } Unk02091054; static const Unk02091054 _02105F04[81] = { - { 0x27, 0x00, 0x35, 0x01, 0x00 }, - { 0x28, 0x01, 0x35, 0x01, 0x00 }, - { 0x29, 0x02, 0x36, 0x01, 0x01 }, - { 0x2a, 0x03, 0x37, 0x01, 0x02 }, - { 0x2b, 0x04, 0x38, 0x01, 0x03 }, - { 0x2c, 0x05, 0x39, 0x02, 0x04 }, - { 0x2d, 0x06, 0x3a, 0x02, 0x05 }, - { 0x2f, 0x07, 0x3b, 0x01, 0x06 }, - { 0x2e, 0x08, 0x3c, 0x01, 0x07 }, - { 0x31, 0x09, 0x3d, 0x01, 0x08 }, - { 0x30, 0x0a, 0x3e, 0x01, 0x09 }, - { 0x33, 0x0b, 0x3f, 0x02, 0x0a }, - { 0x32, 0x0c, 0x40, 0x02, 0x0b }, - { 0x34, 0x0d, 0x41, 0x02, 0x0c }, - { 0x35, 0x0e, 0x42, 0x02, 0x0d }, - { 0x36, 0x0f, 0x43, 0x02, 0x0e }, - { 0x37, 0x10, 0x44, 0x02, 0x0f }, - { 0x38, 0x11, 0x49, 0x02, 0x10 }, - { 0x39, 0x12, 0x4a, 0x02, 0x11 }, - { 0x3a, 0x13, 0x4b, 0x02, 0x12 }, - { 0x3b, 0x14, 0x4c, 0x02, 0x13 }, - { 0x3c, 0x15, 0x45, 0x02, 0x14 }, - { 0x3d, 0x16, 0x46, 0x02, 0x15 }, - { 0x3e, 0x17, 0x47, 0x02, 0x16 }, - { 0x3f, 0x18, 0x48, 0x02, 0x17 }, - { 0x40, 0x19, 0x4d, 0x01, 0x18 }, - { 0x41, 0x1a, 0x4e, 0x01, 0x19 }, - { 0x42, 0x1b, 0x4f, 0x01, 0x1a }, - { 0x43, 0x1c, 0x50, 0x01, 0x1b }, - { 0x44, 0x1d, 0x51, 0x01, 0x1c }, - { 0x45, 0x1e, 0x52, 0x01, 0x1d }, - { 0x46, 0x1f, 0x53, 0x01, 0x1e }, - { 0x47, 0x20, 0x54, 0x01, 0x1f }, - { 0x48, 0x21, 0x55, 0x01, 0x20 }, - { 0x49, 0x22, 0x56, 0x01, 0x21 }, - { 0x4a, 0x23, 0x57, 0x02, 0x22 }, - { 0x4b, 0x24, 0x58, 0x02, 0x23 }, - { 0x4c, 0x25, 0x59, 0x01, 0x24 }, - { 0x4d, 0x26, 0x5a, 0x01, 0x25 }, - { 0x4e, 0x27, 0x5b, 0x01, 0x26 }, - { 0x4f, 0x28, 0x5c, 0x01, 0x27 }, - { 0x50, 0x29, 0x5d, 0x01, 0x28 }, - { 0x51, 0x2a, 0x5e, 0x01, 0x29 }, - { 0x52, 0x2b, 0x5f, 0x01, 0x2a }, - { 0x53, 0x2c, 0x60, 0x01, 0x2b }, - { 0x54, 0x2d, 0x61, 0x01, 0x2c }, - { 0x55, 0x2e, 0x62, 0x01, 0x2d }, - { 0x56, 0x2f, 0x63, 0x01, 0x2e }, - { 0x57, 0x30, 0x64, 0x01, 0x2f }, - { 0x58, 0x31, 0x65, 0x01, 0x30 }, - { 0x59, 0x32, 0x66, 0x00, 0x00 }, - { 0x5a, 0x33, 0x67, 0x00, 0x00 }, - { 0x5b, 0x34, 0x68, 0x00, 0x00 }, - { 0x5c, 0x35, 0x69, 0x00, 0x00 }, - { 0x5d, 0x36, 0x6a, 0x00, 0x00 }, - { 0x5e, 0x37, 0x6b, 0x00, 0x00 }, - { 0x5f, 0x38, 0x6c, 0x00, 0x00 }, - { 0x60, 0x39, 0x6d, 0x00, 0x00 }, - { 0x61, 0x3a, 0x6e, 0x00, 0x00 }, - { 0x62, 0x3b, 0x6f, 0x00, 0x00 }, - { 0x63, 0x3c, 0x70, 0x00, 0x00 }, - { 0x64, 0x3d, 0x71, 0x00, 0x00 }, - { 0x65, 0x3e, 0x72, 0x00, 0x00 }, - { 0x66, 0x3f, 0x73, 0x00, 0x00 }, - { 0x67, 0x40, 0x74, 0x00, 0x00 }, - { 0x68, 0x41, 0x75, 0x00, 0x00 }, - { 0x69, 0x42, 0x76, 0x00, 0x00 }, - { 0x6a, 0x43, 0x77, 0x00, 0x00 }, - { 0x6b, 0x44, 0x78, 0x00, 0x00 }, - { 0x6c, 0x45, 0x79, 0x00, 0x00 }, - { 0x6d, 0x46, 0x7a, 0x00, 0x00 }, - { 0x6e, 0x47, 0x7b, 0x00, 0x00 }, - { 0x6f, 0x48, 0x7c, 0x00, 0x00 }, - { 0x70, 0x49, 0x7d, 0x00, 0x00 }, - { 0x71, 0x4a, 0x7e, 0x00, 0x00 }, - { 0x72, 0x4b, 0x7f, 0x00, 0x00 }, - { 0x73, 0x4c, 0x80, 0x00, 0x00 }, - { 0x74, 0x4d, 0x81, 0x00, 0x00 }, - { 0x75, 0x4e, 0x82, 0x00, 0x31 }, - { 0x76, 0x4f, 0x83, 0x00, 0x32 }, - { 0x77, 0x50, 0x84, 0x00, 0x33 }, + {0x27, 0x00, 0x35, 0x01, 0x00}, + { 0x28, 0x01, 0x35, 0x01, 0x00}, + { 0x29, 0x02, 0x36, 0x01, 0x01}, + { 0x2a, 0x03, 0x37, 0x01, 0x02}, + { 0x2b, 0x04, 0x38, 0x01, 0x03}, + { 0x2c, 0x05, 0x39, 0x02, 0x04}, + { 0x2d, 0x06, 0x3a, 0x02, 0x05}, + { 0x2f, 0x07, 0x3b, 0x01, 0x06}, + { 0x2e, 0x08, 0x3c, 0x01, 0x07}, + { 0x31, 0x09, 0x3d, 0x01, 0x08}, + { 0x30, 0x0a, 0x3e, 0x01, 0x09}, + { 0x33, 0x0b, 0x3f, 0x02, 0x0a}, + { 0x32, 0x0c, 0x40, 0x02, 0x0b}, + { 0x34, 0x0d, 0x41, 0x02, 0x0c}, + { 0x35, 0x0e, 0x42, 0x02, 0x0d}, + { 0x36, 0x0f, 0x43, 0x02, 0x0e}, + { 0x37, 0x10, 0x44, 0x02, 0x0f}, + { 0x38, 0x11, 0x49, 0x02, 0x10}, + { 0x39, 0x12, 0x4a, 0x02, 0x11}, + { 0x3a, 0x13, 0x4b, 0x02, 0x12}, + { 0x3b, 0x14, 0x4c, 0x02, 0x13}, + { 0x3c, 0x15, 0x45, 0x02, 0x14}, + { 0x3d, 0x16, 0x46, 0x02, 0x15}, + { 0x3e, 0x17, 0x47, 0x02, 0x16}, + { 0x3f, 0x18, 0x48, 0x02, 0x17}, + { 0x40, 0x19, 0x4d, 0x01, 0x18}, + { 0x41, 0x1a, 0x4e, 0x01, 0x19}, + { 0x42, 0x1b, 0x4f, 0x01, 0x1a}, + { 0x43, 0x1c, 0x50, 0x01, 0x1b}, + { 0x44, 0x1d, 0x51, 0x01, 0x1c}, + { 0x45, 0x1e, 0x52, 0x01, 0x1d}, + { 0x46, 0x1f, 0x53, 0x01, 0x1e}, + { 0x47, 0x20, 0x54, 0x01, 0x1f}, + { 0x48, 0x21, 0x55, 0x01, 0x20}, + { 0x49, 0x22, 0x56, 0x01, 0x21}, + { 0x4a, 0x23, 0x57, 0x02, 0x22}, + { 0x4b, 0x24, 0x58, 0x02, 0x23}, + { 0x4c, 0x25, 0x59, 0x01, 0x24}, + { 0x4d, 0x26, 0x5a, 0x01, 0x25}, + { 0x4e, 0x27, 0x5b, 0x01, 0x26}, + { 0x4f, 0x28, 0x5c, 0x01, 0x27}, + { 0x50, 0x29, 0x5d, 0x01, 0x28}, + { 0x51, 0x2a, 0x5e, 0x01, 0x29}, + { 0x52, 0x2b, 0x5f, 0x01, 0x2a}, + { 0x53, 0x2c, 0x60, 0x01, 0x2b}, + { 0x54, 0x2d, 0x61, 0x01, 0x2c}, + { 0x55, 0x2e, 0x62, 0x01, 0x2d}, + { 0x56, 0x2f, 0x63, 0x01, 0x2e}, + { 0x57, 0x30, 0x64, 0x01, 0x2f}, + { 0x58, 0x31, 0x65, 0x01, 0x30}, + { 0x59, 0x32, 0x66, 0x00, 0x00}, + { 0x5a, 0x33, 0x67, 0x00, 0x00}, + { 0x5b, 0x34, 0x68, 0x00, 0x00}, + { 0x5c, 0x35, 0x69, 0x00, 0x00}, + { 0x5d, 0x36, 0x6a, 0x00, 0x00}, + { 0x5e, 0x37, 0x6b, 0x00, 0x00}, + { 0x5f, 0x38, 0x6c, 0x00, 0x00}, + { 0x60, 0x39, 0x6d, 0x00, 0x00}, + { 0x61, 0x3a, 0x6e, 0x00, 0x00}, + { 0x62, 0x3b, 0x6f, 0x00, 0x00}, + { 0x63, 0x3c, 0x70, 0x00, 0x00}, + { 0x64, 0x3d, 0x71, 0x00, 0x00}, + { 0x65, 0x3e, 0x72, 0x00, 0x00}, + { 0x66, 0x3f, 0x73, 0x00, 0x00}, + { 0x67, 0x40, 0x74, 0x00, 0x00}, + { 0x68, 0x41, 0x75, 0x00, 0x00}, + { 0x69, 0x42, 0x76, 0x00, 0x00}, + { 0x6a, 0x43, 0x77, 0x00, 0x00}, + { 0x6b, 0x44, 0x78, 0x00, 0x00}, + { 0x6c, 0x45, 0x79, 0x00, 0x00}, + { 0x6d, 0x46, 0x7a, 0x00, 0x00}, + { 0x6e, 0x47, 0x7b, 0x00, 0x00}, + { 0x6f, 0x48, 0x7c, 0x00, 0x00}, + { 0x70, 0x49, 0x7d, 0x00, 0x00}, + { 0x71, 0x4a, 0x7e, 0x00, 0x00}, + { 0x72, 0x4b, 0x7f, 0x00, 0x00}, + { 0x73, 0x4c, 0x80, 0x00, 0x00}, + { 0x74, 0x4d, 0x81, 0x00, 0x00}, + { 0x75, 0x4e, 0x82, 0x00, 0x31}, + { 0x76, 0x4f, 0x83, 0x00, 0x32}, + { 0x77, 0x50, 0x84, 0x00, 0x33}, }; // Has something to do with seals... diff --git a/src/unk_02097F6C.c b/src/unk_02097F6C.c index 75d205c592..96dbd63050 100644 --- a/src/unk_02097F6C.c +++ b/src/unk_02097F6C.c @@ -13,26 +13,26 @@ #define SWARM_MAP_COUNT 20 static const u16 sSwarmMapLUT[SWARM_MAP_COUNT][2] = { - { MAP_R01, 0 }, - { MAP_R03, 0 }, - { MAP_R09, 0 }, - { MAP_R12, 2 }, - { MAP_R13, 0 }, - { MAP_W19, 1 }, - { MAP_R32, 2 }, - { MAP_R25, 0 }, - { MAP_R27, 1 }, - { MAP_R34, 0 }, - { MAP_R35, 0 }, - { MAP_R38, 0 }, - { MAP_R44, 2 }, - { MAP_R45, 0 }, - { MAP_R47, 0 }, - { MAP_D38R0101, 0 }, - { MAP_D42R0102, 0 }, - { MAP_D46R0101, 0 }, - { MAP_T06, 1 }, - { MAP_T22, 2 }, + {MAP_R01, 0}, + { MAP_R03, 0}, + { MAP_R09, 0}, + { MAP_R12, 2}, + { MAP_R13, 0}, + { MAP_W19, 1}, + { MAP_R32, 2}, + { MAP_R25, 0}, + { MAP_R27, 1}, + { MAP_R34, 0}, + { MAP_R35, 0}, + { MAP_R38, 0}, + { MAP_R44, 2}, + { MAP_R45, 0}, + { MAP_R47, 0}, + { MAP_D38R0101, 0}, + { MAP_D42R0102, 0}, + { MAP_D46R0101, 0}, + { MAP_T06, 1}, + { MAP_T22, 2}, }; BOOL sub_02097F6C(u32 rand, u16 mapno, u16 swarmValue) { diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index eaff3a8cfb..b606d5688d 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -1713,7 +1713,7 @@ static void ov122_021E7BD4(VoltorbFlipAppWork *work) { SpriteRenderer *renderer = work->spriteRenderer; SpriteGfxHandler *gfxHandler = work->spriteGfxHandler; - + SpriteRenderer_LoadPlttResObjFromOpenNarc(renderer, gfxHandler, work->narc, NARC_voltorb_flip_voltorb_flip_00000010_bin, FALSE, 5, NNS_G2D_VRAM_TYPE_2DMAIN, 0); SpriteRenderer_LoadCharResObjFromOpenNarc(renderer, gfxHandler, work->narc, NARC_voltorb_flip_voltorb_flip_00000011_bin, TRUE, NNS_G2D_VRAM_TYPE_2DMAIN, 0); SpriteRenderer_LoadCellResObjFromOpenNarc(renderer, gfxHandler, work->narc, NARC_voltorb_flip_voltorb_flip_00000012_bin, TRUE, 0); diff --git a/src/voltorb_flip/voltorb_flip_data2.c b/src/voltorb_flip/voltorb_flip_data2.c index 994bb52dc2..52b0289446 100644 --- a/src/voltorb_flip/voltorb_flip_data2.c +++ b/src/voltorb_flip/voltorb_flip_data2.c @@ -25,15 +25,15 @@ const struct GraphicsModes sVoltorbFlipBgModeSet = { }; const MsgNoList sMenuMsgNos[] = { - { sMainMenuMsgNos, 3 }, - { sGameInfoMsgNos, 4 }, + {sMainMenuMsgNos, 3}, + { sGameInfoMsgNos, 4}, }; const u8 ov122_021E92B0[4][4] = { - { 0x0C, 0x08, 0x05, 0x01 }, - { 0x0F, 0x0B, 0x06, 0x02 }, - { 0x0E, 0x0A, 0x07, 0x04 }, - { 0x0D, 0x09, 0x08, 0x08 }, + {0x0C, 0x08, 0x05, 0x01}, + { 0x0F, 0x0B, 0x06, 0x02}, + { 0x0E, 0x0A, 0x07, 0x04}, + { 0x0D, 0x09, 0x08, 0x08}, }; const OamCharTransferParam ov122_021E92D0 = { @@ -62,10 +62,10 @@ const GraphicsBanks sVoltorbFlipGraphicsBanks = { }; const Ov122_021E6C2C ov122_021E9344[4] = { - { 0x00, 0x00, 0x21 }, - { 0x02, 0x00, 0x22 }, - { 0x00, 0x02, 0x23 }, - { 0x02, 0x02, 0x24 }, + {0x00, 0x00, 0x21}, + { 0x02, 0x00, 0x22}, + { 0x00, 0x02, 0x23}, + { 0x02, 0x02, 0x24}, }; const UnkTemplate_0200D748 ov122_021E93A8 = { diff --git a/src/voltorb_flip/voltorb_flip_data3.c b/src/voltorb_flip/voltorb_flip_data3.c index 392a8f5418..a304c98c44 100644 --- a/src/voltorb_flip/voltorb_flip_data3.c +++ b/src/voltorb_flip/voltorb_flip_data3.c @@ -4,20 +4,20 @@ #include "voltorb_flip/voltorb_flip_workflow.h" const VoltorbFlipWorkflows sVoltorbFlipWorkflows = { - [WORKFLOW_UNK_0] = { NULL, ov122_021E5BA8, ov122_021E5BE4, NULL, NULL }, - [WORKFLOW_NEW_ROUND] = { NULL, GenerateBoardAndPrintNewLevel, PrintYouCanEarnEvenMoreCoins, NULL, ov122_021E5D24 }, - [WORKFLOW_SELECT_MAIN_MENU] = { PrintPlayNewRound, ov122_021E5DB4, AwaitMainMenuSelection, NULL, NULL }, - [WORKFLOW_SELECT_GAME_INFO] = { PrintWhichSetOfInfo, ov122_021E5E34, AwaitGameInfoSelection, NULL, NULL }, - [WORKFLOW_HOW_TO_PLAY] = { OpenHowToPlayScreen, NULL, PrintHowToPlayMsg, NULL, CloseTutorialScreen }, - [WORKFLOW_HINT] = { OpenHintScreen, NULL, PrintHintMsg, NULL, CloseTutorialScreen }, - [WORKFLOW_ABOUT_MEMO] = { OpenAboutMemoScreen, NULL, PrintAboutMemoMsg, NULL, CloseTutorialScreen }, - [WORKFLOW_RENDER_BOARD] = { NULL, NULL, RenderBoard, NULL, NULL }, - [WORKFLOW_AWAIT_BOARD_INTERACT] = { NULL, NULL, AwaitBoardInteraction, NULL, ov122_021E6008 }, - [WORKFLOW_FLIP_CARD] = { PlaySuspensefulFanfare, StartCardFlipEffect, AwaitCardFlipAndResult, ov122_021E6358, NULL }, - [WORKFLOW_UNK_10] = { NULL, NULL, PlayWinRoundFanfare, NULL, NULL }, - [WORKFLOW_AWARD_COINS] = { NULL, NULL, AwardCoins, NULL, NULL }, - [WORKFLOW_REVEAL_BOARD] = { NULL, NULL, ov122_021E64E8, ov122_021E6594, NULL }, - [WORKFLOW_UNK_13] = { ov122_021E65F4, NULL, ov122_021E65FC, NULL, ov122_021E67E0 }, - [WORKFLOW_UNK_14] = { ov122_021E66CC, ov122_021E66FC, ov122_021E6700, ov122_021E67DC, ov122_021E67E0 }, - [WORKFLOW_QUIT_ROUND] = { PrintAreYouSureYouWantToQuit, ov122_021E6900, AwaitQuitYesNoSelection, ov122_021E69DC, NULL }, + [WORKFLOW_UNK_0] = {NULL, ov122_021E5BA8, ov122_021E5BE4, NULL, NULL }, + [WORKFLOW_NEW_ROUND] = { NULL, GenerateBoardAndPrintNewLevel, PrintYouCanEarnEvenMoreCoins, NULL, ov122_021E5D24 }, + [WORKFLOW_SELECT_MAIN_MENU] = { PrintPlayNewRound, ov122_021E5DB4, AwaitMainMenuSelection, NULL, NULL }, + [WORKFLOW_SELECT_GAME_INFO] = { PrintWhichSetOfInfo, ov122_021E5E34, AwaitGameInfoSelection, NULL, NULL }, + [WORKFLOW_HOW_TO_PLAY] = { OpenHowToPlayScreen, NULL, PrintHowToPlayMsg, NULL, CloseTutorialScreen}, + [WORKFLOW_HINT] = { OpenHintScreen, NULL, PrintHintMsg, NULL, CloseTutorialScreen}, + [WORKFLOW_ABOUT_MEMO] = { OpenAboutMemoScreen, NULL, PrintAboutMemoMsg, NULL, CloseTutorialScreen}, + [WORKFLOW_RENDER_BOARD] = { NULL, NULL, RenderBoard, NULL, NULL }, + [WORKFLOW_AWAIT_BOARD_INTERACT] = { NULL, NULL, AwaitBoardInteraction, NULL, ov122_021E6008 }, + [WORKFLOW_FLIP_CARD] = { PlaySuspensefulFanfare, StartCardFlipEffect, AwaitCardFlipAndResult, ov122_021E6358, NULL }, + [WORKFLOW_UNK_10] = { NULL, NULL, PlayWinRoundFanfare, NULL, NULL }, + [WORKFLOW_AWARD_COINS] = { NULL, NULL, AwardCoins, NULL, NULL }, + [WORKFLOW_REVEAL_BOARD] = { NULL, NULL, ov122_021E64E8, ov122_021E6594, NULL }, + [WORKFLOW_UNK_13] = { ov122_021E65F4, NULL, ov122_021E65FC, NULL, ov122_021E67E0 }, + [WORKFLOW_UNK_14] = { ov122_021E66CC, ov122_021E66FC, ov122_021E6700, ov122_021E67DC, ov122_021E67E0 }, + [WORKFLOW_QUIT_ROUND] = { PrintAreYouSureYouWantToQuit, ov122_021E6900, AwaitQuitYesNoSelection, ov122_021E69DC, NULL }, }; diff --git a/src/voltorb_flip/voltorb_flip_data4.c b/src/voltorb_flip/voltorb_flip_data4.c index fe2580b8ec..3be1aebc6f 100644 --- a/src/voltorb_flip/voltorb_flip_data4.c +++ b/src/voltorb_flip/voltorb_flip_data4.c @@ -110,108 +110,108 @@ const u8 sBoardIdDistribution[8][80] = { // of multipliers. In this case, your board could give you all but 1 of the // multipliers for free. const BoardConfig sBoardConfigs[80] = { - // Lv. 1 - // Voltorbs Twos Threes MaxFreePerRowCol MaxFreeTotal Payout - { 6, 3, 1, 3, 3 }, // 24 - { 6, 0, 3, 2, 2 }, // 27 - { 6, 5, 0, 3, 4 }, // 32 - { 6, 2, 2, 3, 3 }, // 36 - { 6, 4, 1, 3, 4 }, // 48 - - { 6, 3, 1, 3, 3 }, // 24 - { 6, 0, 3, 2, 2 }, // 27 - { 6, 5, 0, 3, 4 }, // 32 - { 6, 2, 2, 3, 3 }, // 36 - { 6, 4, 1, 3, 4 }, // 48 - - // Lv. 2 - { 7, 1, 3, 2, 3 }, // 54 - { 7, 6, 0, 3, 4 }, // 64 - { 7, 3, 2, 2, 3 }, // 72 - { 7, 0, 4, 2, 3 }, // 81 - { 7, 5, 1, 3, 4 }, // 96 - - { 7, 1, 3, 2, 2 }, // 54 - { 7, 6, 0, 3, 3 }, // 64 - { 7, 3, 2, 2, 2 }, // 72 - { 7, 0, 4, 2, 2 }, // 81 - { 7, 5, 1, 3, 3 }, // 96 - - // Lv. 3 - { 8, 2, 3, 2, 3 }, // 108 - { 8, 7, 0, 3, 4 }, // 128 - { 8, 4, 2, 3, 4 }, // 144 - { 8, 1, 4, 2, 3 }, // 162 - { 8, 6, 1, 4, 3 }, // 192 - - { 8, 2, 3, 2, 2 }, // 108 - { 8, 7, 0, 3, 3 }, // 128 - { 8, 4, 2, 3, 3 }, // 144 - { 8, 1, 4, 2, 2 }, // 162 - { 8, 6, 1, 3, 3 }, // 192 - - // Lv. 4 - { 8, 3, 3, 4, 3 }, // 216 - { 8, 0, 5, 2, 3 }, // 243 - { 10, 8, 0, 4, 5 }, // 256 - { 10, 5, 2, 3, 4 }, // 288 - { 10, 2, 4, 3, 4 }, // 324 - - { 8, 3, 3, 3, 3 }, // 216 - { 8, 0, 5, 2, 2 }, // 243 - { 10, 8, 0, 4, 4 }, // 256 - { 10, 5, 2, 3, 3 }, // 288 - { 10, 2, 4, 3, 3 }, // 324 - - // Lv. 5 - { 10, 7, 1, 4, 5 }, // 384 - { 10, 4, 3, 3, 4 }, // 432 - { 10, 1, 5, 3, 4 }, // 486 - { 10, 9, 0, 4, 5 }, // 512 - { 10, 6, 2, 4, 5 }, // 576 - - { 10, 7, 1, 4, 4 }, // 384 - { 10, 4, 3, 3, 3 }, // 432 - { 10, 1, 5, 3, 3 }, // 486 - { 10, 9, 0, 4, 4 }, // 512 - { 10, 6, 2, 4, 4 }, // 576 - - // Lv. 6 - { 10, 3, 4, 3, 4 }, // 648 - { 10, 0, 6, 3, 4 }, // 729 - { 10, 8, 1, 4, 5 }, // 768 - { 10, 5, 3, 4, 5 }, // 864 - { 10, 2, 5, 3, 4 }, // 972 - - { 10, 3, 4, 3, 3 }, // 648 - { 10, 0, 6, 3, 3 }, // 729 - { 10, 8, 1, 4, 4 }, // 768 - { 10, 5, 3, 4, 4 }, // 864 - { 10, 2, 5, 3, 3 }, // 972 - - // Lv. 7 - { 10, 7, 2, 4, 5 }, // 1152 - { 10, 4, 4, 4, 5 }, // 1296 - { 13, 1, 6, 3, 4 }, // 1458 - { 13, 9, 1, 5, 6 }, // 1536 - { 10, 6, 3, 4, 5 }, // 1728 - - { 10, 7, 2, 4, 4 }, // 1152 - { 10, 4, 4, 4, 4 }, // 1296 - { 13, 1, 6, 3, 3 }, // 1458 - { 13, 9, 1, 5, 5 }, // 1536 - { 10, 6, 3, 4, 4 }, // 1728 - - // Lv. 8 - { 10, 0, 7, 3, 4 }, // 2187 - { 10, 8, 2, 5, 6 }, // 2304 - { 10, 5, 4, 4, 5 }, // 2592 - { 10, 2, 6, 4, 5 }, // 2916 - { 10, 7, 3, 5, 6 }, // 3456 - - { 10, 0, 7, 3, 3 }, // 2187 - { 10, 8, 2, 5, 5 }, // 2304 - { 10, 5, 4, 4, 4 }, // 2592 - { 10, 2, 6, 4, 4 }, // 2916 - { 10, 7, 3, 5, 5 }, // 3456 + // Lv. 1 + // Voltorbs Twos Threes MaxFreePerRowCol MaxFreeTotal Payout + {6, 3, 1, 3, 3}, // 24 + { 6, 0, 3, 2, 2}, // 27 + { 6, 5, 0, 3, 4}, // 32 + { 6, 2, 2, 3, 3}, // 36 + { 6, 4, 1, 3, 4}, // 48 + + { 6, 3, 1, 3, 3}, // 24 + { 6, 0, 3, 2, 2}, // 27 + { 6, 5, 0, 3, 4}, // 32 + { 6, 2, 2, 3, 3}, // 36 + { 6, 4, 1, 3, 4}, // 48 + + // Lv. 2 + { 7, 1, 3, 2, 3}, // 54 + { 7, 6, 0, 3, 4}, // 64 + { 7, 3, 2, 2, 3}, // 72 + { 7, 0, 4, 2, 3}, // 81 + { 7, 5, 1, 3, 4}, // 96 + + { 7, 1, 3, 2, 2}, // 54 + { 7, 6, 0, 3, 3}, // 64 + { 7, 3, 2, 2, 2}, // 72 + { 7, 0, 4, 2, 2}, // 81 + { 7, 5, 1, 3, 3}, // 96 + + // Lv. 3 + { 8, 2, 3, 2, 3}, // 108 + { 8, 7, 0, 3, 4}, // 128 + { 8, 4, 2, 3, 4}, // 144 + { 8, 1, 4, 2, 3}, // 162 + { 8, 6, 1, 4, 3}, // 192 + + { 8, 2, 3, 2, 2}, // 108 + { 8, 7, 0, 3, 3}, // 128 + { 8, 4, 2, 3, 3}, // 144 + { 8, 1, 4, 2, 2}, // 162 + { 8, 6, 1, 3, 3}, // 192 + + // Lv. 4 + { 8, 3, 3, 4, 3}, // 216 + { 8, 0, 5, 2, 3}, // 243 + { 10, 8, 0, 4, 5}, // 256 + { 10, 5, 2, 3, 4}, // 288 + { 10, 2, 4, 3, 4}, // 324 + + { 8, 3, 3, 3, 3}, // 216 + { 8, 0, 5, 2, 2}, // 243 + { 10, 8, 0, 4, 4}, // 256 + { 10, 5, 2, 3, 3}, // 288 + { 10, 2, 4, 3, 3}, // 324 + + // Lv. 5 + { 10, 7, 1, 4, 5}, // 384 + { 10, 4, 3, 3, 4}, // 432 + { 10, 1, 5, 3, 4}, // 486 + { 10, 9, 0, 4, 5}, // 512 + { 10, 6, 2, 4, 5}, // 576 + + { 10, 7, 1, 4, 4}, // 384 + { 10, 4, 3, 3, 3}, // 432 + { 10, 1, 5, 3, 3}, // 486 + { 10, 9, 0, 4, 4}, // 512 + { 10, 6, 2, 4, 4}, // 576 + + // Lv. 6 + { 10, 3, 4, 3, 4}, // 648 + { 10, 0, 6, 3, 4}, // 729 + { 10, 8, 1, 4, 5}, // 768 + { 10, 5, 3, 4, 5}, // 864 + { 10, 2, 5, 3, 4}, // 972 + + { 10, 3, 4, 3, 3}, // 648 + { 10, 0, 6, 3, 3}, // 729 + { 10, 8, 1, 4, 4}, // 768 + { 10, 5, 3, 4, 4}, // 864 + { 10, 2, 5, 3, 3}, // 972 + + // Lv. 7 + { 10, 7, 2, 4, 5}, // 1152 + { 10, 4, 4, 4, 5}, // 1296 + { 13, 1, 6, 3, 4}, // 1458 + { 13, 9, 1, 5, 6}, // 1536 + { 10, 6, 3, 4, 5}, // 1728 + + { 10, 7, 2, 4, 4}, // 1152 + { 10, 4, 4, 4, 4}, // 1296 + { 13, 1, 6, 3, 3}, // 1458 + { 13, 9, 1, 5, 5}, // 1536 + { 10, 6, 3, 4, 4}, // 1728 + + // Lv. 8 + { 10, 0, 7, 3, 4}, // 2187 + { 10, 8, 2, 5, 6}, // 2304 + { 10, 5, 4, 4, 5}, // 2592 + { 10, 2, 6, 4, 5}, // 2916 + { 10, 7, 3, 5, 6}, // 3456 + + { 10, 0, 7, 3, 3}, // 2187 + { 10, 8, 2, 5, 5}, // 2304 + { 10, 5, 4, 4, 4}, // 2592 + { 10, 2, 6, 4, 4}, // 2916 + { 10, 7, 3, 5, 5}, // 3456 }; diff --git a/src/voltorb_flip/voltorb_flip_data5.c b/src/voltorb_flip/voltorb_flip_data5.c index 6c431084e1..6deaa6c6c8 100644 --- a/src/voltorb_flip/voltorb_flip_data5.c +++ b/src/voltorb_flip/voltorb_flip_data5.c @@ -381,9 +381,9 @@ const u8 ov122_021E9AAC[] = { }; u8 ov122_021E9BA0[5][2] = { - { 0xC8, 0x50 }, - { 0xE0, 0x50 }, - { 0xC8, 0x68 }, - { 0xE0, 0x68 }, - { 0xE0, 0x80 }, + {0xC8, 0x50}, + { 0xE0, 0x50}, + { 0xC8, 0x68}, + { 0xE0, 0x68}, + { 0xE0, 0x80}, }; diff --git a/src/yes_no_prompt.c b/src/yes_no_prompt.c index 4bd2bb1924..49b15e2663 100644 --- a/src/yes_no_prompt.c +++ b/src/yes_no_prompt.c @@ -74,8 +74,8 @@ void YesNoPrompt_Destroy(YesNoPrompt *yesno) { static void YesNoPrompt_InitFromTemplate_Internal(YesNoPrompt *yesno, const YesNoPromptTemplate *template) { static const u8 dimensions[2][2] = { - { 6, 4 }, - { 16, 6 }, + {6, 4}, + { 16, 6}, }; yesno->bgConfig = template->bgConfig; From f49fb4947fcacad1e935d2c8d8fdda92ede71b3c Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:37:50 -0400 Subject: [PATCH 07/15] Clean Up --- include/overlay_mic_test.h | 102 --------------- src/overlay_mic_test.c | 257 +++++++++++++++++++++++++------------ 2 files changed, 178 insertions(+), 181 deletions(-) diff --git a/include/overlay_mic_test.h b/include/overlay_mic_test.h index 8287596f9f..dd9bc4bf96 100644 --- a/include/overlay_mic_test.h +++ b/include/overlay_mic_test.h @@ -7,108 +7,6 @@ #include "system.h" #include "unk_0200CF18.h" -// Should be static, but not fully decompiled yet -typedef struct MicTestData MicTestData; -typedef struct MicTestTaskManager MicTestTaskManager; - -typedef void (*MicTestTask)(MicTestTaskManager *, u32 *); - -typedef struct MicTestSub_F0 { - MICAutoParam mic; - void *unk1C; - s32 curVolume; - u32 unk24; - u32 unk28; - u32 unk2C; - u32 unk30; - u32 unk34; -} MicTestSub_F0; - -typedef struct MicTestSub_B8 { - BgConfig *bgConfig; - Window window[3]; - MsgData *msgData; -} MicTestSub_B8; - -struct MicTestTaskManager { - MicTestData *micTest; - MicTestTask task; - u32 state; - u32 isFinished; -}; - -typedef struct MicTestSub_24 { - UnkImageStruct *unk0; - u32 unk4; - VecFx32 unk8; - VecFx32 unk14; - fx32 unk20; // angle? - fx32 unk24; // dTheta? - fx32 unk28; // magnitude? - SysTask *task; -} MicTestSub_24; - -struct MicTestData { - SpriteRenderer *spriteRenderer; - SpriteGfxHandler *gfxHandler; - UnkImageStruct *unk8[7]; - MicTestSub_24 unk24[3]; - u32 unkB4; - MicTestSub_B8 unkB8; - MicTestSub_F0 unkF0; - MicTestTaskManager taskMan; - HeapID heapId; -}; - -BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state); -BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state); -BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state); -void MicTest_StartTask(MicTestTaskManager *a0, MicTestData *data, MicTestTask a2); -void MicTestTaskMan_Run(MicTestTaskManager *a0); -void MicTest_SetTask(MicTestTaskManager *a0, MicTestTask a1); -MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *a0); -u32 MicTestTaskMan_IsFinished(MicTestTaskManager *a0); -void MicTestTaskMan_Finish(MicTestTaskManager *a0); -void MicTestTask_FadeIn(MicTestTaskManager *a0, u32 *state); -void ov62_021E5B04(MicTestTaskManager *a0, u32 *state); -void ov62_021E5B6C(MicTestTaskManager *a0, u32 *state); -void ov62_021E5BB8(MicTestTaskManager *a0, u32 *state); -void ov62_021E5C20(MicTestTaskManager *a0, u32 *state); -void ov62_021E5C34(HeapID heapId); -void ov62_021E5C80(); -void MicTest_SetBanks(); -void MicTest_VBlankIntrCB(void *data); -void ov62_021E5CF4(MicTestData *micTest, HeapID heapId); -void ov62_021E5D54(MicTestData *micTest); -void MicTest_UpdateAnimations(MicTestData *micTest); -void MicTest_LoadResources(MicTestData *micTest); -void ov62_021E5FA0(MicTestData *micTest); -void ov62_021E5FC4(MicTestData *micTest); -void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId); -void ov62_021E6024(MicTestSub_B8 *a0); -void ov62_021E6048(MicTestSub_B8 *a0); -void ov62_021E60D4(MicTestSub_B8 *a0); -void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId); -void ov62_021E6178(MicTestSub_B8 *a0); -void ov62_021E61AC(MicTestSub_F0 *a0, HeapID heapId, MICCallback a2, MicTestData *micTest); -void ov62_021E61FC(MicTestSub_F0 *a0); -void ov62_021E620C(MicTestSub_F0 *a0); -void ov62_021E625C(MicTestSub_F0 *a0); -void ov62_021E6278(MicTestSub_F0 *a0); -s32 MicTest_AverageMicInput(MicTestSub_F0 *a0); -void MicTest_MicrophoneCallback(MICResult result, void *data); -u32 MicTest_GetVolumeBracket(u8); -u32 ov62_021E63D0(MicTestData *micTest); -BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y); -void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7); -void ov62_021E6570(SysTask *, void *); -int ov62_021E6620(); - -// Still in asm -void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId); -BOOL ov62_021E6630(MicTestData *micTest); -void ov62_021E6600(MicTestData *micTest); - extern const OVY_MGR_TEMPLATE gApplication_MicTest; #endif // POKEHEARTGOLD_MIC_TEST_H diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 62e5b4a479..6c2717df0c 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -15,8 +15,106 @@ #include "unk_0200FA24.h" #include "vram_transfer_manager.h" +typedef struct MicTestData MicTestData; +typedef struct MicTestTaskManager MicTestTaskManager; + +typedef void (*MicTestTask)(MicTestTaskManager *, u32 *); + +typedef struct MicTestInput { + MICAutoParam mic; + void *unk1C; + s32 curVolume; + u32 unk24; + u32 unk28; + u32 unk2C; + u32 unk30; + u32 unk34; +} MicTestInput; + +typedef struct MicTestSub_B8 { + BgConfig *bgConfig; + Window window[3]; + MsgData *msgData; +} MicTestSub_B8; + +struct MicTestTaskManager { + MicTestData *micTest; + MicTestTask task; + u32 state; + u32 isFinished; +}; + +typedef struct MicTestSub_24 { + UnkImageStruct *unk0; + u32 unk4; + VecFx32 unk8; + VecFx32 unk14; + fx32 unk20; // angle? + fx32 unk24; // dTheta? + fx32 unk28; // magnitude? + SysTask *task; +} MicTestSub_24; + +struct MicTestData { + SpriteRenderer *spriteRenderer; + SpriteGfxHandler *gfxHandler; + UnkImageStruct *unk8[7]; + MicTestSub_24 unk24[3]; + u32 unkB4; + MicTestSub_B8 unkB8; + MicTestInput unkF0; + MicTestTaskManager taskMan; + HeapID heapId; +}; + #define TS_HITBOX_MIC_TEST_RETURN 0 +static BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state); +static BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state); +static BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state); +static void MicTest_StartTask(MicTestTaskManager *a0, MicTestData *data, MicTestTask a2); +static void MicTestTaskMan_Run(MicTestTaskManager *a0); +static void MicTest_SetTask(MicTestTaskManager *a0, MicTestTask a1); +static MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *a0); +static u32 MicTestTaskMan_IsFinished(MicTestTaskManager *a0); +static void MicTestTaskMan_Finish(MicTestTaskManager *a0); +static void MicTestTask_FadeIn(MicTestTaskManager *a0, u32 *state); +static void ov62_021E5B04(MicTestTaskManager *a0, u32 *state); +static void ov62_021E5B6C(MicTestTaskManager *a0, u32 *state); +static void MicTestTask_FadeOut(MicTestTaskManager *taskMan, u32 *state); +static void MicTestTask_End(MicTestTaskManager *taskMan, u32 *state); +static void ov62_021E5C34(HeapID heapId); +static void ov62_021E5C80(); +static void MicTest_SetBanks(); +static void MicTest_VBlankIntrCB(void *data); +static void MicTest_InitSpriteRenderer(MicTestData *micTest, HeapID heapId); +static void MicTest_DeleteSpriteRenderer(MicTestData *micTest); +static void MicTest_UpdateAnimations(MicTestData *micTest); +static void MicTest_LoadResources(MicTestData *micTest); +static void ov62_021E5FA0(MicTestData *micTest); +static void ov62_021E5FC4(MicTestData *micTest); +static void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId); +static void ov62_021E6024(MicTestSub_B8 *a0); +static void ov62_021E6048(MicTestSub_B8 *a0); +static void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId); +static void ov62_021E60D4(MicTestSub_B8 *a0); +static void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId); +static void ov62_021E6178(MicTestSub_B8 *a0); +static void ov62_021E61AC(MicTestInput *input, HeapID heapId, MICCallback a2, MicTestData *micTest); +static void ov62_021E61FC(MicTestInput *input); +static void ov62_021E620C(MicTestInput *input); +static void ov62_021E625C(MicTestInput *input); +static void ov62_021E6278(MicTestInput *input); +static s32 MicTest_AverageMicInput(MicTestInput *input); +static void MicTest_MicrophoneCallback(MICResult result, void *data); +static u32 MicTest_GetVolumeBracket(u8); +static u32 ov62_021E63D0(MicTestData *micTest); +static BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y); +static void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7); +static void ov62_021E6570(SysTask *, void *); +static void MicTest_EndTasks(MicTestData *micTest); +static int MicTest_CheckReturn(MicTestData *data); + static const GraphicsBanks sMicTestGraphicsBanks = { .bg = GX_VRAM_BG_128_A, .bgextpltt = GX_VRAM_BGEXTPLTT_NONE, @@ -154,17 +252,15 @@ static const struct { const OVY_MGR_TEMPLATE gApplication_MicTest = { MicTest_Init, MicTest_Main, MicTest_Exit, FS_OVERLAY_ID_NONE }; -static void MicTestTask_FadeOut(MicTestTaskManager *taskMan, u32 *state); -static void MicTestTask_End(MicTestTaskManager *taskMan, u32 *state); - -static void MicTest_EndTasks(MicTestData *micTest); -static int MicTest_CheckReturn(MicTestData *data); - -BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state) { +static BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state) { CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 3 << 0x10); + MicTestData *micTest = OverlayManager_CreateAndGetData(overlayMan, sizeof(MicTestData), HEAP_ID_MIC_TEST); + MI_CpuFill8(micTest, 0, sizeof(MicTestData)); + micTest->heapId = HEAP_ID_MIC_TEST; + ov62_021E5C34(micTest->heapId); MicTest_SetBanks(); Main_SetVBlankIntrCB(MicTest_VBlankIntrCB, micTest); @@ -172,19 +268,22 @@ BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state) { ov62_021E5FD4(&micTest->unkB8, micTest->heapId); MicTest_LoadTextResources(&micTest->unkB8, micTest->heapId); ov62_021E60E4(&micTest->unkB8, micTest->heapId); - ov62_021E5CF4(micTest, micTest->heapId); + MicTest_InitSpriteRenderer(micTest, micTest->heapId); MicTest_LoadResources(micTest); ov62_021E61AC(&micTest->unkF0, micTest->heapId, MicTest_MicrophoneCallback, micTest); + MicTest_StartTask(&micTest->taskMan, micTest, MicTestTask_FadeIn); + GF_SndStartFadeOutBGM(0, 10); + return TRUE; } -BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state) { +static BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state) { MicTestData *micTest = OverlayManager_GetData(overlayMan); ov62_021E61FC(&micTest->unkF0); ov62_021E5FA0(micTest); - ov62_021E5D54(micTest); + MicTest_DeleteSpriteRenderer(micTest); ov62_021E6178(&micTest->unkB8); ov62_021E6024(&micTest->unkB8); ov62_021E5C80(); @@ -195,7 +294,7 @@ BOOL MicTest_Exit(OVY_MANAGER *overlayMan, int *state) { return TRUE; } -BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state) { +static BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state) { MicTestData *micTest = OverlayManager_GetData(overlayMan); if (MicTestTaskMan_IsFinished(&micTest->taskMan)) { return TRUE; @@ -207,36 +306,36 @@ BOOL MicTest_Main(OVY_MANAGER *overlayMan, int *state) { return FALSE; } -void MicTest_StartTask(MicTestTaskManager *taskMan, MicTestData *micTest, MicTestTask task) { +static void MicTest_StartTask(MicTestTaskManager *taskMan, MicTestData *micTest, MicTestTask task) { taskMan->micTest = micTest; taskMan->isFinished = FALSE; MicTest_SetTask(taskMan, task); } -void MicTestTaskMan_Run(MicTestTaskManager *taskMan) { +static void MicTestTaskMan_Run(MicTestTaskManager *taskMan) { if (MicTestTaskMan_IsFinished(taskMan) == 0) { taskMan->task(taskMan, &taskMan->state); } } -void MicTest_SetTask(MicTestTaskManager *taskMan, MicTestTask task) { +static void MicTest_SetTask(MicTestTaskManager *taskMan, MicTestTask task) { taskMan->task = task; taskMan->state = 0; } -MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *taskMan) { +static MicTestData *MicTestTaskMan_GetMicTestData(MicTestTaskManager *taskMan) { return taskMan->micTest; } -u32 MicTestTaskMan_IsFinished(MicTestTaskManager *taskMan) { +static u32 MicTestTaskMan_IsFinished(MicTestTaskManager *taskMan) { return taskMan->isFinished; } -void MicTestTaskMan_Finish(MicTestTaskManager *taskMan) { +static void MicTestTaskMan_Finish(MicTestTaskManager *taskMan) { taskMan->isFinished = TRUE; } -void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { +static void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { @@ -257,7 +356,7 @@ void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { } } -void ov62_021E5B04(MicTestTaskManager *taskMan, u32 *state) { +static void ov62_021E5B04(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { @@ -284,7 +383,7 @@ void ov62_021E5B04(MicTestTaskManager *taskMan, u32 *state) { } } -void ov62_021E5B6C(MicTestTaskManager *taskMan, u32 *state) { +static void ov62_021E5B6C(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { @@ -332,7 +431,7 @@ static void MicTestTask_End(MicTestTaskManager *taskMan, u32 *state) { MicTestTaskMan_Finish(taskMan); } -void ov62_021E5C34(HeapID heapId) { +static void ov62_021E5C34(HeapID heapId) { Main_SetVBlankIntrCB(NULL, NULL); HBlankInterruptDisable(); GfGfx_DisableEngineAPlanes(); @@ -344,7 +443,7 @@ void ov62_021E5C34(HeapID heapId) { GF_CreateVramTransferManager(0x20, heapId); } -void ov62_021E5C80() { +static void ov62_021E5C80() { GF_DestroyVramTransferManager(); Main_SetVBlankIntrCB(NULL, NULL); HBlankInterruptDisable(); @@ -354,7 +453,7 @@ void ov62_021E5C80() { GXS_SetVisiblePlane(0); } -void MicTest_SetBanks() { +static void MicTest_SetBanks() { GfGfx_SetBanks(&sMicTestGraphicsBanks); } @@ -364,7 +463,7 @@ typedef struct UnkStruct_27E0000 { u32 unk_3FF8; } UnkStruct_27E0000; -void MicTest_VBlankIntrCB(void *data) { +static void MicTest_VBlankIntrCB(void *data) { MicTestData *micTest = data; NNS_GfdDoVramTransfer(); ov62_021E5FC4(micTest); @@ -373,7 +472,7 @@ void MicTest_VBlankIntrCB(void *data) { unkStruct->unk_3FF8 |= 1; } -void ov62_021E5CF4(MicTestData *micTest, HeapID heapId) { +static void MicTest_InitSpriteRenderer(MicTestData *micTest, HeapID heapId) { SpriteRenderer *spriteRender = SpriteRenderer_Create(heapId); micTest->spriteRenderer = spriteRender; @@ -387,19 +486,19 @@ void ov62_021E5CF4(MicTestData *micTest, HeapID heapId) { GfGfx_EngineBTogglePlanes(GX_PLANEMASK_OBJ, GF_PLANE_TOGGLE_ON); } -void ov62_021E5D54(MicTestData *micTest) { +void MicTest_DeleteSpriteRenderer(MicTestData *micTest) { SpriteRenderer_Delete(micTest->spriteRenderer); micTest->spriteRenderer = NULL; } -void MicTest_UpdateAnimations(MicTestData *micTest) { +static void MicTest_UpdateAnimations(MicTestData *micTest) { for (u16 i = 0; i < 7; i++) { UnkImageStruct_TickSpriteAnimation1Frame(micTest->unk8[i]); } SpriteGfxHandler_RenderAndAnimateSprites(micTest->gfxHandler); } -void MicTest_LoadResources(MicTestData *micTest) { +static void MicTest_LoadResources(MicTestData *micTest) { SpriteRenderer_LoadPlttResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 6, 0, 1, NNS_G2D_VRAM_TYPE_2DMAIN, 0xA03); SpriteRenderer_LoadCellResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 8, 0, 0xA02); SpriteRenderer_LoadAnimResObjFromNarcId(micTest->spriteRenderer, micTest->gfxHandler, NARC_a_1_7_6, 9, 0, 0xA04); @@ -434,7 +533,7 @@ void MicTest_LoadResources(MicTestData *micTest) { micTest->unkB4 = 10; } -void ov62_021E5FA0(MicTestData *micTest) { +static void ov62_021E5FA0(MicTestData *micTest) { for (int i = 0; i < 7; i++) { if (micTest->unk8[i] != NULL) { UnkImageStruct_Delete(micTest->unk8[i]); @@ -443,13 +542,13 @@ void ov62_021E5FA0(MicTestData *micTest) { SpriteRenderer_UnloadResourcesAndRemoveGfxHandler(micTest->spriteRenderer, micTest->gfxHandler); } -void ov62_021E5FC4(MicTestData *micTest) { +static void ov62_021E5FC4(MicTestData *micTest) { if (micTest->spriteRenderer != NULL) { thunk_OamManager_ApplyAndResetBuffers(); } } -void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { +static void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { a0->bgConfig = BgConfig_Alloc(heapId); SetBothScreensModesAndDisable(&sMicTestGraphicsMode); @@ -460,17 +559,17 @@ void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { } } -void ov62_021E6024(MicTestSub_B8 *a0) { +static void ov62_021E6024(MicTestSub_B8 *a0) { for (u32 i = 0; i < 5; i++) { FreeBgTilemapBuffer(a0->bgConfig, ov62_021E6728[i].unk1C); } FreeToHeap(a0->bgConfig); } -void ov62_021E6048(MicTestSub_B8 *a0) { +static void ov62_021E6048(MicTestSub_B8 *a0) { } -void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId) { +static void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId) { GfGfxLoader_GXLoadPal(NARC_a_1_7_6, 0, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 32, heapId); GfGfxLoader_LoadCharData(NARC_a_1_7_6, 4, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); GfGfxLoader_LoadScrnData(NARC_a_1_7_6, 5, a0->bgConfig, GF_BG_LYR_SUB_1, 0, 0, 0, heapId); @@ -480,13 +579,13 @@ void MicTest_LoadTextResources(MicTestSub_B8 *a0, HeapID heapId) { GfGfxLoader_LoadScrnData(NARC_a_1_7_6, 3, a0->bgConfig, GF_BG_LYR_MAIN_1, 0, 0, 0, heapId); } -void ov62_021E60D4(MicTestSub_B8 *a0) { +static void ov62_021E60D4(MicTestSub_B8 *a0) { if (a0->bgConfig != NULL) { DoScheduledBgGpuUpdates(a0->bgConfig); } } -void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { +static void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { a0->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, 0xea, heapId); for (int i = 0; i < 3; i++) { @@ -500,7 +599,7 @@ void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { } } -void ov62_021E6178(MicTestSub_B8 *a0) { +static void ov62_021E6178(MicTestSub_B8 *a0) { for (int i = 0; i < 3; i++) { ClearWindowTilemapAndCopyToVram(&a0->window[i]); FillWindowPixelBuffer(&a0->window[i], 0); @@ -510,75 +609,75 @@ void ov62_021E6178(MicTestSub_B8 *a0) { DestroyMsgData(a0->msgData); } -void ov62_021E61AC(MicTestSub_F0 *a0, HeapID heapId, MICCallback a2, MicTestData *micTest) { +static void ov62_021E61AC(MicTestInput *input, HeapID heapId, MICCallback a2, MicTestData *micTest) { Sys_SetSleepDisableFlag(8); void *data = AllocFromHeap(heapId, 0x120); MI_CpuFill8(data, 0, 0x120); - a0->unk1C = data; + input->unk1C = data; - a0->mic.type = MIC_SAMPLING_TYPE_8BIT; - a0->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? - a0->mic.size = (1 << 8); - a0->mic.rate = 0x1040; - a0->mic.loop_enable = TRUE; - a0->mic.full_callback = a2; - a0->mic.full_arg = micTest; + input->mic.type = MIC_SAMPLING_TYPE_8BIT; + input->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? + input->mic.size = (1 << 8); + input->mic.rate = 0x1040; + input->mic.loop_enable = TRUE; + input->mic.full_callback = a2; + input->mic.full_arg = micTest; - a0->unk34 = sub_02005518(); + input->unk34 = sub_02005518(); } -void ov62_021E61FC(MicTestSub_F0 *a0) { - FreeToHeap(a0->unk1C); +static void ov62_021E61FC(MicTestInput *input) { + FreeToHeap(input->unk1C); Sys_ClearSleepDisableFlag(8); } -void ov62_021E620C(MicTestSub_F0 *a0) { +static void ov62_021E620C(MicTestInput *input) { u32 next = sub_02005518(); - if (next == 0 || a0->unk34 == 0) { - if (a0->unk30 == 0) { - if (a0->unk28) { - ov62_021E6278(a0); - a0->unk2C = 1; + if (next == 0 || input->unk34 == 0) { + if (input->unk30 == 0) { + if (input->unk28) { + ov62_021E6278(input); + input->unk2C = 1; } - a0->unk30 = 1; + input->unk30 = 1; } - if (next != 0 && a0->unk34 == 0) { - a0->unk30 = 0; + if (next != 0 && input->unk34 == 0) { + input->unk30 = 0; - if (a0->unk2C) { - ov62_021E625C(a0); - a0->unk2C = 0; + if (input->unk2C) { + ov62_021E625C(input); + input->unk2C = 0; } } } - a0->unk34 = next; + input->unk34 = next; } -void ov62_021E625C(MicTestSub_F0 *a0) { - if (a0->unk30 == 0) { - GF_MIC_StartAutoSampling(&a0->mic); - a0->unk28 = 1; +static void ov62_021E625C(MicTestInput *input) { + if (input->unk30 == 0) { + GF_MIC_StartAutoSampling(&input->mic); + input->unk28 = 1; } else { - a0->unk2C = 1; + input->unk2C = 1; } } -void ov62_021E6278(MicTestSub_F0 *a0) { +static void ov62_021E6278(MicTestInput *input) { GF_MIC_StopAutoSampling(); - a0->unk28 = 0; + input->unk28 = 0; } -s32 MicTest_AverageMicInput(MicTestSub_F0 *a0) { +static s32 MicTest_AverageMicInput(MicTestInput *input) { int i; u8 *buffer; int cnt = 0; - int size = a0->mic.size - 1; - buffer = a0->mic.buffer; + int size = input->mic.size - 1; + buffer = input->mic.buffer; for (i = 0; i < size; i++) { if (buffer[i] < 0x80) { @@ -594,14 +693,14 @@ static struct { u32 unk0; } _021E68E0; -void MicTest_MicrophoneCallback(MICResult result, void *data) { +static void MicTest_MicrophoneCallback(MICResult result, void *data) { MicTestData *micTest = data; if (result != MIC_RESULT_SUCCESS) { return; } - MicTestSub_F0 *unkF0 = &micTest->unkF0; + MicTestInput *unkF0 = &micTest->unkF0; s32 volumeAvg = MicTest_AverageMicInput(unkF0); u32 volume; @@ -642,7 +741,7 @@ void MicTest_MicrophoneCallback(MICResult result, void *data) { _021E68E0.unk0++; } -u32 MicTest_GetVolumeBracket(u8 volume) { +static u32 MicTest_GetVolumeBracket(u8 volume) { u32 ret; if (volume <= 0x8C) { @@ -662,7 +761,7 @@ u32 MicTest_GetVolumeBracket(u8 volume) { return ret; } -u32 ov62_021E63D0(MicTestData *micTest) { +static u32 ov62_021E63D0(MicTestData *micTest) { for (int i = 0; i < 3; i++) { if (micTest->unk24[i].task) { return 0; @@ -671,7 +770,7 @@ u32 ov62_021E63D0(MicTestData *micTest) { return 1; } -BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { +static BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { UnkImageStruct *flag = 0; MicTestSub_24 *args = NULL; for (int i = 0; i < 3; i++) { @@ -693,7 +792,7 @@ BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { return FALSE; } -void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7) { +static void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, s32 r1, s32 r2, BOOL a7) { args->task = SysTask_CreateOnMainQueue(ov62_021E6570, args, 0); MicTestSub_24 *data = SysTask_GetData(args->task); @@ -717,7 +816,7 @@ void ov62_021E6480(UnkImageStruct *a0, MicTestSub_24 *args, s16 x, s16 y, s32 z, UnkImageStruct_SetSpritePositionXY(data->unk0, x, y); } -void ov62_021E6570(SysTask *task, void *_data) { +static void ov62_021E6570(SysTask *task, void *_data) { MicTestSub_24 *data = _data; if (data->unk4) { From 64fd6ed6cf70e5ab1896a305c2c56e843243b4dc Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Mon, 30 Sep 2024 20:10:05 -0400 Subject: [PATCH 08/15] Fix local git clang-format --- .githooks/pre-commit | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .githooks/pre-commit diff --git a/.githooks/pre-commit b/.githooks/pre-commit new file mode 100644 index 0000000000..7eb20ecf41 --- /dev/null +++ b/.githooks/pre-commit @@ -0,0 +1,9 @@ +#!/bin/sh +# Redirect output to stderr. +exec 1>&2 + +# Run clang-format on staged files; abort the commit if any files are changed +if ! git clang-format --extensions c,cpp,h,hpp ; then + echo "linting made changes to source files; aborting commit" + exit 1 +fi From cd13953dd832b00b4b4bb2753e6946f3f9d79ff5 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:28:25 -0400 Subject: [PATCH 09/15] Update CONTRIBUTING.md to reflect clang-format-18 as required --- CONTRIBUTING.md | 2 +- include/constants/items.h | 4 +- include/constants/std_script.h | 4 +- include/credits/data.h | 676 ++++++++-------- include/pokedex.h | 4 +- src/alph_puzzle.c | 34 +- src/application/view_photo.c | 6 +- src/application/view_rankings.c | 8 +- src/battle/battle_controller_player.c | 26 +- src/battle/battle_cursor.c | 2 +- src/battle/battle_finger.c | 2 +- src/battle/overlay_12_0224E4FC.c | 316 ++++---- src/berry_pots_app.c | 26 +- src/berry_pots_app_tasks.c | 2 +- src/certificates_app.c | 10 +- src/credits/data1.c | 8 +- src/data/fieldmap/hidden_items.h | 462 +++++------ src/easy_chat.c | 36 +- src/field/headbutt.c | 80 +- src/field/legend_cutscene_camera.c | 18 +- src/field/scrcmd_pokemon_misc.c | 10 +- src/field_move.c | 28 +- src/field_roamer.c | 86 +- src/field_system_rtc_weather.c | 16 +- src/field_take_photo.c | 12 +- src/field_use_item.c | 60 +- src/field_warp_tasks.c | 12 +- src/fieldmap.c | 60 +- src/font.c | 26 +- src/font_data.c | 4 +- src/get_egg.c | 18 +- src/gymmick_init.c | 30 +- src/intro_movie_scene_3.c | 10 +- src/intro_movie_scene_4.c | 6 +- src/item.c | 1074 ++++++++++++------------- src/mail.c | 14 +- src/map_preview_graphic.c | 50 +- src/message_printer.c | 14 +- src/oaks_speech.c | 20 +- src/options_app.c | 54 +- src/overlay_25.c | 36 +- src/overlay_26_022598C0.c | 126 +-- src/overlay_94.c | 12 +- src/overlay_mic_test.c | 16 +- src/party_context_menu.c | 172 ++-- src/party_menu.c | 84 +- src/pokemon.c | 240 +++--- src/pokepic.c | 474 +++++------ src/register_hall_of_fame.c | 96 +-- src/ribbon.c | 160 ++-- src/safari_zone.c | 20 +- src/save_misc.c | 6 +- src/save_rankings.c | 6 +- src/save_wifi_history.c | 2 +- src/scrcmd_20.c | 94 +-- src/scrcmd_c.c | 20 +- src/scrcmd_dppl_prizes.c | 38 +- src/scrcmd_fossils.c | 14 +- src/scrcmd_mart.c | 382 ++++----- src/scrcmd_move_tutor.c | 104 +-- src/scrcmd_mystery_gift.c | 30 +- src/scrcmd_size_record.c | 32 +- src/start_menu.c | 30 +- src/sys_flags.c | 26 +- src/system.c | 8 +- src/trainer_memo.c | 12 +- src/unk_02013FDC.c | 24 +- src/unk_0204B538.c | 158 ++-- src/unk_0205B3DC.c | 52 +- src/unk_02091054.c | 162 ++-- src/unk_02097F6C.c | 40 +- src/voltorb_flip/voltorb_flip_data2.c | 20 +- src/voltorb_flip/voltorb_flip_data3.c | 32 +- src/voltorb_flip/voltorb_flip_data4.c | 208 ++--- src/voltorb_flip/voltorb_flip_data5.c | 10 +- src/yes_no_prompt.c | 4 +- 76 files changed, 3140 insertions(+), 3140 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1b00eda0b..79ae2dc11e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ This repository includes an opinionated `clang-format` specification to ensure t ### Requirements -- `clang-format@17` or newer +- `clang-format@18` or newer ### Usage diff --git a/include/constants/items.h b/include/constants/items.h index b6237ef68b..d2fa30797d 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -389,7 +389,7 @@ #define FIRST_MULCH_IDX ITEM_GROWTH_MULCH #define LAST_MULCH_IDX ITEM_GOOEY_MULCH #define NUM_MULCHES (LAST_MULCH_IDX - FIRST_MULCH_IDX + 1) -#define MULCH_IDX(mulch) ((mulch)-FIRST_MULCH_IDX + 1) +#define MULCH_IDX(mulch) ((mulch) - FIRST_MULCH_IDX + 1) #define MULCH_NONE 0 // Unused @@ -506,7 +506,7 @@ #define FIRST_BERRY_IDX ITEM_CHERI_BERRY #define LAST_BERRY_IDX ITEM_ROWAP_BERRY #define NUM_BERRIES (LAST_BERRY_IDX - FIRST_BERRY_IDX + 1) -#define BERRY_IDX(berry) ((berry)-FIRST_BERRY_IDX + 1) +#define BERRY_IDX(berry) ((berry) - FIRST_BERRY_IDX + 1) #define BERRY_NONE 0 // Battle Held items diff --git a/include/constants/std_script.h b/include/constants/std_script.h index d171a336a4..c94521a925 100644 --- a/include/constants/std_script.h +++ b/include/constants/std_script.h @@ -79,11 +79,11 @@ #define std_apricorn_tree 2800 #define _std_npc_trainer 3000 -#define std_trainer(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer) +#define std_trainer(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer) #define std_trainer_approach std_trainer(LAST_TRAINER_INDEX) #define _std_npc_trainer_2 5000 -#define std_trainer_2(trainer) ((trainer)-FIRST_TRAINER_INDEX + _std_npc_trainer_2) +#define std_trainer_2(trainer) ((trainer) - FIRST_TRAINER_INDEX + _std_npc_trainer_2) #define _std_item_ball 7000 #define std_itemball_r29_potion 7000 diff --git a/include/credits/data.h b/include/credits/data.h index 87cdd7310a..c58c51cf2f 100644 --- a/include/credits/data.h +++ b/include/credits/data.h @@ -72,11 +72,11 @@ static const int sSceneTransitionTimings[5] = { 890, 1780, 2615, 3030, 4295 }; static const int sScreenFlipTimings[5] = { 890, 1780, 2615, 3030, 4295 }; static const ScrnFileIds ov76_021E6F00 = { - {0x08, 0x12, 0x0A, 0x10, 0x0E, 0x0C}, + { 0x08, 0x12, 0x0A, 0x10, 0x0E, 0x0C }, }; static const ScrnFileIds ov76_021E6EE8 = { - {0x07, 0x11, 0x09, 0x0F, 0x0D, 0x0B}, + { 0x07, 0x11, 0x09, 0x0F, 0x0D, 0x0B }, }; static const BgTemplate ov76_021E6F50 = { @@ -189,348 +189,348 @@ static const GraphicsBanks sCreditsGraphicsBanks = { }; static const PageTiming sPageTimings[NUM_CREDIT_PAGES] = { - {0, 105}, - { 110, 105}, - { 220, 105}, - { 330, 105}, - { 440, 105}, - { 550, 105}, - { 660, 115}, - { 779, 109}, - { 894, 115}, - { 1012, 109}, - { 1125, 102}, - { 1232, 102}, - { 1339, 110}, - { 1454, 105}, - { 1565, 105}, - { 1676, 100}, - { 1787, 105}, - { 1898, 105}, - { 2009, 105}, - { 2120, 120}, - { 2245, 120}, - { 2370, 120}, - { 2495, 110}, - { 2620, 125}, - { 2750, 110}, - { 2865, 160}, - { 3035, 100}, - { 3140, 100}, - { 3245, 125}, - { 3375, 100}, - { 3480, 115}, - { 3598, 115}, - { 3716, 115}, - { 3834, 115}, - { 3952, 115}, - { 4070, 115}, - { 4188, 105}, - { 4300, 110}, - { 4415, 110}, - { 4530, 127}, - { 4660, 107}, - { 4770, 107}, - { 4880, 107}, + { 0, 105 }, + { 110, 105 }, + { 220, 105 }, + { 330, 105 }, + { 440, 105 }, + { 550, 105 }, + { 660, 115 }, + { 779, 109 }, + { 894, 115 }, + { 1012, 109 }, + { 1125, 102 }, + { 1232, 102 }, + { 1339, 110 }, + { 1454, 105 }, + { 1565, 105 }, + { 1676, 100 }, + { 1787, 105 }, + { 1898, 105 }, + { 2009, 105 }, + { 2120, 120 }, + { 2245, 120 }, + { 2370, 120 }, + { 2495, 110 }, + { 2620, 125 }, + { 2750, 110 }, + { 2865, 160 }, + { 3035, 100 }, + { 3140, 100 }, + { 3245, 125 }, + { 3375, 100 }, + { 3480, 115 }, + { 3598, 115 }, + { 3716, 115 }, + { 3834, 115 }, + { 3952, 115 }, + { 4070, 115 }, + { 4188, 105 }, + { 4300, 110 }, + { 4415, 110 }, + { 4530, 127 }, + { 4660, 107 }, + { 4770, 107 }, + { 4880, 107 }, }; static const GfGfxFileIds sCutsceneSpriteGfxFileIds[42] = { - {0x96, 0x17, 0x18, 0x19}, - { 0x97, 0x1A, 0x1B, 0x1C}, - { 0x98, 0x1D, 0x1E, 0x1F}, - { 0x99, 0x20, 0x21, 0x22}, - { 0x9A, 0x23, 0x24, 0x25}, - { 0x9B, 0x26, 0x27, 0x28}, - { 0x9C, 0x29, 0x2A, 0x2B}, - { 0x9D, 0x2C, 0x2D, 0x2E}, - { 0x9E, 0x2F, 0x30, 0x31}, - { 0x9F, 0x32, 0x33, 0x34}, - { 0xA0, 0x35, 0x36, 0x37}, - { 0xA1, 0x38, 0x39, 0x3A}, - { 0xA2, 0x3B, 0x3C, 0x3D}, - { 0xA3, 0x3E, 0x3F, 0x40}, - { 0xA4, 0x41, 0x42, 0x43}, - { 0xA5, 0x44, 0x45, 0x46}, - { 0xA6, 0x47, 0x48, 0x49}, - { 0xA7, 0x4A, 0x4B, 0x4C}, - { 0xA8, 0x4D, 0x4E, 0x4F}, - { 0xA9, 0x50, 0x51, 0x52}, - { 0xAA, 0x53, 0x54, 0x55}, - { 0xAB, 0x56, 0x57, 0x58}, - { 0xAC, 0x59, 0x5A, 0x5B}, - { 0xAD, 0x5C, 0x5D, 0x5E}, - { 0xAE, 0x5F, 0x60, 0x61}, - { 0xAF, 0x62, 0x63, 0x64}, - { 0xB0, 0x65, 0x66, 0x67}, - { 0xB1, 0x68, 0x69, 0x6A}, - { 0xB2, 0x6B, 0x6C, 0x6D}, - { 0xB3, 0x6E, 0x6F, 0x70}, - { 0xB4, 0x71, 0x72, 0x73}, - { 0xB5, 0x74, 0x75, 0x76}, - { 0xB6, 0x77, 0x78, 0x79}, - { 0xB7, 0x7A, 0x7B, 0x7C}, - { 0xB8, 0x7D, 0x7E, 0x7F}, - { 0xB9, 0x80, 0x81, 0x82}, - { 0xBA, 0x83, 0x84, 0x85}, - { 0xBB, 0x86, 0x87, 0x88}, - { 0xBC, 0x89, 0x8A, 0x8B}, - { 0xBD, 0x8C, 0x8D, 0x8E}, - { 0xBE, 0x8F, 0x90, 0x91}, - { 0xBF, 0x92, 0x93, 0x94}, + { 0x96, 0x17, 0x18, 0x19 }, + { 0x97, 0x1A, 0x1B, 0x1C }, + { 0x98, 0x1D, 0x1E, 0x1F }, + { 0x99, 0x20, 0x21, 0x22 }, + { 0x9A, 0x23, 0x24, 0x25 }, + { 0x9B, 0x26, 0x27, 0x28 }, + { 0x9C, 0x29, 0x2A, 0x2B }, + { 0x9D, 0x2C, 0x2D, 0x2E }, + { 0x9E, 0x2F, 0x30, 0x31 }, + { 0x9F, 0x32, 0x33, 0x34 }, + { 0xA0, 0x35, 0x36, 0x37 }, + { 0xA1, 0x38, 0x39, 0x3A }, + { 0xA2, 0x3B, 0x3C, 0x3D }, + { 0xA3, 0x3E, 0x3F, 0x40 }, + { 0xA4, 0x41, 0x42, 0x43 }, + { 0xA5, 0x44, 0x45, 0x46 }, + { 0xA6, 0x47, 0x48, 0x49 }, + { 0xA7, 0x4A, 0x4B, 0x4C }, + { 0xA8, 0x4D, 0x4E, 0x4F }, + { 0xA9, 0x50, 0x51, 0x52 }, + { 0xAA, 0x53, 0x54, 0x55 }, + { 0xAB, 0x56, 0x57, 0x58 }, + { 0xAC, 0x59, 0x5A, 0x5B }, + { 0xAD, 0x5C, 0x5D, 0x5E }, + { 0xAE, 0x5F, 0x60, 0x61 }, + { 0xAF, 0x62, 0x63, 0x64 }, + { 0xB0, 0x65, 0x66, 0x67 }, + { 0xB1, 0x68, 0x69, 0x6A }, + { 0xB2, 0x6B, 0x6C, 0x6D }, + { 0xB3, 0x6E, 0x6F, 0x70 }, + { 0xB4, 0x71, 0x72, 0x73 }, + { 0xB5, 0x74, 0x75, 0x76 }, + { 0xB6, 0x77, 0x78, 0x79 }, + { 0xB7, 0x7A, 0x7B, 0x7C }, + { 0xB8, 0x7D, 0x7E, 0x7F }, + { 0xB9, 0x80, 0x81, 0x82 }, + { 0xBA, 0x83, 0x84, 0x85 }, + { 0xBB, 0x86, 0x87, 0x88 }, + { 0xBC, 0x89, 0x8A, 0x8B }, + { 0xBD, 0x8C, 0x8D, 0x8E }, + { 0xBE, 0x8F, 0x90, 0x91 }, + { 0xBF, 0x92, 0x93, 0x94 }, }; static const CreditMsgLine sCreditMsgLines[251] = { - {0x0000, 0x00, 0x46, 0x00}, - { 0x0001, 0x14, 0x50, 0x03}, - { 0x0001, 0x28, 0x60, 0x04}, - { 0x0002, 0x14, 0x14, 0x05}, - { 0x0002, 0x28, 0x24, 0x06}, - { 0x0002, 0x14, 0x3C, 0x07}, - { 0x0002, 0x28, 0x4C, 0x08}, - { 0x0002, 0x14, 0x64, 0x09}, - { 0x0002, 0x28, 0x74, 0x0A}, - { 0x0002, 0x14, 0x8C, 0x0B}, - { 0x0002, 0x28, 0x9C, 0x0C}, - { 0x0003, 0x14, 0x28, 0x0D}, - { 0x0003, 0x28, 0x38, 0x0E}, - { 0x0003, 0x28, 0x48, 0x0F}, - { 0x0003, 0x28, 0x58, 0x10}, - { 0x0003, 0x28, 0x68, 0x11}, - { 0x0003, 0x28, 0x78, 0x12}, - { 0x0003, 0x28, 0x88, 0x13}, - { 0x0004, 0x14, 0x20, 0x14}, - { 0x0004, 0x14, 0x30, 0x15}, - { 0x0004, 0x14, 0x40, 0x16}, - { 0x0004, 0x28, 0x50, 0x17}, - { 0x0004, 0x28, 0x60, 0x18}, - { 0x0004, 0x28, 0x70, 0x19}, - { 0x0004, 0x28, 0x80, 0x1A}, - { 0x0004, 0x28, 0x90, 0x1B}, - { 0x0005, 0x28, 0x20, 0x1C}, - { 0x0005, 0x28, 0x30, 0x1D}, - { 0x0005, 0x28, 0x40, 0x1E}, - { 0x0005, 0x28, 0x50, 0x1F}, - { 0x0005, 0x28, 0x60, 0x20}, - { 0x0005, 0x28, 0x70, 0x21}, - { 0x0005, 0x28, 0x80, 0x22}, - { 0x0005, 0x28, 0x90, 0x23}, - { 0x0006, 0x14, 0x18, 0x24}, - { 0x0006, 0x28, 0x28, 0x25}, - { 0x0006, 0x28, 0x38, 0x26}, - { 0x0006, 0x28, 0x48, 0x27}, - { 0x0006, 0x28, 0x58, 0x28}, - { 0x0006, 0x28, 0x68, 0x29}, - { 0x0006, 0x28, 0x78, 0x2A}, - { 0x0006, 0x28, 0x88, 0x2B}, - { 0x0006, 0x28, 0x98, 0x2C}, - { 0x0007, 0x14, 0x08, 0x2D}, - { 0x0007, 0x28, 0x18, 0x2E}, - { 0x0007, 0x28, 0x28, 0x2F}, - { 0x0007, 0x28, 0x38, 0x30}, - { 0x0007, 0x28, 0x48, 0x31}, - { 0x0007, 0x14, 0x60, 0x32}, - { 0x0007, 0x28, 0x70, 0x33}, - { 0x0007, 0x28, 0x80, 0x34}, - { 0x0007, 0x14, 0x98, 0x35}, - { 0x0007, 0x28, 0xA8, 0x36}, - { 0x0008, 0x14, 0x30, 0x37}, - { 0x0008, 0x28, 0x40, 0x38}, - { 0x0008, 0x28, 0x50, 0x39}, - { 0x0008, 0x28, 0x60, 0x3A}, - { 0x0008, 0x28, 0x70, 0x3B}, - { 0x0008, 0x28, 0x80, 0x3C}, - { 0x0009, 0x28, 0x28, 0x3D}, - { 0x0009, 0x28, 0x38, 0x3E}, - { 0x0009, 0x28, 0x48, 0x3F}, - { 0x0009, 0x28, 0x58, 0x40}, - { 0x0009, 0x28, 0x68, 0x41}, - { 0x0009, 0x28, 0x78, 0x42}, - { 0x0009, 0x28, 0x88, 0x43}, - { 0x000A, 0x14, 0x40, 0x44}, - { 0x000A, 0x28, 0x50, 0x45}, - { 0x000A, 0x28, 0x60, 0x46}, - { 0x000A, 0x28, 0x70, 0x47}, - { 0x000B, 0x14, 0x40, 0x48}, - { 0x000B, 0x28, 0x50, 0x49}, - { 0x000B, 0x28, 0x60, 0x4A}, - { 0x000B, 0x28, 0x70, 0x4B}, - { 0x000C, 0x14, 0x48, 0x4C}, - { 0x000C, 0x28, 0x58, 0x4D}, - { 0x000C, 0x28, 0x68, 0x4E}, - { 0x000D, 0x14, 0x30, 0x4F}, - { 0x000D, 0x28, 0x40, 0x50}, - { 0x000D, 0x28, 0x50, 0x51}, - { 0x000D, 0x28, 0x60, 0x52}, - { 0x000D, 0x28, 0x70, 0x53}, - { 0x000D, 0x28, 0x80, 0x54}, - { 0x000E, 0x14, 0x38, 0x55}, - { 0x000E, 0x28, 0x48, 0x56}, - { 0x000E, 0x28, 0x58, 0x57}, - { 0x000E, 0x28, 0x68, 0x58}, - { 0x000E, 0x28, 0x78, 0x59}, - { 0x000F, 0x14, 0x28, 0x5A}, - { 0x000F, 0x28, 0x38, 0x5B}, - { 0x000F, 0x28, 0x48, 0x5C}, - { 0x000F, 0x28, 0x58, 0x5D}, - { 0x000F, 0x28, 0x68, 0x5E}, - { 0x000F, 0x28, 0x78, 0x5F}, - { 0x000F, 0x28, 0x88, 0x60}, - { 0x0010, 0x28, 0x28, 0x61}, - { 0x0010, 0x28, 0x38, 0x62}, - { 0x0010, 0x28, 0x48, 0x63}, - { 0x0010, 0x28, 0x58, 0x64}, - { 0x0010, 0x28, 0x68, 0x65}, - { 0x0010, 0x28, 0x78, 0x66}, - { 0x0010, 0x28, 0x88, 0x67}, - { 0x0011, 0x28, 0x28, 0x68}, - { 0x0011, 0x28, 0x38, 0x69}, - { 0x0011, 0x28, 0x48, 0x6A}, - { 0x0011, 0x28, 0x58, 0x6B}, - { 0x0011, 0x28, 0x68, 0x6C}, - { 0x0011, 0x28, 0x78, 0x6D}, - { 0x0011, 0x28, 0x88, 0x6E}, - { 0x0012, 0x14, 0x50, 0x6F}, - { 0x0012, 0x28, 0x60, 0x70}, - { 0x0013, 0x14, 0x48, 0x71}, - { 0x0013, 0x28, 0x58, 0x72}, - { 0x0013, 0x28, 0x68, 0x73}, - { 0x0014, 0x14, 0x24, 0x74}, - { 0x0014, 0x28, 0x34, 0x75}, - { 0x0014, 0x28, 0x44, 0x76}, - { 0x0014, 0x14, 0x5C, 0x77}, - { 0x0014, 0x28, 0x6C, 0x78}, - { 0x0014, 0x28, 0x7C, 0x79}, - { 0x0014, 0x28, 0x8C, 0x7A}, - { 0x0015, 0x14, 0x40, 0x7B}, - { 0x0015, 0x28, 0x50, 0x7C}, - { 0x0015, 0x28, 0x60, 0x7D}, - { 0x0015, 0x28, 0x70, 0x7E}, - { 0x0016, 0x14, 0x40, 0x7F}, - { 0x0016, 0x28, 0x50, 0x80}, - { 0x0016, 0x28, 0x60, 0x81}, - { 0x0016, 0x28, 0x70, 0x82}, - { 0x0017, 0x14, 0x30, 0x83}, - { 0x0017, 0x28, 0x40, 0x84}, - { 0x0017, 0x28, 0x50, 0x85}, - { 0x0017, 0x28, 0x60, 0x86}, - { 0x0017, 0x28, 0x70, 0x87}, - { 0x0017, 0x28, 0x80, 0x88}, - { 0x0018, 0x28, 0x30, 0x89}, - { 0x0018, 0x28, 0x40, 0x8A}, - { 0x0018, 0x28, 0x50, 0x8B}, - { 0x0018, 0x28, 0x60, 0x8C}, - { 0x0018, 0x28, 0x70, 0x8D}, - { 0x0018, 0x28, 0x80, 0x8E}, - { 0x0019, 0x14, 0x40, 0x8F}, - { 0x0019, 0x28, 0x50, 0x90}, - { 0x0019, 0x28, 0x60, 0x91}, - { 0x0019, 0x28, 0x70, 0x92}, - { 0x001A, 0x14, 0x10, 0x93}, - { 0x001A, 0x28, 0x20, 0x94}, - { 0x001A, 0x28, 0x30, 0x95}, - { 0x001A, 0x28, 0x40, 0x96}, - { 0x001A, 0x28, 0x50, 0x97}, - { 0x001A, 0x28, 0x60, 0x98}, - { 0x001A, 0x28, 0x70, 0x99}, - { 0x001A, 0x28, 0x80, 0x9A}, - { 0x001A, 0x28, 0x90, 0x9B}, - { 0x001A, 0x28, 0xA0, 0x9C}, - { 0x001B, 0x14, 0x3C, 0x9D}, - { 0x001B, 0x14, 0x54, 0x9E}, - { 0x001B, 0x28, 0x64, 0x9F}, - { 0x001B, 0x28, 0x74, 0xA0}, - { 0x001C, 0x14, 0x50, 0xA1}, - { 0x001C, 0x28, 0x60, 0xA2}, - { 0x001D, 0x14, 0x18, 0xA3}, - { 0x001D, 0x28, 0x28, 0xA4}, - { 0x001D, 0x28, 0x38, 0xA5}, - { 0x001D, 0x28, 0x48, 0xA6}, - { 0x001D, 0x28, 0x58, 0xA7}, - { 0x001D, 0x28, 0x68, 0xA8}, - { 0x001D, 0x28, 0x78, 0xA9}, - { 0x001D, 0x28, 0x88, 0xAA}, - { 0x001D, 0x28, 0x98, 0xAB}, - { 0x001E, 0x14, 0x14, 0xAC}, - { 0x001E, 0x28, 0x24, 0xAD}, - { 0x001E, 0x14, 0x3C, 0xAE}, - { 0x001E, 0x28, 0x4C, 0xAF}, - { 0x001E, 0x14, 0x64, 0xB0}, - { 0x001E, 0x28, 0x74, 0xB1}, - { 0x001E, 0x14, 0x8C, 0xB2}, - { 0x001E, 0x28, 0x9C, 0xB3}, - { 0x001F, 0x14, 0x0C, 0xB4}, - { 0x001F, 0x28, 0x1C, 0xB5}, - { 0x001F, 0x28, 0x2C, 0xB6}, - { 0x001F, 0x28, 0x3C, 0xB7}, - { 0x001F, 0x28, 0x4C, 0xB8}, - { 0x001F, 0x28, 0x5C, 0xB9}, - { 0x001F, 0x28, 0x6C, 0xBA}, - { 0x001F, 0x28, 0x7C, 0xBB}, - { 0x001F, 0x14, 0x94, 0xBC}, - { 0x001F, 0x28, 0xA4, 0xBD}, - { 0x0020, 0x14, 0x10, 0xBE}, - { 0x0020, 0x28, 0x20, 0xBF}, - { 0x0020, 0x28, 0x30, 0xC0}, - { 0x0020, 0x28, 0x40, 0xC1}, - { 0x0020, 0x28, 0x50, 0xC2}, - { 0x0020, 0x28, 0x60, 0xC3}, - { 0x0020, 0x28, 0x70, 0xC4}, - { 0x0020, 0x28, 0x80, 0xC5}, - { 0x0020, 0x28, 0x90, 0xC6}, - { 0x0020, 0x28, 0xA0, 0xC7}, - { 0x0021, 0x28, 0x10, 0xC8}, - { 0x0021, 0x28, 0x20, 0xC9}, - { 0x0021, 0x28, 0x30, 0xCA}, - { 0x0021, 0x28, 0x40, 0xCB}, - { 0x0021, 0x28, 0x50, 0xCC}, - { 0x0021, 0x28, 0x60, 0xCD}, - { 0x0021, 0x28, 0x70, 0xCE}, - { 0x0021, 0x28, 0x80, 0xCF}, - { 0x0021, 0x28, 0x90, 0xD0}, - { 0x0021, 0x28, 0xA0, 0xD1}, - { 0x0022, 0x28, 0x10, 0xD2}, - { 0x0022, 0x28, 0x20, 0xD3}, - { 0x0022, 0x28, 0x30, 0xD4}, - { 0x0022, 0x28, 0x40, 0xD5}, - { 0x0022, 0x28, 0x50, 0xD6}, - { 0x0022, 0x28, 0x60, 0xD7}, - { 0x0022, 0x28, 0x70, 0xD8}, - { 0x0022, 0x28, 0x80, 0xD9}, - { 0x0022, 0x28, 0x90, 0xDA}, - { 0x0022, 0x28, 0xA0, 0xDB}, - { 0x0023, 0x28, 0x28, 0xDC}, - { 0x0023, 0x28, 0x38, 0xDD}, - { 0x0023, 0x28, 0x48, 0xDE}, - { 0x0023, 0x28, 0x58, 0xDF}, - { 0x0023, 0x28, 0x68, 0xE0}, - { 0x0023, 0x28, 0x78, 0xE1}, - { 0x0023, 0x28, 0x88, 0xE2}, - { 0x0024, 0x14, 0x38, 0xE3}, - { 0x0024, 0x28, 0x48, 0xE4}, - { 0x0024, 0x28, 0x58, 0xE5}, - { 0x0024, 0x28, 0x68, 0xE6}, - { 0x0024, 0x28, 0x78, 0xE7}, - { 0x0025, 0x14, 0x38, 0xE8}, - { 0x0025, 0x28, 0x48, 0xE9}, - { 0x0025, 0x28, 0x58, 0xEA}, - { 0x0025, 0x28, 0x68, 0xEB}, - { 0x0025, 0x28, 0x78, 0xEC}, - { 0x0026, 0x14, 0x38, 0xED}, - { 0x0026, 0x28, 0x48, 0xEE}, - { 0x0026, 0x28, 0x58, 0xEF}, - { 0x0026, 0x28, 0x68, 0xF0}, - { 0x0026, 0x28, 0x78, 0xF1}, - { 0x0027, 0x14, 0x38, 0xF2}, - { 0x0027, 0x28, 0x48, 0xF3}, - { 0x0027, 0x28, 0x58, 0xF4}, - { 0x0027, 0x28, 0x68, 0xF5}, - { 0x0027, 0x28, 0x78, 0xF6}, - { 0x0028, 0x14, 0x50, 0xF7}, - { 0x0028, 0x28, 0x60, 0xF8}, - { 0x0029, 0x14, 0x50, 0xF9}, - { 0x0029, 0x28, 0x60, 0xFA}, - { 0x002A, 0x14, 0x50, 0xFB}, - { 0x002A, 0x28, 0x60, 0xFC}, + { 0x0000, 0x00, 0x46, 0x00 }, + { 0x0001, 0x14, 0x50, 0x03 }, + { 0x0001, 0x28, 0x60, 0x04 }, + { 0x0002, 0x14, 0x14, 0x05 }, + { 0x0002, 0x28, 0x24, 0x06 }, + { 0x0002, 0x14, 0x3C, 0x07 }, + { 0x0002, 0x28, 0x4C, 0x08 }, + { 0x0002, 0x14, 0x64, 0x09 }, + { 0x0002, 0x28, 0x74, 0x0A }, + { 0x0002, 0x14, 0x8C, 0x0B }, + { 0x0002, 0x28, 0x9C, 0x0C }, + { 0x0003, 0x14, 0x28, 0x0D }, + { 0x0003, 0x28, 0x38, 0x0E }, + { 0x0003, 0x28, 0x48, 0x0F }, + { 0x0003, 0x28, 0x58, 0x10 }, + { 0x0003, 0x28, 0x68, 0x11 }, + { 0x0003, 0x28, 0x78, 0x12 }, + { 0x0003, 0x28, 0x88, 0x13 }, + { 0x0004, 0x14, 0x20, 0x14 }, + { 0x0004, 0x14, 0x30, 0x15 }, + { 0x0004, 0x14, 0x40, 0x16 }, + { 0x0004, 0x28, 0x50, 0x17 }, + { 0x0004, 0x28, 0x60, 0x18 }, + { 0x0004, 0x28, 0x70, 0x19 }, + { 0x0004, 0x28, 0x80, 0x1A }, + { 0x0004, 0x28, 0x90, 0x1B }, + { 0x0005, 0x28, 0x20, 0x1C }, + { 0x0005, 0x28, 0x30, 0x1D }, + { 0x0005, 0x28, 0x40, 0x1E }, + { 0x0005, 0x28, 0x50, 0x1F }, + { 0x0005, 0x28, 0x60, 0x20 }, + { 0x0005, 0x28, 0x70, 0x21 }, + { 0x0005, 0x28, 0x80, 0x22 }, + { 0x0005, 0x28, 0x90, 0x23 }, + { 0x0006, 0x14, 0x18, 0x24 }, + { 0x0006, 0x28, 0x28, 0x25 }, + { 0x0006, 0x28, 0x38, 0x26 }, + { 0x0006, 0x28, 0x48, 0x27 }, + { 0x0006, 0x28, 0x58, 0x28 }, + { 0x0006, 0x28, 0x68, 0x29 }, + { 0x0006, 0x28, 0x78, 0x2A }, + { 0x0006, 0x28, 0x88, 0x2B }, + { 0x0006, 0x28, 0x98, 0x2C }, + { 0x0007, 0x14, 0x08, 0x2D }, + { 0x0007, 0x28, 0x18, 0x2E }, + { 0x0007, 0x28, 0x28, 0x2F }, + { 0x0007, 0x28, 0x38, 0x30 }, + { 0x0007, 0x28, 0x48, 0x31 }, + { 0x0007, 0x14, 0x60, 0x32 }, + { 0x0007, 0x28, 0x70, 0x33 }, + { 0x0007, 0x28, 0x80, 0x34 }, + { 0x0007, 0x14, 0x98, 0x35 }, + { 0x0007, 0x28, 0xA8, 0x36 }, + { 0x0008, 0x14, 0x30, 0x37 }, + { 0x0008, 0x28, 0x40, 0x38 }, + { 0x0008, 0x28, 0x50, 0x39 }, + { 0x0008, 0x28, 0x60, 0x3A }, + { 0x0008, 0x28, 0x70, 0x3B }, + { 0x0008, 0x28, 0x80, 0x3C }, + { 0x0009, 0x28, 0x28, 0x3D }, + { 0x0009, 0x28, 0x38, 0x3E }, + { 0x0009, 0x28, 0x48, 0x3F }, + { 0x0009, 0x28, 0x58, 0x40 }, + { 0x0009, 0x28, 0x68, 0x41 }, + { 0x0009, 0x28, 0x78, 0x42 }, + { 0x0009, 0x28, 0x88, 0x43 }, + { 0x000A, 0x14, 0x40, 0x44 }, + { 0x000A, 0x28, 0x50, 0x45 }, + { 0x000A, 0x28, 0x60, 0x46 }, + { 0x000A, 0x28, 0x70, 0x47 }, + { 0x000B, 0x14, 0x40, 0x48 }, + { 0x000B, 0x28, 0x50, 0x49 }, + { 0x000B, 0x28, 0x60, 0x4A }, + { 0x000B, 0x28, 0x70, 0x4B }, + { 0x000C, 0x14, 0x48, 0x4C }, + { 0x000C, 0x28, 0x58, 0x4D }, + { 0x000C, 0x28, 0x68, 0x4E }, + { 0x000D, 0x14, 0x30, 0x4F }, + { 0x000D, 0x28, 0x40, 0x50 }, + { 0x000D, 0x28, 0x50, 0x51 }, + { 0x000D, 0x28, 0x60, 0x52 }, + { 0x000D, 0x28, 0x70, 0x53 }, + { 0x000D, 0x28, 0x80, 0x54 }, + { 0x000E, 0x14, 0x38, 0x55 }, + { 0x000E, 0x28, 0x48, 0x56 }, + { 0x000E, 0x28, 0x58, 0x57 }, + { 0x000E, 0x28, 0x68, 0x58 }, + { 0x000E, 0x28, 0x78, 0x59 }, + { 0x000F, 0x14, 0x28, 0x5A }, + { 0x000F, 0x28, 0x38, 0x5B }, + { 0x000F, 0x28, 0x48, 0x5C }, + { 0x000F, 0x28, 0x58, 0x5D }, + { 0x000F, 0x28, 0x68, 0x5E }, + { 0x000F, 0x28, 0x78, 0x5F }, + { 0x000F, 0x28, 0x88, 0x60 }, + { 0x0010, 0x28, 0x28, 0x61 }, + { 0x0010, 0x28, 0x38, 0x62 }, + { 0x0010, 0x28, 0x48, 0x63 }, + { 0x0010, 0x28, 0x58, 0x64 }, + { 0x0010, 0x28, 0x68, 0x65 }, + { 0x0010, 0x28, 0x78, 0x66 }, + { 0x0010, 0x28, 0x88, 0x67 }, + { 0x0011, 0x28, 0x28, 0x68 }, + { 0x0011, 0x28, 0x38, 0x69 }, + { 0x0011, 0x28, 0x48, 0x6A }, + { 0x0011, 0x28, 0x58, 0x6B }, + { 0x0011, 0x28, 0x68, 0x6C }, + { 0x0011, 0x28, 0x78, 0x6D }, + { 0x0011, 0x28, 0x88, 0x6E }, + { 0x0012, 0x14, 0x50, 0x6F }, + { 0x0012, 0x28, 0x60, 0x70 }, + { 0x0013, 0x14, 0x48, 0x71 }, + { 0x0013, 0x28, 0x58, 0x72 }, + { 0x0013, 0x28, 0x68, 0x73 }, + { 0x0014, 0x14, 0x24, 0x74 }, + { 0x0014, 0x28, 0x34, 0x75 }, + { 0x0014, 0x28, 0x44, 0x76 }, + { 0x0014, 0x14, 0x5C, 0x77 }, + { 0x0014, 0x28, 0x6C, 0x78 }, + { 0x0014, 0x28, 0x7C, 0x79 }, + { 0x0014, 0x28, 0x8C, 0x7A }, + { 0x0015, 0x14, 0x40, 0x7B }, + { 0x0015, 0x28, 0x50, 0x7C }, + { 0x0015, 0x28, 0x60, 0x7D }, + { 0x0015, 0x28, 0x70, 0x7E }, + { 0x0016, 0x14, 0x40, 0x7F }, + { 0x0016, 0x28, 0x50, 0x80 }, + { 0x0016, 0x28, 0x60, 0x81 }, + { 0x0016, 0x28, 0x70, 0x82 }, + { 0x0017, 0x14, 0x30, 0x83 }, + { 0x0017, 0x28, 0x40, 0x84 }, + { 0x0017, 0x28, 0x50, 0x85 }, + { 0x0017, 0x28, 0x60, 0x86 }, + { 0x0017, 0x28, 0x70, 0x87 }, + { 0x0017, 0x28, 0x80, 0x88 }, + { 0x0018, 0x28, 0x30, 0x89 }, + { 0x0018, 0x28, 0x40, 0x8A }, + { 0x0018, 0x28, 0x50, 0x8B }, + { 0x0018, 0x28, 0x60, 0x8C }, + { 0x0018, 0x28, 0x70, 0x8D }, + { 0x0018, 0x28, 0x80, 0x8E }, + { 0x0019, 0x14, 0x40, 0x8F }, + { 0x0019, 0x28, 0x50, 0x90 }, + { 0x0019, 0x28, 0x60, 0x91 }, + { 0x0019, 0x28, 0x70, 0x92 }, + { 0x001A, 0x14, 0x10, 0x93 }, + { 0x001A, 0x28, 0x20, 0x94 }, + { 0x001A, 0x28, 0x30, 0x95 }, + { 0x001A, 0x28, 0x40, 0x96 }, + { 0x001A, 0x28, 0x50, 0x97 }, + { 0x001A, 0x28, 0x60, 0x98 }, + { 0x001A, 0x28, 0x70, 0x99 }, + { 0x001A, 0x28, 0x80, 0x9A }, + { 0x001A, 0x28, 0x90, 0x9B }, + { 0x001A, 0x28, 0xA0, 0x9C }, + { 0x001B, 0x14, 0x3C, 0x9D }, + { 0x001B, 0x14, 0x54, 0x9E }, + { 0x001B, 0x28, 0x64, 0x9F }, + { 0x001B, 0x28, 0x74, 0xA0 }, + { 0x001C, 0x14, 0x50, 0xA1 }, + { 0x001C, 0x28, 0x60, 0xA2 }, + { 0x001D, 0x14, 0x18, 0xA3 }, + { 0x001D, 0x28, 0x28, 0xA4 }, + { 0x001D, 0x28, 0x38, 0xA5 }, + { 0x001D, 0x28, 0x48, 0xA6 }, + { 0x001D, 0x28, 0x58, 0xA7 }, + { 0x001D, 0x28, 0x68, 0xA8 }, + { 0x001D, 0x28, 0x78, 0xA9 }, + { 0x001D, 0x28, 0x88, 0xAA }, + { 0x001D, 0x28, 0x98, 0xAB }, + { 0x001E, 0x14, 0x14, 0xAC }, + { 0x001E, 0x28, 0x24, 0xAD }, + { 0x001E, 0x14, 0x3C, 0xAE }, + { 0x001E, 0x28, 0x4C, 0xAF }, + { 0x001E, 0x14, 0x64, 0xB0 }, + { 0x001E, 0x28, 0x74, 0xB1 }, + { 0x001E, 0x14, 0x8C, 0xB2 }, + { 0x001E, 0x28, 0x9C, 0xB3 }, + { 0x001F, 0x14, 0x0C, 0xB4 }, + { 0x001F, 0x28, 0x1C, 0xB5 }, + { 0x001F, 0x28, 0x2C, 0xB6 }, + { 0x001F, 0x28, 0x3C, 0xB7 }, + { 0x001F, 0x28, 0x4C, 0xB8 }, + { 0x001F, 0x28, 0x5C, 0xB9 }, + { 0x001F, 0x28, 0x6C, 0xBA }, + { 0x001F, 0x28, 0x7C, 0xBB }, + { 0x001F, 0x14, 0x94, 0xBC }, + { 0x001F, 0x28, 0xA4, 0xBD }, + { 0x0020, 0x14, 0x10, 0xBE }, + { 0x0020, 0x28, 0x20, 0xBF }, + { 0x0020, 0x28, 0x30, 0xC0 }, + { 0x0020, 0x28, 0x40, 0xC1 }, + { 0x0020, 0x28, 0x50, 0xC2 }, + { 0x0020, 0x28, 0x60, 0xC3 }, + { 0x0020, 0x28, 0x70, 0xC4 }, + { 0x0020, 0x28, 0x80, 0xC5 }, + { 0x0020, 0x28, 0x90, 0xC6 }, + { 0x0020, 0x28, 0xA0, 0xC7 }, + { 0x0021, 0x28, 0x10, 0xC8 }, + { 0x0021, 0x28, 0x20, 0xC9 }, + { 0x0021, 0x28, 0x30, 0xCA }, + { 0x0021, 0x28, 0x40, 0xCB }, + { 0x0021, 0x28, 0x50, 0xCC }, + { 0x0021, 0x28, 0x60, 0xCD }, + { 0x0021, 0x28, 0x70, 0xCE }, + { 0x0021, 0x28, 0x80, 0xCF }, + { 0x0021, 0x28, 0x90, 0xD0 }, + { 0x0021, 0x28, 0xA0, 0xD1 }, + { 0x0022, 0x28, 0x10, 0xD2 }, + { 0x0022, 0x28, 0x20, 0xD3 }, + { 0x0022, 0x28, 0x30, 0xD4 }, + { 0x0022, 0x28, 0x40, 0xD5 }, + { 0x0022, 0x28, 0x50, 0xD6 }, + { 0x0022, 0x28, 0x60, 0xD7 }, + { 0x0022, 0x28, 0x70, 0xD8 }, + { 0x0022, 0x28, 0x80, 0xD9 }, + { 0x0022, 0x28, 0x90, 0xDA }, + { 0x0022, 0x28, 0xA0, 0xDB }, + { 0x0023, 0x28, 0x28, 0xDC }, + { 0x0023, 0x28, 0x38, 0xDD }, + { 0x0023, 0x28, 0x48, 0xDE }, + { 0x0023, 0x28, 0x58, 0xDF }, + { 0x0023, 0x28, 0x68, 0xE0 }, + { 0x0023, 0x28, 0x78, 0xE1 }, + { 0x0023, 0x28, 0x88, 0xE2 }, + { 0x0024, 0x14, 0x38, 0xE3 }, + { 0x0024, 0x28, 0x48, 0xE4 }, + { 0x0024, 0x28, 0x58, 0xE5 }, + { 0x0024, 0x28, 0x68, 0xE6 }, + { 0x0024, 0x28, 0x78, 0xE7 }, + { 0x0025, 0x14, 0x38, 0xE8 }, + { 0x0025, 0x28, 0x48, 0xE9 }, + { 0x0025, 0x28, 0x58, 0xEA }, + { 0x0025, 0x28, 0x68, 0xEB }, + { 0x0025, 0x28, 0x78, 0xEC }, + { 0x0026, 0x14, 0x38, 0xED }, + { 0x0026, 0x28, 0x48, 0xEE }, + { 0x0026, 0x28, 0x58, 0xEF }, + { 0x0026, 0x28, 0x68, 0xF0 }, + { 0x0026, 0x28, 0x78, 0xF1 }, + { 0x0027, 0x14, 0x38, 0xF2 }, + { 0x0027, 0x28, 0x48, 0xF3 }, + { 0x0027, 0x28, 0x58, 0xF4 }, + { 0x0027, 0x28, 0x68, 0xF5 }, + { 0x0027, 0x28, 0x78, 0xF6 }, + { 0x0028, 0x14, 0x50, 0xF7 }, + { 0x0028, 0x28, 0x60, 0xF8 }, + { 0x0029, 0x14, 0x50, 0xF9 }, + { 0x0029, 0x28, 0x60, 0xFA }, + { 0x002A, 0x14, 0x50, 0xFB }, + { 0x002A, 0x28, 0x60, 0xFC }, }; static const Cutscene sCutscenes[NUM_CUTSCENES] = { diff --git a/include/pokedex.h b/include/pokedex.h index 2571818d27..ce0565932c 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -8,8 +8,8 @@ #include "pokemon_types_def.h" #include "save.h" -#define ROUND_UP(x, n) (((x) + (n)-1) & ~((n)-1)) -#define CEILDIV(x, n) (((x) + (n)-1) / (n)) +#define ROUND_UP(x, n) (((x) + (n) - 1) & ~((n) - 1)) +#define CEILDIV(x, n) (((x) + (n) - 1) / (n)) // Deoxys form history is split between the // seen and caught flags because of space efficiency. diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index 614853680e..b2b556ef06 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -195,10 +195,10 @@ static void Task_AlphPuzzle_WaitDropCursorAnimOnQuit(SysTask *task, void *_data) // Used to detect hovering over corners static const u8 sCornerCoords[4][2] = { - {0, 0}, - { 5, 0}, - { 0, 5}, - { 5, 5}, + { 0, 0 }, + { 5, 0 }, + { 0, 5 }, + { 5, 5 }, }; // Region occupied by the QUIT button @@ -208,10 +208,10 @@ static const TouchscreenHitbox sButtonHitboxes[] = { }; static const s8 sTileRotationXYOffsets[4][2] = { - {0, 0 }, - { -1, 0 }, - { -1, -1}, - { 0, -1}, + { 0, 0 }, + { -1, 0 }, + { -1, -1 }, + { 0, -1 }, }; #define ALPH_TILE_BLANK ((AlphPuzzleInitTileData) { 0, 0, FALSE }) @@ -544,9 +544,9 @@ static const BgTemplate sBgTemplate4 = { }; static const WindowTemplate sWindowTemplates[3] = { - {2, 26, 21, 6, 3, 3, 0x3EE}, - { 0, 2, 19, 27, 4, 4, 0x05B}, - { 4, 4, 15, 24, 6, 3, 0x001}, + { 2, 26, 21, 6, 3, 3, 0x3EE }, + { 0, 2, 19, 27, 4, 4, 0x05B }, + { 4, 4, 15, 24, 6, 3, 0x001 }, }; static const OamManagerParam ov110_021E6EA4 = { 0, 128, 0, 32, 0, 128, 0, 32 }; @@ -564,12 +564,12 @@ static const u16 sResdatInfo[7] = { }; static const UnkStruct_0200D2B4 sSpriteTemplates[3] = { - // Drop cursor - {ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 0, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - // Origin cursor - { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 3, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - // Tile - { ALPH_SPRITE_RES_PUZZLETILES, 208, 168, 0, 0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0} + // Drop cursor + { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 0, 3, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + // Origin cursor + { ALPH_SPRITE_RES_CURSORS, 208, 168, 0, 3, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + // Tile + { ALPH_SPRITE_RES_PUZZLETILES, 208, 168, 0, 0, 2, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 } }; static const u32 sQuitButtonTextColors[3] = { diff --git a/src/application/view_photo.c b/src/application/view_photo.c index a698cf0102..cc7a6bd1a7 100644 --- a/src/application/view_photo.c +++ b/src/application/view_photo.c @@ -69,20 +69,20 @@ static void ViewPhotoSysTask_PrintTextOnWindows(ViewPhotoSysTaskData *viewPhoto) static u8 Photo_CountValidMons(Photo *a0); static const WindowTemplate ov19_0225A04E[2] = { - {.bgId = GF_BG_LYR_SUB_1, + { .bgId = GF_BG_LYR_SUB_1, .left = 24, .top = 21, .width = 8, .height = 2, .palette = 1, - .baseTile = 0x1F0}, + .baseTile = 0x1F0 }, { .bgId = GF_BG_LYR_SUB_1, .left = 1, .top = 8, .width = 28, .height = 8, .palette = 10, - .baseTile = 0x110} + .baseTile = 0x110 } }; static const TouchscreenHitbox ov19_0225A05E[] = { diff --git a/src/application/view_rankings.c b/src/application/view_rankings.c index bbad16d1b5..7779f438f8 100644 --- a/src/application/view_rankings.c +++ b/src/application/view_rankings.c @@ -221,25 +221,25 @@ static const RecordPageParam sRecordPageParam_BattleTower[] = { }; static const RecordPageParam sRecordPageParam_Pokemon[] = { - // mons fainted + // mons fainted { .max = 999999, .numDigits = 6, .msgId = msg_0421_00047, }, - // mons caught + // mons caught { .max = 999999, .numDigits = 6, .msgId = msg_0421_00047, }, - // eggs hatched + // eggs hatched { .max = 999999, .numDigits = 6, .msgId = msg_0421_00046, }, - // fishing landed + // fishing landed { .max = 999999, .numDigits = 6, diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 535019a21e..c9e38f501b 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2396,19 +2396,19 @@ static BOOL ov12_0224BCA4(BattleSystem *bsys, BattleContext *ctx) { } static const u8 sHitChanceTable[13][2] = { - {33, 100}, - { 36, 100}, - { 43, 100}, - { 50, 100}, - { 60, 100}, - { 75, 100}, - { 1, 1 }, - { 133, 100}, - { 166, 100}, - { 2, 1 }, - { 233, 100}, - { 133, 50 }, - { 3, 1 } + { 33, 100 }, + { 36, 100 }, + { 43, 100 }, + { 50, 100 }, + { 60, 100 }, + { 75, 100 }, + { 1, 1 }, + { 133, 100 }, + { 166, 100 }, + { 2, 1 }, + { 233, 100 }, + { 133, 50 }, + { 3, 1 } }; static BOOL BattleSystem_CheckMoveHit(BattleSystem *bsys, BattleContext *ctx, int battlerIdAttacker, int battlerIdTarget, int move) { diff --git a/src/battle/battle_cursor.c b/src/battle/battle_cursor.c index ba44660d87..9a52e01e9f 100644 --- a/src/battle/battle_cursor.c +++ b/src/battle/battle_cursor.c @@ -30,7 +30,7 @@ static const UnkTemplate_0200D748 ov12_0226EBA0 = { .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, - .resIdList = {0, 0, 0, 0, -1, -1}, + .resIdList = { 0, 0, 0, 0, -1, -1 }, .bgPriority = 0, .vramTransfer = 0 }; diff --git a/src/battle/battle_finger.c b/src/battle/battle_finger.c index 4a03ea6ea8..9eae30e6a7 100644 --- a/src/battle/battle_finger.c +++ b/src/battle/battle_finger.c @@ -32,7 +32,7 @@ static const UnkTemplate_0200D748 ov12_0226EBD4 = { .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, - .resIdList = {0, 0, 0, 0, -1, -1}, + .resIdList = { 0, 0, 0, 0, -1, -1 }, .bgPriority = 0, .vramTransfer = 0 }; diff --git a/src/battle/overlay_12_0224E4FC.c b/src/battle/overlay_12_0224E4FC.c index f66ce087e6..5d799d3063 100644 --- a/src/battle/overlay_12_0224E4FC.c +++ b/src/battle/overlay_12_0224E4FC.c @@ -2078,118 +2078,118 @@ enum { }; static const u8 sTypeEffectiveness[][3] = { - {TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_NORMAL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIRE, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIRE, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIRE, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIRE, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_WATER, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_WATER, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_WATER, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_WATER, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_WATER, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_WATER, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ELECTRIC, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ELECTRIC, TYPE_GROUND, TYPE_MUL_NO_EFFECT }, - { TYPE_ELECTRIC, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ELECTRIC, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GRASS, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GRASS, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GRASS, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GRASS, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ICE, TYPE_ICE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ICE, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ICE, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ICE, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ICE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_NORMAL, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIGHTING, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIGHTING, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FIGHTING, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIGHTING, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FIGHTING, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_POISON, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_POISON, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_POISON, TYPE_STEEL, TYPE_MUL_NO_EFFECT }, - { TYPE_GROUND, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GROUND, TYPE_ELECTRIC, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GROUND, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GROUND, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GROUND, TYPE_FLYING, TYPE_MUL_NO_EFFECT }, - { TYPE_GROUND, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GROUND, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GROUND, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FLYING, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FLYING, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FLYING, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FLYING, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_FLYING, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FLYING, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_PSYCHIC, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_PSYCHIC, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_PSYCHIC, TYPE_DARK, TYPE_MUL_NO_EFFECT }, - { TYPE_PSYCHIC, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_BUG, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_BUG, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_BUG, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_BUG, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ROCK, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ROCK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_ROCK, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ROCK, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_ROCK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_NORMAL, TYPE_MUL_NO_EFFECT }, - { TYPE_GHOST, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_GHOST, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_GHOST, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_DRAGON, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_DRAGON, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_DARK, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_DARK, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_DARK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_STEEL, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_STEEL, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE}, - { TYPE_STEEL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, - { TYPE_FORESIGHT, TYPE_FORESIGHT, TYPE_MUL_NO_EFFECT }, - { TYPE_NORMAL, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, - { TYPE_FIGHTING, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, - { TYPE_ENDTABLE, TYPE_ENDTABLE, TYPE_MUL_NO_EFFECT } + { TYPE_NORMAL, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_NORMAL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIRE, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIRE, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIRE, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIRE, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_WATER, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_WATER, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_WATER, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_WATER, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_WATER, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_WATER, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_GROUND, TYPE_MUL_NO_EFFECT }, + { TYPE_ELECTRIC, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ELECTRIC, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_WATER, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GRASS, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GRASS, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GRASS, TYPE_DRAGON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GRASS, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ICE, TYPE_ICE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_GROUND, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ICE, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ICE, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ICE, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ICE, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_NORMAL, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FIGHTING, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_POISON, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_POISON, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_POISON, TYPE_STEEL, TYPE_MUL_NO_EFFECT }, + { TYPE_GROUND, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GROUND, TYPE_ELECTRIC, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GROUND, TYPE_GRASS, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GROUND, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GROUND, TYPE_FLYING, TYPE_MUL_NO_EFFECT }, + { TYPE_GROUND, TYPE_BUG, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GROUND, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GROUND, TYPE_STEEL, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FLYING, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FLYING, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FLYING, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FLYING, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_FLYING, TYPE_ROCK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FLYING, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_FIGHTING, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_POISON, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_PSYCHIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_PSYCHIC, TYPE_DARK, TYPE_MUL_NO_EFFECT }, + { TYPE_PSYCHIC, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_GRASS, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_BUG, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_POISON, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_FLYING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_BUG, TYPE_GHOST, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_BUG, TYPE_DARK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_BUG, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_FIRE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ROCK, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ROCK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_GROUND, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_ROCK, TYPE_FLYING, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ROCK, TYPE_BUG, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_ROCK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_NORMAL, TYPE_MUL_NO_EFFECT }, + { TYPE_GHOST, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_GHOST, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_GHOST, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_DRAGON, TYPE_DRAGON, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_DRAGON, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_FIGHTING, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_PSYCHIC, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_DARK, TYPE_GHOST, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_DARK, TYPE_DARK, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_DARK, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_FIRE, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_WATER, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_ELECTRIC, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_STEEL, TYPE_ICE, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_STEEL, TYPE_ROCK, TYPE_MUL_SUPER_EFFECTIVE }, + { TYPE_STEEL, TYPE_STEEL, TYPE_MUL_NOT_EFFECTIVE }, + { TYPE_FORESIGHT, TYPE_FORESIGHT, TYPE_MUL_NO_EFFECT }, + { TYPE_NORMAL, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, + { TYPE_FIGHTING, TYPE_GHOST, TYPE_MUL_NO_EFFECT }, + { TYPE_ENDTABLE, TYPE_ENDTABLE, TYPE_MUL_NO_EFFECT } }; // static @@ -5464,55 +5464,55 @@ typedef struct MoveDamageCalc { } MoveDamageCalc; static const u8 sTypeEnhancingItems[][2] = { - {HOLD_EFFECT_STRENGTHEN_BUG, TYPE_BUG }, - { HOLD_EFFECT_STRENGTHEN_STEEL, TYPE_STEEL }, - { HOLD_EFFECT_STRENGTHEN_GROUND, TYPE_GROUND }, - { HOLD_EFFECT_STRENGTHEN_ROCK, TYPE_ROCK }, - { HOLD_EFFECT_STRENGTHEN_GRASS, TYPE_GRASS }, - { HOLD_EFFECT_STRENGTHEN_DARK, TYPE_DARK }, - { HOLD_EFFECT_STRENGTHEN_FIGHT, TYPE_FIGHTING}, - { HOLD_EFFECT_STRENGTHEN_ELECTRIC, TYPE_ELECTRIC}, - { HOLD_EFFECT_STRENGTHEN_WATER, TYPE_WATER }, - { HOLD_EFFECT_STRENGTHEN_FLYING, TYPE_FLYING }, - { HOLD_EFFECT_STRENGTHEN_POISON, TYPE_POISON }, - { HOLD_EFFECT_STRENGTHEN_ICE, TYPE_ICE }, - { HOLD_EFFECT_STRENGTHEN_GHOST, TYPE_GHOST }, - { HOLD_EFFECT_STRENGTHEN_PSYCHIC, TYPE_PSYCHIC }, - { HOLD_EFFECT_STRENGTHEN_FIRE, TYPE_FIRE }, - { HOLD_EFFECT_STRENGTHEN_DRAGON, TYPE_DRAGON }, - { HOLD_EFFECT_STRENGTHEN_NORMAL, TYPE_NORMAL }, - { HOLD_EFFECT_ARCEUS_FIRE, TYPE_FIRE }, - { HOLD_EFFECT_ARCEUS_WATER, TYPE_WATER }, - { HOLD_EFFECT_ARCEUS_ELECTRIC, TYPE_ELECTRIC}, - { HOLD_EFFECT_ARCEUS_GRASS, TYPE_GRASS }, - { HOLD_EFFECT_ARCEUS_ICE, TYPE_ICE }, - { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING}, - { HOLD_EFFECT_ARCEUS_POISON, TYPE_POISON }, - { HOLD_EFFECT_ARCEUS_GROUND, TYPE_GROUND }, - { HOLD_EFFECT_ARCEUS_FLYING, TYPE_FLYING }, - { HOLD_EFFECT_ARCEUS_PSYCHIC, TYPE_PSYCHIC }, - { HOLD_EFFECT_ARCEUS_BUG, TYPE_BUG }, - { HOLD_EFFECT_ARCEUS_ROCK, TYPE_ROCK }, - { HOLD_EFFECT_ARCEUS_GHOST, TYPE_GHOST }, - { HOLD_EFFECT_ARCEUS_DRAGON, TYPE_DRAGON }, - { HOLD_EFFECT_ARCEUS_DARK, TYPE_DARK }, - { HOLD_EFFECT_ARCEUS_STEEL, TYPE_STEEL } + { HOLD_EFFECT_STRENGTHEN_BUG, TYPE_BUG }, + { HOLD_EFFECT_STRENGTHEN_STEEL, TYPE_STEEL }, + { HOLD_EFFECT_STRENGTHEN_GROUND, TYPE_GROUND }, + { HOLD_EFFECT_STRENGTHEN_ROCK, TYPE_ROCK }, + { HOLD_EFFECT_STRENGTHEN_GRASS, TYPE_GRASS }, + { HOLD_EFFECT_STRENGTHEN_DARK, TYPE_DARK }, + { HOLD_EFFECT_STRENGTHEN_FIGHT, TYPE_FIGHTING }, + { HOLD_EFFECT_STRENGTHEN_ELECTRIC, TYPE_ELECTRIC }, + { HOLD_EFFECT_STRENGTHEN_WATER, TYPE_WATER }, + { HOLD_EFFECT_STRENGTHEN_FLYING, TYPE_FLYING }, + { HOLD_EFFECT_STRENGTHEN_POISON, TYPE_POISON }, + { HOLD_EFFECT_STRENGTHEN_ICE, TYPE_ICE }, + { HOLD_EFFECT_STRENGTHEN_GHOST, TYPE_GHOST }, + { HOLD_EFFECT_STRENGTHEN_PSYCHIC, TYPE_PSYCHIC }, + { HOLD_EFFECT_STRENGTHEN_FIRE, TYPE_FIRE }, + { HOLD_EFFECT_STRENGTHEN_DRAGON, TYPE_DRAGON }, + { HOLD_EFFECT_STRENGTHEN_NORMAL, TYPE_NORMAL }, + { HOLD_EFFECT_ARCEUS_FIRE, TYPE_FIRE }, + { HOLD_EFFECT_ARCEUS_WATER, TYPE_WATER }, + { HOLD_EFFECT_ARCEUS_ELECTRIC, TYPE_ELECTRIC }, + { HOLD_EFFECT_ARCEUS_GRASS, TYPE_GRASS }, + { HOLD_EFFECT_ARCEUS_ICE, TYPE_ICE }, + { HOLD_EFFECT_ARCEUS_FIGHTING, TYPE_FIGHTING }, + { HOLD_EFFECT_ARCEUS_POISON, TYPE_POISON }, + { HOLD_EFFECT_ARCEUS_GROUND, TYPE_GROUND }, + { HOLD_EFFECT_ARCEUS_FLYING, TYPE_FLYING }, + { HOLD_EFFECT_ARCEUS_PSYCHIC, TYPE_PSYCHIC }, + { HOLD_EFFECT_ARCEUS_BUG, TYPE_BUG }, + { HOLD_EFFECT_ARCEUS_ROCK, TYPE_ROCK }, + { HOLD_EFFECT_ARCEUS_GHOST, TYPE_GHOST }, + { HOLD_EFFECT_ARCEUS_DRAGON, TYPE_DRAGON }, + { HOLD_EFFECT_ARCEUS_DARK, TYPE_DARK }, + { HOLD_EFFECT_ARCEUS_STEEL, TYPE_STEEL } }; static const u8 sStatChangeTable[][2] = { - {10, 40}, - { 10, 35}, - { 10, 30}, - { 10, 25}, - { 10, 20}, - { 10, 15}, - { 10, 10}, - { 15, 10}, - { 20, 10}, - { 25, 10}, - { 30, 10}, - { 35, 10}, - { 40, 10} + { 10, 40 }, + { 10, 35 }, + { 10, 30 }, + { 10, 25 }, + { 10, 20 }, + { 10, 15 }, + { 10, 10 }, + { 15, 10 }, + { 20, 10 }, + { 25, 10 }, + { 30, 10 }, + { 35, 10 }, + { 40, 10 } }; static const u16 sPunchingMoves[] = { diff --git a/src/berry_pots_app.c b/src/berry_pots_app.c index bc98bbdca4..d8345ea7c2 100644 --- a/src/berry_pots_app.c +++ b/src/berry_pots_app.c @@ -130,12 +130,12 @@ static const OamCharTransferParam ov17_02203D98 = { GX_OBJVRAMMODE_CHAR_1D_32K, }; static const WindowTemplate ov17_02203DC4[3] = { - {2, 25, 21, 6, 2, 9, 0x1A2}, - { 0, 2, 19, 19, 4, 12, 0x0CA}, - { 0, 2, 19, 27, 4, 12, 0x136}, + { 2, 25, 21, 6, 2, 9, 0x1A2 }, + { 0, 2, 19, 19, 4, 12, 0x0CA }, + { 0, 2, 19, 27, 4, 12, 0x136 }, }; static const SpriteResourceCountsListUnion ov17_02203DAC = { - {1, 1, 1, 1, 0, 0} + { 1, 1, 1, 1, 0, 0 } }; static const BgTemplate ov17_02203DDC = { 0, @@ -220,10 +220,10 @@ static const u8 ov17_02203D50[] = { 2, 1 }; static const u8 ov17_02203D54[] = { 5, 1 }; static const struct UnkStruct_ov17_02203E88 ov17_02203E88[4] = { - {3, ov17_02203D5C}, - { 2, ov17_02203D58}, - { 2, ov17_02203D50}, - { 2, ov17_02203D54}, + { 3, ov17_02203D5C }, + { 2, ov17_02203D58 }, + { 2, ov17_02203D50 }, + { 2, ov17_02203D54 }, }; static const UnkStruct_0200D2B4 ov17_02203EA8 = { 0, 27, 96, 0, 5, 13, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }; static const GraphicsBanks ov17_02203ED0 = { @@ -239,11 +239,11 @@ static const GraphicsBanks ov17_02203ED0 = { GX_VRAM_TEXPLTT_NONE, }; static const UnkStruct_0200D2B4 ov17_02203EF8[5] = { - {0, 224, 176, 0, 0, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - { 0, 27, 96, 0, 2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - { 0, 31, 56, 0, 8, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - { 0, 27, 99, 0, 4, 14, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0}, - { 0, 27, 88, 0, 7, 12, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0} + { 0, 224, 176, 0, 0, 15, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + { 0, 27, 96, 0, 2, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + { 0, 31, 56, 0, 8, 1, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + { 0, 27, 99, 0, 4, 14, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 }, + { 0, 27, 88, 0, 7, 12, 0, NNS_G2D_VRAM_TYPE_2DMAIN, 1, 0, 0, 0 } }; void ov17_02201BC0(void) { diff --git a/src/berry_pots_app_tasks.c b/src/berry_pots_app_tasks.c index 5ba04fdf3b..66a616e152 100644 --- a/src/berry_pots_app_tasks.c +++ b/src/berry_pots_app_tasks.c @@ -20,7 +20,7 @@ typedef struct SysTaskArgs_ov17_0220351C { } SysTaskArgs_ov17_0220351C; static const TouchscreenHitbox ov17_02203FC0 = { - .rect = {160, 192, 192, 0} + .rect = { 160, 192, 192, 0 } }; static void ov17_022035A4(SysTask *task, SysTaskArgs_ov17_0220351C *args); diff --git a/src/certificates_app.c b/src/certificates_app.c index 5ec8c73e82..5743cad27f 100644 --- a/src/certificates_app.c +++ b/src/certificates_app.c @@ -125,7 +125,7 @@ static const UnkTemplate_0200D748 ov78_021E68B4 = { .spritePriority = 1, .pal = 3, .vram = NNS_G2D_VRAM_TYPE_2DBOTH, - .resIdList = {2, 2, 2, 2, 0, 0}, + .resIdList = { 2, 2, 2, 2, 0, 0 }, .bgPriority = 0, .vramTransfer = 0, }; @@ -151,15 +151,15 @@ static const UnkTemplate_0200D748 ov78_021E68E8 = { .spritePriority = 0, .pal = 2, .vram = NNS_G2D_VRAM_TYPE_2DBOTH, - .resIdList = {1, 1, 1, 1, 0, 0}, + .resIdList = { 1, 1, 1, 1, 0, 0 }, .bgPriority = 0, .vramTransfer = 0, }; static s16 ov78_021E6920[3][2] = { - {128, 16 }, - { 116, 180}, - { 140, 180}, + { 128, 16 }, + { 116, 180 }, + { 140, 180 }, }; static void CertificatesApp_OnVBlank(CertificatesApp_Data *data); diff --git a/src/credits/data1.c b/src/credits/data1.c index e73bb6b436..3d9cd6a017 100644 --- a/src/credits/data1.c +++ b/src/credits/data1.c @@ -1,8 +1,8 @@ #include "credits/credits.h" const UnkOv021E60F6 ov76_021E6E88[4] = { - {0x49, 0x00, 0x00, 0x00}, - { 0x49, 0x00, 0x00, 0x00}, - { 0x49, 0x00, 0x00, 0x00}, - { 0x07, 0x07, 0x07, 0x07}, + { 0x49, 0x00, 0x00, 0x00 }, + { 0x49, 0x00, 0x00, 0x00 }, + { 0x49, 0x00, 0x00, 0x00 }, + { 0x07, 0x07, 0x07, 0x07 }, }; diff --git a/src/data/fieldmap/hidden_items.h b/src/data/fieldmap/hidden_items.h index c259329b0b..45670807d6 100644 --- a/src/data/fieldmap/hidden_items.h +++ b/src/data/fieldmap/hidden_items.h @@ -3,236 +3,236 @@ #include "constants/items.h" static const struct HiddenItemData sHiddenItemParam[] = { - {ITEM_POTION, 1, 0, 0, 0 }, - { ITEM_NUGGET, 1, 0, 0, 1 }, - { ITEM_NUGGET, 1, 0, 0, 225}, - { ITEM_POTION, 1, 0, 0, 2 }, - { ITEM_POKE_BALL, 1, 0, 0, 14 }, - { ITEM_MAX_ETHER, 1, 0, 0, 15 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 16 }, - { ITEM_HYPER_POTION, 1, 0, 0, 17 }, - { ITEM_ELIXIR, 1, 0, 0, 18 }, - { ITEM_HYPER_POTION, 1, 0, 0, 3 }, - { ITEM_POKE_BALL, 1, 0, 0, 108}, - { ITEM_GREAT_BALL, 1, 0, 0, 146}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 147}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 148}, - { ITEM_RARE_CANDY, 1, 0, 0, 149}, - { ITEM_NUGGET, 1, 0, 0, 150}, - { ITEM_GREAT_BALL, 1, 0, 0, 151}, - { ITEM_PARLYZ_HEAL, 1, 0, 0, 152}, - { ITEM_BIG_PEARL, 1, 0, 0, 154}, - { ITEM_X_SPEED, 1, 0, 0, 153}, - { ITEM_REVIVE, 1, 0, 0, 155}, - { ITEM_ULTRA_BALL, 1, 0, 0, 156}, - { ITEM_CALCIUM, 1, 0, 0, 157}, - { ITEM_HEART_SCALE, 1, 0, 0, 4 }, - { ITEM_GREAT_BALL, 1, 0, 0, 5 }, - { ITEM_SUPER_POTION, 1, 0, 0, 97 }, - { ITEM_FULL_HEAL, 1, 0, 0, 6 }, - { ITEM_GREAT_BALL, 1, 0, 0, 27 }, - { ITEM_SUPER_POTION, 1, 0, 0, 28 }, - { ITEM_FULL_HEAL, 1, 0, 0, 29 }, - { ITEM_ANTIDOTE, 1, 0, 0, 30 }, - { ITEM_SUPER_POTION, 1, 0, 0, 31 }, - { ITEM_FULL_HEAL, 1, 0, 0, 32 }, - { ITEM_ETHER, 1, 0, 0, 33 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 211}, - { ITEM_REPEL, 1, 0, 0, 212}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 213}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 214}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 215}, - { ITEM_RARE_CANDY, 1, 0, 0, 7 }, - { ITEM_SUPER_POTION, 1, 0, 0, 8 }, - { ITEM_SUPER_POTION, 1, 0, 0, 9 }, - { ITEM_PARLYZ_HEAL, 1, 0, 0, 52 }, - { ITEM_SUPER_POTION, 1, 0, 0, 53 }, - { ITEM_ANTIDOTE, 1, 0, 0, 67 }, - { ITEM_MAX_POTION, 1, 0, 0, 68 }, - { ITEM_REVIVE, 1, 0, 0, 69 }, - { ITEM_NUGGET, 1, 0, 0, 10 }, - { ITEM_AWAKENING, 1, 0, 0, 11 }, - { ITEM_FULL_HEAL, 1, 0, 0, 34 }, - { ITEM_FULL_HEAL, 1, 0, 0, 35 }, - { ITEM_PP_UP, 1, 0, 0, 159}, - { ITEM_PROTEIN, 1, 0, 0, 160}, - { ITEM_HYPER_POTION, 1, 0, 0, 12 }, - { ITEM_ETHER, 1, 0, 0, 13 }, - { ITEM_RARE_CANDY, 1, 0, 0, 132}, - { ITEM_ULTRA_BALL, 1, 0, 0, 133}, - { ITEM_ETHER, 1, 0, 0, 19 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 20 }, - { ITEM_ANTIDOTE, 1, 0, 0, 65 }, - { ITEM_REVIVE, 1, 0, 0, 21 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 125}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 126}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 127}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 128}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 129}, - { ITEM_MAX_POTION, 1, 0, 0, 62 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 63 }, - { ITEM_CARBOS, 1, 0, 0, 64 }, - { ITEM_HP_UP, 1, 0, 0, 22 }, - { ITEM_NUGGET, 1, 0, 0, 98 }, - { ITEM_PP_UP, 1, 0, 0, 135}, - { ITEM_X_ATTACK, 1, 0, 0, 136}, - { ITEM_RARE_CANDY, 1, 0, 0, 23 }, - { ITEM_FULL_HEAL, 1, 0, 0, 137}, - { ITEM_HYPER_POTION, 1, 0, 0, 66 }, - { ITEM_PROTEIN, 1, 0, 0, 86 }, - { ITEM_PEARL, 1, 0, 0, 158}, - { ITEM_RARE_CANDY, 1, 0, 0, 161}, - { ITEM_HYPER_POTION, 1, 0, 0, 24 }, - { ITEM_MAX_ETHER, 1, 0, 0, 99 }, - { ITEM_STARDUST, 1, 0, 0, 170}, - { ITEM_STARDUST, 1, 0, 0, 171}, - { ITEM_STARDUST, 1, 0, 0, 172}, - { ITEM_STARDUST, 1, 0, 0, 173}, - { ITEM_RARE_CANDY, 1, 0, 0, 73 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 74 }, - { ITEM_SUPER_REPEL, 1, 0, 0, 191}, - { ITEM_PEARL, 1, 0, 0, 192}, - { ITEM_REVIVE, 1, 0, 0, 193}, - { ITEM_FULL_RESTORE, 1, 0, 0, 75 }, - { ITEM_REVIVE, 1, 0, 0, 25 }, - { ITEM_STARDUST, 1, 0, 0, 26 }, - { ITEM_BIG_PEARL, 1, 0, 0, 209}, - { ITEM_STARDUST, 1, 0, 0, 39 }, - { ITEM_PEARL, 1, 0, 0, 40 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 226}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 41 }, - { ITEM_TINYMUSHROOM, 1, 0, 0, 130}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 131}, - { ITEM_MAX_POTION, 1, 0, 0, 42 }, - { ITEM_HYPER_POTION, 1, 0, 0, 43 }, - { ITEM_REVIVE, 1, 0, 0, 44 }, - { ITEM_MAX_REPEL, 1, 0, 0, 45 }, - { ITEM_ETHER, 1, 0, 0, 46 }, - { ITEM_RARE_CANDY, 1, 0, 0, 140}, - { ITEM_ULTRA_BALL, 1, 0, 0, 141}, - { ITEM_NUGGET, 1, 0, 0, 142}, - { ITEM_FULL_RESTORE, 1, 0, 0, 47 }, - { ITEM_HP_UP, 1, 0, 0, 48 }, - { ITEM_HYPER_POTION, 1, 0, 0, 143}, - { ITEM_FULL_HEAL, 1, 0, 0, 144}, - { ITEM_MAX_REVIVE, 1, 0, 0, 49 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 50 }, - { ITEM_REVIVE, 1, 0, 0, 51 }, - { ITEM_FULL_HEAL, 1, 0, 0, 54 }, - { ITEM_X_SP__DEF, 1, 0, 0, 55 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 36 }, - { ITEM_RARE_CANDY, 1, 0, 0, 37 }, - { ITEM_MAX_POTION, 1, 0, 0, 102}, - { ITEM_ELIXIR, 1, 0, 0, 100}, - { ITEM_MAX_POTION, 1, 0, 0, 70 }, - { ITEM_ICE_HEAL, 1, 0, 0, 72 }, - { ITEM_REVIVE, 1, 0, 0, 228}, - { ITEM_CARBOS, 1, 0, 0, 71 }, - { ITEM_REVIVE, 1, 0, 0, 81 }, - { ITEM_MAX_POTION, 1, 0, 0, 82 }, - { ITEM_MAX_ELIXIR, 1, 0, 0, 83 }, - { ITEM_PP_UP, 1, 0, 0, 101}, - { ITEM_REVIVE, 1, 0, 0, 181}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 182}, - { ITEM_NUGGET, 1, 0, 0, 183}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 184}, - { ITEM_MAX_POTION, 1, 0, 0, 79 }, - { ITEM_FULL_HEAL, 1, 0, 0, 80 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 185}, - { ITEM_PP_UP, 1, 0, 0, 186}, - { ITEM_ULTRA_BALL, 1, 0, 0, 189}, - { ITEM_HYPER_POTION, 1, 0, 0, 187}, - { ITEM_ZINC, 1, 0, 0, 188}, - { ITEM_RARE_CANDY, 1, 0, 0, 190}, - { ITEM_IRON, 1, 0, 0, 84 }, - { ITEM_FULL_HEAL, 1, 0, 0, 103}, - { ITEM_HEART_SCALE, 1, 0, 0, 168}, - { ITEM_PEARL, 1, 0, 0, 162}, - { ITEM_PEARL, 1, 0, 0, 163}, - { ITEM_BIG_PEARL, 1, 0, 0, 164}, - { ITEM_MAX_REVIVE, 1, 0, 0, 56 }, - { ITEM_CALCIUM, 1, 0, 0, 224}, - { ITEM_FULL_RESTORE, 1, 0, 0, 57 }, - { ITEM_X_SPECIAL, 1, 0, 0, 58 }, - { ITEM_REVIVE, 1, 0, 0, 104}, - { ITEM_X_ACCURACY, 1, 0, 0, 59 }, - { ITEM_X_DEFENSE, 1, 0, 0, 60 }, - { ITEM_MAX_POTION, 1, 0, 0, 61 }, - { ITEM_HP_UP, 1, 0, 0, 169}, - { ITEM_CARBOS, 1, 0, 0, 197}, - { ITEM_ETHER, 1, 0, 0, 105}, - { ITEM_NUGGET, 1, 0, 0, 106}, - { ITEM_REVIVE, 1, 0, 0, 107}, - { ITEM_PP_UP, 1, 0, 0, 122}, - { ITEM_MAX_ETHER, 1, 0, 0, 109}, - { ITEM_MAX_ELIXIR, 1, 0, 0, 110}, - { ITEM_NUGGET, 1, 0, 0, 134}, - { ITEM_CALCIUM, 1, 0, 0, 111}, - { ITEM_ELIXIR, 1, 0, 0, 112}, - { ITEM_MAX_ETHER, 1, 0, 0, 85 }, - { ITEM_FULL_RESTORE, 1, 0, 0, 87 }, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 216}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 217}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 218}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 219}, - { ITEM_TINYMUSHROOM, 1, 0, 0, 220}, - { ITEM_PP_UP, 1, 0, 0, 198}, - { ITEM_GUARD_SPEC_, 1, 0, 0, 199}, - { ITEM_MAX_REVIVE, 1, 0, 0, 227}, - { ITEM_STAR_PIECE, 1, 0, 0, 145}, - { ITEM_STAR_PIECE, 1, 0, 0, 138}, - { ITEM_HYPER_POTION, 1, 0, 0, 139}, - { ITEM_REVIVE, 1, 0, 0, 195}, - { ITEM_MAX_REVIVE, 1, 0, 0, 196}, - { ITEM_ULTRA_BALL, 1, 0, 0, 113}, - { ITEM_BIG_MUSHROOM, 1, 0, 0, 194}, - { ITEM_NUGGET, 1, 0, 0, 200}, - { ITEM_STARDUST, 1, 0, 0, 174}, - { ITEM_STARDUST, 1, 0, 0, 175}, - { ITEM_STARDUST, 1, 0, 0, 176}, - { ITEM_STARDUST, 1, 0, 0, 177}, - { ITEM_RARE_CANDY, 1, 0, 0, 114}, - { ITEM_IRON, 1, 0, 0, 166}, - { ITEM_STAR_PIECE, 1, 0, 0, 167}, - { ITEM_ESCAPE_ROPE, 1, 0, 0, 88 }, - { ITEM_ICE_HEAL, 1, 0, 0, 89 }, - { ITEM_PEARL, 1, 0, 0, 90 }, - { ITEM_PEARL, 1, 0, 0, 91 }, - { ITEM_MAX_REVIVE, 1, 0, 0, 92 }, - { ITEM_RARE_CANDY, 1, 0, 0, 210}, - { ITEM_ZINC, 1, 0, 0, 223}, - { ITEM_BIG_PEARL, 1, 0, 0, 180}, - { ITEM_PEARL, 1, 0, 0, 178}, - { ITEM_PEARL, 1, 0, 0, 179}, - { ITEM_REVIVE, 1, 0, 0, 207}, - { ITEM_MAX_ELIXIR, 1, 0, 0, 208}, - { ITEM_RARE_CANDY, 1, 0, 0, 115}, - { ITEM_FULL_RESTORE, 1, 0, 0, 116}, - { ITEM_DIRE_HIT, 1, 0, 0, 76 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 77 }, - { ITEM_REVIVE, 1, 0, 0, 201}, - { ITEM_RARE_CANDY, 1, 0, 0, 165}, - { ITEM_MAX_ETHER, 1, 0, 0, 204}, - { ITEM_HYPER_POTION, 1, 0, 0, 205}, - { ITEM_ULTRA_BALL, 1, 0, 0, 202}, - { ITEM_HYPER_POTION, 1, 0, 0, 203}, - { ITEM_MAX_POTION, 1, 0, 0, 78 }, - { ITEM_IRON, 1, 0, 0, 222}, - { ITEM_MAX_REVIVE, 1, 0, 0, 206}, - { ITEM_HYPER_POTION, 1, 0, 0, 93 }, - { ITEM_RARE_CANDY, 1, 0, 0, 94 }, - { ITEM_REVIVE, 1, 0, 0, 95 }, - { ITEM_ULTRA_BALL, 1, 0, 0, 96 }, - { ITEM_PP_UP, 1, 0, 0, 117}, - { ITEM_BIG_PEARL, 1, 0, 0, 118}, - { ITEM_ZINC, 1, 0, 0, 119}, - { ITEM_FULL_HEAL, 1, 0, 0, 120}, - { ITEM_PROTEIN, 1, 0, 0, 221}, - { ITEM_MAX_REVIVE, 1, 0, 0, 121}, - { ITEM_ULTRA_BALL, 1, 0, 0, 123}, - { ITEM_NUGGET, 1, 0, 0, 124}, - { ITEM_DEEPSEATOOTH, 1, 0, 0, 38 }, - { ITEM_DEEPSEASCALE, 1, 0, 0, 229}, - { ITEM_PP_MAX, 1, 0, 0, 230}, + { ITEM_POTION, 1, 0, 0, 0 }, + { ITEM_NUGGET, 1, 0, 0, 1 }, + { ITEM_NUGGET, 1, 0, 0, 225 }, + { ITEM_POTION, 1, 0, 0, 2 }, + { ITEM_POKE_BALL, 1, 0, 0, 14 }, + { ITEM_MAX_ETHER, 1, 0, 0, 15 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 16 }, + { ITEM_HYPER_POTION, 1, 0, 0, 17 }, + { ITEM_ELIXIR, 1, 0, 0, 18 }, + { ITEM_HYPER_POTION, 1, 0, 0, 3 }, + { ITEM_POKE_BALL, 1, 0, 0, 108 }, + { ITEM_GREAT_BALL, 1, 0, 0, 146 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 147 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 148 }, + { ITEM_RARE_CANDY, 1, 0, 0, 149 }, + { ITEM_NUGGET, 1, 0, 0, 150 }, + { ITEM_GREAT_BALL, 1, 0, 0, 151 }, + { ITEM_PARLYZ_HEAL, 1, 0, 0, 152 }, + { ITEM_BIG_PEARL, 1, 0, 0, 154 }, + { ITEM_X_SPEED, 1, 0, 0, 153 }, + { ITEM_REVIVE, 1, 0, 0, 155 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 156 }, + { ITEM_CALCIUM, 1, 0, 0, 157 }, + { ITEM_HEART_SCALE, 1, 0, 0, 4 }, + { ITEM_GREAT_BALL, 1, 0, 0, 5 }, + { ITEM_SUPER_POTION, 1, 0, 0, 97 }, + { ITEM_FULL_HEAL, 1, 0, 0, 6 }, + { ITEM_GREAT_BALL, 1, 0, 0, 27 }, + { ITEM_SUPER_POTION, 1, 0, 0, 28 }, + { ITEM_FULL_HEAL, 1, 0, 0, 29 }, + { ITEM_ANTIDOTE, 1, 0, 0, 30 }, + { ITEM_SUPER_POTION, 1, 0, 0, 31 }, + { ITEM_FULL_HEAL, 1, 0, 0, 32 }, + { ITEM_ETHER, 1, 0, 0, 33 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 211 }, + { ITEM_REPEL, 1, 0, 0, 212 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 213 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 214 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 215 }, + { ITEM_RARE_CANDY, 1, 0, 0, 7 }, + { ITEM_SUPER_POTION, 1, 0, 0, 8 }, + { ITEM_SUPER_POTION, 1, 0, 0, 9 }, + { ITEM_PARLYZ_HEAL, 1, 0, 0, 52 }, + { ITEM_SUPER_POTION, 1, 0, 0, 53 }, + { ITEM_ANTIDOTE, 1, 0, 0, 67 }, + { ITEM_MAX_POTION, 1, 0, 0, 68 }, + { ITEM_REVIVE, 1, 0, 0, 69 }, + { ITEM_NUGGET, 1, 0, 0, 10 }, + { ITEM_AWAKENING, 1, 0, 0, 11 }, + { ITEM_FULL_HEAL, 1, 0, 0, 34 }, + { ITEM_FULL_HEAL, 1, 0, 0, 35 }, + { ITEM_PP_UP, 1, 0, 0, 159 }, + { ITEM_PROTEIN, 1, 0, 0, 160 }, + { ITEM_HYPER_POTION, 1, 0, 0, 12 }, + { ITEM_ETHER, 1, 0, 0, 13 }, + { ITEM_RARE_CANDY, 1, 0, 0, 132 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 133 }, + { ITEM_ETHER, 1, 0, 0, 19 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 20 }, + { ITEM_ANTIDOTE, 1, 0, 0, 65 }, + { ITEM_REVIVE, 1, 0, 0, 21 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 125 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 126 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 127 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 128 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 129 }, + { ITEM_MAX_POTION, 1, 0, 0, 62 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 63 }, + { ITEM_CARBOS, 1, 0, 0, 64 }, + { ITEM_HP_UP, 1, 0, 0, 22 }, + { ITEM_NUGGET, 1, 0, 0, 98 }, + { ITEM_PP_UP, 1, 0, 0, 135 }, + { ITEM_X_ATTACK, 1, 0, 0, 136 }, + { ITEM_RARE_CANDY, 1, 0, 0, 23 }, + { ITEM_FULL_HEAL, 1, 0, 0, 137 }, + { ITEM_HYPER_POTION, 1, 0, 0, 66 }, + { ITEM_PROTEIN, 1, 0, 0, 86 }, + { ITEM_PEARL, 1, 0, 0, 158 }, + { ITEM_RARE_CANDY, 1, 0, 0, 161 }, + { ITEM_HYPER_POTION, 1, 0, 0, 24 }, + { ITEM_MAX_ETHER, 1, 0, 0, 99 }, + { ITEM_STARDUST, 1, 0, 0, 170 }, + { ITEM_STARDUST, 1, 0, 0, 171 }, + { ITEM_STARDUST, 1, 0, 0, 172 }, + { ITEM_STARDUST, 1, 0, 0, 173 }, + { ITEM_RARE_CANDY, 1, 0, 0, 73 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 74 }, + { ITEM_SUPER_REPEL, 1, 0, 0, 191 }, + { ITEM_PEARL, 1, 0, 0, 192 }, + { ITEM_REVIVE, 1, 0, 0, 193 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 75 }, + { ITEM_REVIVE, 1, 0, 0, 25 }, + { ITEM_STARDUST, 1, 0, 0, 26 }, + { ITEM_BIG_PEARL, 1, 0, 0, 209 }, + { ITEM_STARDUST, 1, 0, 0, 39 }, + { ITEM_PEARL, 1, 0, 0, 40 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 226 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 41 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 130 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 131 }, + { ITEM_MAX_POTION, 1, 0, 0, 42 }, + { ITEM_HYPER_POTION, 1, 0, 0, 43 }, + { ITEM_REVIVE, 1, 0, 0, 44 }, + { ITEM_MAX_REPEL, 1, 0, 0, 45 }, + { ITEM_ETHER, 1, 0, 0, 46 }, + { ITEM_RARE_CANDY, 1, 0, 0, 140 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 141 }, + { ITEM_NUGGET, 1, 0, 0, 142 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 47 }, + { ITEM_HP_UP, 1, 0, 0, 48 }, + { ITEM_HYPER_POTION, 1, 0, 0, 143 }, + { ITEM_FULL_HEAL, 1, 0, 0, 144 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 49 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 50 }, + { ITEM_REVIVE, 1, 0, 0, 51 }, + { ITEM_FULL_HEAL, 1, 0, 0, 54 }, + { ITEM_X_SP__DEF, 1, 0, 0, 55 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 36 }, + { ITEM_RARE_CANDY, 1, 0, 0, 37 }, + { ITEM_MAX_POTION, 1, 0, 0, 102 }, + { ITEM_ELIXIR, 1, 0, 0, 100 }, + { ITEM_MAX_POTION, 1, 0, 0, 70 }, + { ITEM_ICE_HEAL, 1, 0, 0, 72 }, + { ITEM_REVIVE, 1, 0, 0, 228 }, + { ITEM_CARBOS, 1, 0, 0, 71 }, + { ITEM_REVIVE, 1, 0, 0, 81 }, + { ITEM_MAX_POTION, 1, 0, 0, 82 }, + { ITEM_MAX_ELIXIR, 1, 0, 0, 83 }, + { ITEM_PP_UP, 1, 0, 0, 101 }, + { ITEM_REVIVE, 1, 0, 0, 181 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 182 }, + { ITEM_NUGGET, 1, 0, 0, 183 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 184 }, + { ITEM_MAX_POTION, 1, 0, 0, 79 }, + { ITEM_FULL_HEAL, 1, 0, 0, 80 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 185 }, + { ITEM_PP_UP, 1, 0, 0, 186 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 189 }, + { ITEM_HYPER_POTION, 1, 0, 0, 187 }, + { ITEM_ZINC, 1, 0, 0, 188 }, + { ITEM_RARE_CANDY, 1, 0, 0, 190 }, + { ITEM_IRON, 1, 0, 0, 84 }, + { ITEM_FULL_HEAL, 1, 0, 0, 103 }, + { ITEM_HEART_SCALE, 1, 0, 0, 168 }, + { ITEM_PEARL, 1, 0, 0, 162 }, + { ITEM_PEARL, 1, 0, 0, 163 }, + { ITEM_BIG_PEARL, 1, 0, 0, 164 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 56 }, + { ITEM_CALCIUM, 1, 0, 0, 224 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 57 }, + { ITEM_X_SPECIAL, 1, 0, 0, 58 }, + { ITEM_REVIVE, 1, 0, 0, 104 }, + { ITEM_X_ACCURACY, 1, 0, 0, 59 }, + { ITEM_X_DEFENSE, 1, 0, 0, 60 }, + { ITEM_MAX_POTION, 1, 0, 0, 61 }, + { ITEM_HP_UP, 1, 0, 0, 169 }, + { ITEM_CARBOS, 1, 0, 0, 197 }, + { ITEM_ETHER, 1, 0, 0, 105 }, + { ITEM_NUGGET, 1, 0, 0, 106 }, + { ITEM_REVIVE, 1, 0, 0, 107 }, + { ITEM_PP_UP, 1, 0, 0, 122 }, + { ITEM_MAX_ETHER, 1, 0, 0, 109 }, + { ITEM_MAX_ELIXIR, 1, 0, 0, 110 }, + { ITEM_NUGGET, 1, 0, 0, 134 }, + { ITEM_CALCIUM, 1, 0, 0, 111 }, + { ITEM_ELIXIR, 1, 0, 0, 112 }, + { ITEM_MAX_ETHER, 1, 0, 0, 85 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 87 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 216 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 217 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 218 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 219 }, + { ITEM_TINYMUSHROOM, 1, 0, 0, 220 }, + { ITEM_PP_UP, 1, 0, 0, 198 }, + { ITEM_GUARD_SPEC_, 1, 0, 0, 199 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 227 }, + { ITEM_STAR_PIECE, 1, 0, 0, 145 }, + { ITEM_STAR_PIECE, 1, 0, 0, 138 }, + { ITEM_HYPER_POTION, 1, 0, 0, 139 }, + { ITEM_REVIVE, 1, 0, 0, 195 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 196 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 113 }, + { ITEM_BIG_MUSHROOM, 1, 0, 0, 194 }, + { ITEM_NUGGET, 1, 0, 0, 200 }, + { ITEM_STARDUST, 1, 0, 0, 174 }, + { ITEM_STARDUST, 1, 0, 0, 175 }, + { ITEM_STARDUST, 1, 0, 0, 176 }, + { ITEM_STARDUST, 1, 0, 0, 177 }, + { ITEM_RARE_CANDY, 1, 0, 0, 114 }, + { ITEM_IRON, 1, 0, 0, 166 }, + { ITEM_STAR_PIECE, 1, 0, 0, 167 }, + { ITEM_ESCAPE_ROPE, 1, 0, 0, 88 }, + { ITEM_ICE_HEAL, 1, 0, 0, 89 }, + { ITEM_PEARL, 1, 0, 0, 90 }, + { ITEM_PEARL, 1, 0, 0, 91 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 92 }, + { ITEM_RARE_CANDY, 1, 0, 0, 210 }, + { ITEM_ZINC, 1, 0, 0, 223 }, + { ITEM_BIG_PEARL, 1, 0, 0, 180 }, + { ITEM_PEARL, 1, 0, 0, 178 }, + { ITEM_PEARL, 1, 0, 0, 179 }, + { ITEM_REVIVE, 1, 0, 0, 207 }, + { ITEM_MAX_ELIXIR, 1, 0, 0, 208 }, + { ITEM_RARE_CANDY, 1, 0, 0, 115 }, + { ITEM_FULL_RESTORE, 1, 0, 0, 116 }, + { ITEM_DIRE_HIT, 1, 0, 0, 76 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 77 }, + { ITEM_REVIVE, 1, 0, 0, 201 }, + { ITEM_RARE_CANDY, 1, 0, 0, 165 }, + { ITEM_MAX_ETHER, 1, 0, 0, 204 }, + { ITEM_HYPER_POTION, 1, 0, 0, 205 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 202 }, + { ITEM_HYPER_POTION, 1, 0, 0, 203 }, + { ITEM_MAX_POTION, 1, 0, 0, 78 }, + { ITEM_IRON, 1, 0, 0, 222 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 206 }, + { ITEM_HYPER_POTION, 1, 0, 0, 93 }, + { ITEM_RARE_CANDY, 1, 0, 0, 94 }, + { ITEM_REVIVE, 1, 0, 0, 95 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 96 }, + { ITEM_PP_UP, 1, 0, 0, 117 }, + { ITEM_BIG_PEARL, 1, 0, 0, 118 }, + { ITEM_ZINC, 1, 0, 0, 119 }, + { ITEM_FULL_HEAL, 1, 0, 0, 120 }, + { ITEM_PROTEIN, 1, 0, 0, 221 }, + { ITEM_MAX_REVIVE, 1, 0, 0, 121 }, + { ITEM_ULTRA_BALL, 1, 0, 0, 123 }, + { ITEM_NUGGET, 1, 0, 0, 124 }, + { ITEM_DEEPSEATOOTH, 1, 0, 0, 38 }, + { ITEM_DEEPSEASCALE, 1, 0, 0, 229 }, + { ITEM_PP_MAX, 1, 0, 0, 230 }, }; #endif //_IN_FIELDMAP_C diff --git a/src/easy_chat.c b/src/easy_chat.c index 32b7af261d..4f0c8ab95f 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -54,12 +54,12 @@ static const u16 sNarcMsgBanks[EC_GROUP_MAX] = { }; static const u8 sLanguageToGreetingMap[6][2] = { - {LANGUAGE_JAPANESE, msg_0287_konnichiwa}, - { LANGUAGE_ENGLISH, msg_0287_hello }, - { LANGUAGE_FRENCH, msg_0287_bonjour }, - { LANGUAGE_ITALIAN, msg_0287_ciao }, - { LANGUAGE_GERMAN, msg_0287_hallo }, - { LANGUAGE_SPANISH, msg_0287_hola }, + { LANGUAGE_JAPANESE, msg_0287_konnichiwa }, + { LANGUAGE_ENGLISH, msg_0287_hello }, + { LANGUAGE_FRENCH, msg_0287_bonjour }, + { LANGUAGE_ITALIAN, msg_0287_ciao }, + { LANGUAGE_GERMAN, msg_0287_hallo }, + { LANGUAGE_SPANISH, msg_0287_hola }, }; // Several easy chat words are identical in @@ -86,18 +86,18 @@ typedef struct ECIdenticalPhrases { } ECIdenticalPhrases; static const ECIdenticalPhrases sIdenticalPhrases[12] = { - {sEasyChatAnticipation, NELEMS(sEasyChatAnticipation)}, - { sEasyChatHey, NELEMS(sEasyChatHey) }, - { sEasyChatHuh_, NELEMS(sEasyChatHuh_) }, - { sEasyChatI, NELEMS(sEasyChatI) }, - { sEasyChatKids, NELEMS(sEasyChatKids) }, - { sEasyChatNoWay, NELEMS(sEasyChatNoWay) }, - { sEasyChatOk, NELEMS(sEasyChatOk) }, - { sEasyChatPsychic, NELEMS(sEasyChatPsychic) }, - { sEasyChatSimple, NELEMS(sEasyChatSimple) }, - { sEasyChatWelcome, NELEMS(sEasyChatWelcome) }, - { sEasyChatWow, NELEMS(sEasyChatWow) }, - { sEasyChatYou, NELEMS(sEasyChatYou) }, + { sEasyChatAnticipation, NELEMS(sEasyChatAnticipation) }, + { sEasyChatHey, NELEMS(sEasyChatHey) }, + { sEasyChatHuh_, NELEMS(sEasyChatHuh_) }, + { sEasyChatI, NELEMS(sEasyChatI) }, + { sEasyChatKids, NELEMS(sEasyChatKids) }, + { sEasyChatNoWay, NELEMS(sEasyChatNoWay) }, + { sEasyChatOk, NELEMS(sEasyChatOk) }, + { sEasyChatPsychic, NELEMS(sEasyChatPsychic) }, + { sEasyChatSimple, NELEMS(sEasyChatSimple) }, + { sEasyChatWelcome, NELEMS(sEasyChatWelcome) }, + { sEasyChatWow, NELEMS(sEasyChatWow) }, + { sEasyChatYou, NELEMS(sEasyChatYou) }, }; EasyChatManager *EasyChatManager_New(HeapID heapId) { diff --git a/src/field/headbutt.c b/src/field/headbutt.c index 027f2c18fa..3ff09d42f7 100644 --- a/src/field/headbutt.c +++ b/src/field/headbutt.c @@ -47,55 +47,55 @@ static const s8 sRareTreeLUT_1[][1] = { }; static const s8 sRareTreeLUT_2[][2] = { - {TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON }, }; static const s8 sRareTreeLUT_3[][3] = { - {TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_NONE, TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_NONE, TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_NONE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_NONE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, }; static const s8 sRareTreeLUT_4[][4] = { - {TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON}, - { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON }, + { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, }; static const s8 sRareTreeLUT_5Plus[][5] = { - {TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, - { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, - { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON}, - { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_RARE, TREETYPE_NONE }, + { TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON, TREETYPE_RARE }, + { TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE, TREETYPE_COMMON }, + { TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_COMMON, TREETYPE_RARE, TREETYPE_NONE }, }; typedef struct TaskData_TryHeadbuttEncounter { diff --git a/src/field/legend_cutscene_camera.c b/src/field/legend_cutscene_camera.c index 938a288de1..75099fa28e 100644 --- a/src/field/legend_cutscene_camera.c +++ b/src/field/legend_cutscene_camera.c @@ -224,18 +224,18 @@ static const CameraParam sCameraParam_SoulSilver[] = { }; static const VecFx32 sCameraOffset_HeartGold[] = { - {-FX32_CONST(195), -FX32_CONST(148.605), -FX32_CONST(45.19165)}, - { FX32_CONST(198), -FX32_CONST(148.605), -FX32_CONST(45.19165)}, - { 0, -FX32_CONST(35.751708984375), -FX32_CONST(23.0476) }, - { 0, FX32_CONST(495.6323), FX32_CONST(28.73) }, + { -FX32_CONST(195), -FX32_CONST(148.605), -FX32_CONST(45.19165) }, + { FX32_CONST(198), -FX32_CONST(148.605), -FX32_CONST(45.19165) }, + { 0, -FX32_CONST(35.751708984375), -FX32_CONST(23.0476) }, + { 0, FX32_CONST(495.6323), FX32_CONST(28.73) }, }; static const VecFx32 sCameraOffset_SoulSilver[] = { - {-FX32_CONST(127), 0, -FX32_CONST(208)}, - { FX32_CONST(63), 0, -FX32_CONST(208)}, - { 0, 0, -FX32_CONST(82) }, - { 0, 0, -FX32_CONST(433)}, - { 0, 0, -FX32_CONST(225)}, + { -FX32_CONST(127), 0, -FX32_CONST(208) }, + { FX32_CONST(63), 0, -FX32_CONST(208) }, + { 0, 0, -FX32_CONST(82) }, + { 0, 0, -FX32_CONST(433) }, + { 0, 0, -FX32_CONST(225) }, }; static const u8 sBg3TilemapFileIDs[] = { diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 29f865dbb0..ca3fad63d0 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -939,9 +939,9 @@ BOOL ScrCmd_743(ScriptContext *ctx) { } static const u8 sFriendshipRoomStatuesPositions[3][2] = { - {4, 10}, - { 7, 5 }, - { 10, 10}, + { 4, 10 }, + { 7, 5 }, + { 10, 10 }, }; BOOL ScrCmd_CreatePokeathlonFriendshipRoomStatues(ScriptContext *ctx) { @@ -1163,8 +1163,8 @@ BOOL ScrCmd_RadioMusicIsPlaying(ScriptContext *ctx) { } static const int sSlotLuckDistribution[2][2] = { - {7, 3}, - { 5, 2}, + { 7, 3 }, + { 5, 2 }, }; // Return value is unused outside of Japanese copies. diff --git a/src/field_move.c b/src/field_move.c index afa9e4b84d..cb9c092ee0 100644 --- a/src/field_move.c +++ b/src/field_move.c @@ -71,20 +71,20 @@ static BOOL Task_UseHeadbuttInField(TaskManager *taskManager); static struct TeleportFieldEnv *sub_020689A4(HeapID heapId, u8 slotno, SaveData *saveData); static const struct FieldMoveFuncDat sFieldMoveFuncTable[] = { - {FieldMoveMenuUse_Cut, FieldMoveMenuCheck_Cut }, - { FieldMoveMenuUse_Fly, FieldMoveMenuCheck_Fly }, - { FieldMoveMenuUse_Surf, FieldMoveMenuCheck_Surf }, - { FieldMoveMenuUse_Strength, FieldMoveMenuCheck_Strength }, - { FieldMoveMenuUse_RockSmash, FieldMoveMenuCheck_RockSmash }, - { FieldMoveMenuUse_Waterfall, FieldMoveMenuCheck_Waterfall }, - { FieldMoveMenuUse_RockClimb, FieldMoveMenuCheck_RockClimb }, - { FieldMoveMenuUse_Flash, FieldMoveMenuCheck_Flash }, - { FieldMoveMenuUse_Teleport, FieldMoveMenuCheck_Teleport }, - { FieldMoveMenuUse_Dig, FieldMoveMenuCheck_Dig }, - { FieldMoveMenuUse_SweetScent, FieldMoveMenuCheck_SweetScent}, - { FieldMoveMenuUse_Chatter, FieldMoveMenuCheck_Chatter }, - { FieldMoveMenuUse_Whirlpool, FieldMoveMenuCheck_Whirlpool }, - { FieldMoveMenuUse_Headbutt, FieldMoveMenuCheck_Headbutt }, + { FieldMoveMenuUse_Cut, FieldMoveMenuCheck_Cut }, + { FieldMoveMenuUse_Fly, FieldMoveMenuCheck_Fly }, + { FieldMoveMenuUse_Surf, FieldMoveMenuCheck_Surf }, + { FieldMoveMenuUse_Strength, FieldMoveMenuCheck_Strength }, + { FieldMoveMenuUse_RockSmash, FieldMoveMenuCheck_RockSmash }, + { FieldMoveMenuUse_Waterfall, FieldMoveMenuCheck_Waterfall }, + { FieldMoveMenuUse_RockClimb, FieldMoveMenuCheck_RockClimb }, + { FieldMoveMenuUse_Flash, FieldMoveMenuCheck_Flash }, + { FieldMoveMenuUse_Teleport, FieldMoveMenuCheck_Teleport }, + { FieldMoveMenuUse_Dig, FieldMoveMenuCheck_Dig }, + { FieldMoveMenuUse_SweetScent, FieldMoveMenuCheck_SweetScent }, + { FieldMoveMenuUse_Chatter, FieldMoveMenuCheck_Chatter }, + { FieldMoveMenuUse_Whirlpool, FieldMoveMenuCheck_Whirlpool }, + { FieldMoveMenuUse_Headbutt, FieldMoveMenuCheck_Headbutt }, }; static inline BOOL MoveUseCheck_SafariOrPalPark(const FieldMoveCheckData *checkData) { diff --git a/src/field_roamer.c b/src/field_roamer.c index 1a25d33408..d1387cce8c 100644 --- a/src/field_roamer.c +++ b/src/field_roamer.c @@ -69,50 +69,50 @@ static const u32 sRoamerLocations[ROAMER_LOC_COUNT] = { }; static const struct RoamerAdjacency sRoamerAdjacencyTable[ROAMER_LOC_COUNT] = { - // Johto - {2, { ROAMER_LOC_R30, ROAMER_LOC_R46, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R29, ROAMER_LOC_R31, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R30, ROAMER_LOC_R32, ROAMER_LOC_R36, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R31, ROAMER_LOC_R33, ROAMER_LOC_R36, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R32, ROAMER_LOC_R34, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R33, ROAMER_LOC_R35, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R34, ROAMER_LOC_R36, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R31, ROAMER_LOC_R32, ROAMER_LOC_R37, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R36, ROAMER_LOC_R38, ROAMER_LOC_R42, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R37, ROAMER_LOC_R39, ROAMER_LOC_R42, -1, -1, -1 } }, - { 1, { ROAMER_LOC_R38, -1, -1, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R37, ROAMER_LOC_R38, ROAMER_LOC_R43, ROAMER_LOC_R44, -1, -1 } }, - { 2, { ROAMER_LOC_R42, ROAMER_LOC_R44, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R42, ROAMER_LOC_R43, ROAMER_LOC_R46, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R44, ROAMER_LOC_R46, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R29, ROAMER_LOC_R45, -1, -1, -1, -1 } }, + // Johto + { 2, { ROAMER_LOC_R30, ROAMER_LOC_R46, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R29, ROAMER_LOC_R31, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R30, ROAMER_LOC_R32, ROAMER_LOC_R36, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R31, ROAMER_LOC_R33, ROAMER_LOC_R36, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R32, ROAMER_LOC_R34, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R33, ROAMER_LOC_R35, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R34, ROAMER_LOC_R36, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R31, ROAMER_LOC_R32, ROAMER_LOC_R37, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R36, ROAMER_LOC_R38, ROAMER_LOC_R42, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R37, ROAMER_LOC_R39, ROAMER_LOC_R42, -1, -1, -1 } }, + { 1, { ROAMER_LOC_R38, -1, -1, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R37, ROAMER_LOC_R38, ROAMER_LOC_R43, ROAMER_LOC_R44, -1, -1 } }, + { 2, { ROAMER_LOC_R42, ROAMER_LOC_R44, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R42, ROAMER_LOC_R43, ROAMER_LOC_R46, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R44, ROAMER_LOC_R46, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R29, ROAMER_LOC_R45, -1, -1, -1, -1 } }, - // Kanto - { 2, { ROAMER_LOC_R02, ROAMER_LOC_R22, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R01, ROAMER_LOC_R22, ROAMER_LOC_R03, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R02, ROAMER_LOC_R04, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R03, ROAMER_LOC_R05, ROAMER_LOC_R24, -1, -1, -1 } }, - { 6, { ROAMER_LOC_R04, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R24 }}, - { 3, { ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R11, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R08, ROAMER_LOC_R16, -1, -1 } }, - { 5, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R10, ROAMER_LOC_R12, -1 } }, - { 4, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R10, ROAMER_LOC_R24, -1, -1 } }, - { 3, { ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R12, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R06, ROAMER_LOC_R12, -1, -1, -1, -1 } }, - { 4, { ROAMER_LOC_R08, ROAMER_LOC_R10, ROAMER_LOC_R11, ROAMER_LOC_R13, -1, -1 } }, - { 2, { ROAMER_LOC_R12, ROAMER_LOC_R14, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R13, ROAMER_LOC_R15, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R14, ROAMER_LOC_R18, ROAMER_LOC_W19, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R07, ROAMER_LOC_R22, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R16, ROAMER_LOC_R18, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R15, ROAMER_LOC_R17, ROAMER_LOC_W19, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R15, ROAMER_LOC_R18, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_W19, ROAMER_LOC_W21, -1, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R01, ROAMER_LOC_W19, -1, -1, -1 /*,-1*/ } }, - { 4, { ROAMER_LOC_R01, ROAMER_LOC_R02, ROAMER_LOC_R26, ROAMER_LOC_R28, -1, -1 } }, - { 3, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R09, -1, -1, -1 } }, - { 2, { ROAMER_LOC_R22, ROAMER_LOC_R28, -1, -1, -1, -1 } }, - { 3, { ROAMER_LOC_R22, ROAMER_LOC_R26, ROAMER_LOC_R09, -1, -1, -1 } }, + // Kanto + { 2, { ROAMER_LOC_R02, ROAMER_LOC_R22, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R01, ROAMER_LOC_R22, ROAMER_LOC_R03, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R02, ROAMER_LOC_R04, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R03, ROAMER_LOC_R05, ROAMER_LOC_R24, -1, -1, -1 } }, + { 6, { ROAMER_LOC_R04, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R24 } }, + { 3, { ROAMER_LOC_R07, ROAMER_LOC_R08, ROAMER_LOC_R11, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R08, ROAMER_LOC_R16, -1, -1 } }, + { 5, { ROAMER_LOC_R05, ROAMER_LOC_R06, ROAMER_LOC_R07, ROAMER_LOC_R10, ROAMER_LOC_R12, -1 } }, + { 4, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R10, ROAMER_LOC_R24, -1, -1 } }, + { 3, { ROAMER_LOC_R08, ROAMER_LOC_R09, ROAMER_LOC_R12, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R06, ROAMER_LOC_R12, -1, -1, -1, -1 } }, + { 4, { ROAMER_LOC_R08, ROAMER_LOC_R10, ROAMER_LOC_R11, ROAMER_LOC_R13, -1, -1 } }, + { 2, { ROAMER_LOC_R12, ROAMER_LOC_R14, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R13, ROAMER_LOC_R15, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R14, ROAMER_LOC_R18, ROAMER_LOC_W19, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R07, ROAMER_LOC_R22, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R16, ROAMER_LOC_R18, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R15, ROAMER_LOC_R17, ROAMER_LOC_W19, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R15, ROAMER_LOC_R18, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_W19, ROAMER_LOC_W21, -1, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R01, ROAMER_LOC_W19, -1, -1, -1 /*,-1*/ } }, + { 4, { ROAMER_LOC_R01, ROAMER_LOC_R02, ROAMER_LOC_R26, ROAMER_LOC_R28, -1, -1 } }, + { 3, { ROAMER_LOC_R04, ROAMER_LOC_R05, ROAMER_LOC_R09, -1, -1, -1 } }, + { 2, { ROAMER_LOC_R22, ROAMER_LOC_R28, -1, -1, -1, -1 } }, + { 3, { ROAMER_LOC_R22, ROAMER_LOC_R26, ROAMER_LOC_R09, -1, -1, -1 } }, }; void RoamerLocationUpdateRand(RoamerSaveData *roamer, u8 roamer_idx) { diff --git a/src/field_system_rtc_weather.c b/src/field_system_rtc_weather.c index f4fd1c5085..0a558e06e0 100644 --- a/src/field_system_rtc_weather.c +++ b/src/field_system_rtc_weather.c @@ -9,14 +9,14 @@ #include "unk_02055418.h" const MonthDay DiamondDustDates[] = { - {JANUARY, 1 }, - { JANUARY, 31}, - { FEBRUARY, 1 }, - { FEBRUARY, 29}, - { MARCH, 15}, - { OCTOBER, 10}, - { DECEMBER, 3 }, - { DECEMBER, 31}, + { JANUARY, 1 }, + { JANUARY, 31 }, + { FEBRUARY, 1 }, + { FEBRUARY, 29 }, + { MARCH, 15 }, + { OCTOBER, 10 }, + { DECEMBER, 3 }, + { DECEMBER, 31 }, }; //_020FA09C u32 FieldSystem_GetWeather_HandleDiamondDust(FieldSystem *fieldSystem, u32 mapId) { diff --git a/src/field_take_photo.c b/src/field_take_photo.c index 521fa7a736..f548feedf5 100644 --- a/src/field_take_photo.c +++ b/src/field_take_photo.c @@ -121,12 +121,12 @@ typedef struct Coord2U16 { static const Coord2U16 sSoloPhotoMonCoordOffsets = { 1, -1 }; static const Coord2U16 sPhotoMonCoordOffsets[] = { - {2, 0 }, - { 1, -1}, - { -1, -1}, - { 3, -1}, - { 0, -2}, - { 2, -2}, + { 2, 0 }, + { 1, -1 }, + { -1, -1 }, + { 3, -1 }, + { 0, -2 }, + { 2, -2 }, }; static PhotoCameraParam sCameraParam = { diff --git a/src/field_use_item.c b/src/field_use_item.c index 1f72191c35..d15a154162 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -99,36 +99,36 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager); static void RegisteredItem_CreateGoToAppTask(struct ItemFieldUseData *data, FieldApplicationWorkCtor ctor, BOOL no_app); static const struct ItemUseFuncDat sItemFieldUseFuncs[] = { - {NULL, ItemFieldUseFunc_Generic, NULL }, - { ItemMenuUseFunc_HealingItem, NULL, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_Bicycle, ItemFieldUseFunc_Bicycle, ItemCheckUseFunc_Bicycle }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_TMHM, NULL, NULL }, - { ItemMenuUseFunc_Mail, NULL, NULL }, - { ItemMenuUseFunc_Berry, NULL, ItemCheckUseFunc_Berry }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_PalPad, ItemFieldUseFunc_PalPad, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_Honey, NULL, NULL }, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_OldRod, ItemFieldUseFunc_OldRod, ItemCheckUseFunc_FishingRod}, - { ItemMenuUseFunc_GoodRod, ItemFieldUseFunc_GoodRod, ItemCheckUseFunc_FishingRod}, - { ItemMenuUseFunc_SuperRod, ItemFieldUseFunc_SuperRod, ItemCheckUseFunc_FishingRod}, - { NULL, ItemFieldUseFunc_Generic, NULL }, - { ItemMenuUseFunc_EvoStone, NULL, NULL }, - { ItemMenuUseFunc_EscapeRope, NULL, ItemCheckUseFunc_EscapeRope}, - { NULL, NULL, ItemCheckUseFunc_Dummy }, - { ItemMenuUseFunc_ApricornBox, ItemFieldUseFunc_ApricornBox, NULL }, - { ItemMenuUseFunc_BerryPots, ItemFieldUseFunc_BerryPots, NULL }, - { ItemMenuUseFunc_UnownReport, ItemFieldUseFunc_UnownReport, NULL }, - { ItemMenuUseFunc_DowsingMchn, ItemFieldUseFunc_DowsingMchn, NULL }, - { NULL, ItemFieldUseFunc_GbSounds, NULL }, - { ItemMenuUseFunc_Gracidea, ItemFieldUseFunc_Gracidea, NULL }, - { ItemMenuUseFunc_VSRecorder, ItemFieldUseFunc_VSRecorder, NULL }, + { NULL, ItemFieldUseFunc_Generic, NULL }, + { ItemMenuUseFunc_HealingItem, NULL, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_Bicycle, ItemFieldUseFunc_Bicycle, ItemCheckUseFunc_Bicycle }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_TMHM, NULL, NULL }, + { ItemMenuUseFunc_Mail, NULL, NULL }, + { ItemMenuUseFunc_Berry, NULL, ItemCheckUseFunc_Berry }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_PalPad, ItemFieldUseFunc_PalPad, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_Honey, NULL, NULL }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_OldRod, ItemFieldUseFunc_OldRod, ItemCheckUseFunc_FishingRod }, + { ItemMenuUseFunc_GoodRod, ItemFieldUseFunc_GoodRod, ItemCheckUseFunc_FishingRod }, + { ItemMenuUseFunc_SuperRod, ItemFieldUseFunc_SuperRod, ItemCheckUseFunc_FishingRod }, + { NULL, ItemFieldUseFunc_Generic, NULL }, + { ItemMenuUseFunc_EvoStone, NULL, NULL }, + { ItemMenuUseFunc_EscapeRope, NULL, ItemCheckUseFunc_EscapeRope }, + { NULL, NULL, ItemCheckUseFunc_Dummy }, + { ItemMenuUseFunc_ApricornBox, ItemFieldUseFunc_ApricornBox, NULL }, + { ItemMenuUseFunc_BerryPots, ItemFieldUseFunc_BerryPots, NULL }, + { ItemMenuUseFunc_UnownReport, ItemFieldUseFunc_UnownReport, NULL }, + { ItemMenuUseFunc_DowsingMchn, ItemFieldUseFunc_DowsingMchn, NULL }, + { NULL, ItemFieldUseFunc_GbSounds, NULL }, + { ItemMenuUseFunc_Gracidea, ItemFieldUseFunc_Gracidea, NULL }, + { ItemMenuUseFunc_VSRecorder, ItemFieldUseFunc_VSRecorder, NULL }, }; void *GetItemFieldUseFunc(int funcType, u16 itemType) { diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index b8c6641ac5..b690280833 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -102,12 +102,12 @@ static BOOL sub_02053F70(TaskManager *taskManager); static BOOL sub_020540A4(TaskManager *taskManager); static const struct UnkStruct_020FC5CC _020FC5CC[] = { - {1, 0, 0, 0, 0, 1, 0, 0, 64, 12}, - { 1, 2, 0, 0, 0, 1, 0, 0, 64, 12}, - { 3, 0, 0, 0, 0, 1, 0, 0, 64, 12}, - { 1, 1, 1, 0, 1, 1, 1, 0, 64, 12}, - { 1, 1, 1, 0, 1, 1, 1, 0, 0, 10}, - { 6, 0, 0, 0, 0, 1, 0, 0, 64, 12}, + { 1, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, + { 1, 2, 0, 0, 0, 1, 0, 0, 64, 12 }, + { 3, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, + { 1, 1, 1, 0, 1, 1, 1, 0, 64, 12 }, + { 1, 1, 1, 0, 1, 1, 1, 0, 0, 10 }, + { 6, 0, 0, 0, 0, 1, 0, 0, 64, 12 }, }; static void sub_02052F30(FieldSystem *fieldSystem) { diff --git a/src/fieldmap.c b/src/fieldmap.c index 1d6a4f618b..cddb115516 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -31,36 +31,36 @@ struct HiddenItemData { #include "data/fieldmap.h" const struct ScriptBankMapping sScriptBankMapping[30] = { - {_std_scratch_card, NARC_scr_seq_scr_seq_0263_bin, NARC_msg_msg_0433_bin}, - { _std_frontier_records, NARC_scr_seq_scr_seq_0264_bin, NARC_msg_msg_0019_bin}, - { _std_frontier_move_tutor, NARC_scr_seq_scr_seq_0002_bin, NARC_msg_msg_0748_bin}, - { _std_bug_contest, NARC_scr_seq_scr_seq_0151_bin, NARC_msg_msg_0246_bin}, - { _std_trainer_house, NARC_scr_seq_scr_seq_0952_bin, NARC_msg_msg_0726_bin}, - { 10300, NARC_scr_seq_scr_seq_0734_bin, NARC_msg_msg_0444_bin}, - { _std_mystery_gift, NARC_scr_seq_scr_seq_0144_bin, NARC_msg_msg_0209_bin}, - { 10150, NARC_scr_seq_scr_seq_0955_bin, NARC_msg_msg_0732_bin}, - { _std_tv, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin}, - { _std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin}, - { _std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin}, - { 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin}, - { _std_pokeathlon, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin}, - { 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin}, - { _std_following_mon, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin}, - { _std_init, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin}, - { _std_daycare, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin}, - { _std_group, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin}, - { _std_wifi_reception, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin}, - { _std_colosseum, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin}, - { _std_comm_reception, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin}, - { _std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin}, - { _std_safari, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin}, - { _std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin}, // Hidden Items - { _std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin}, - { _std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin}, - { _std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin}, - { _std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin}, - { _std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin}, - { _std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin}, + { _std_scratch_card, NARC_scr_seq_scr_seq_0263_bin, NARC_msg_msg_0433_bin }, + { _std_frontier_records, NARC_scr_seq_scr_seq_0264_bin, NARC_msg_msg_0019_bin }, + { _std_frontier_move_tutor, NARC_scr_seq_scr_seq_0002_bin, NARC_msg_msg_0748_bin }, + { _std_bug_contest, NARC_scr_seq_scr_seq_0151_bin, NARC_msg_msg_0246_bin }, + { _std_trainer_house, NARC_scr_seq_scr_seq_0952_bin, NARC_msg_msg_0726_bin }, + { 10300, NARC_scr_seq_scr_seq_0734_bin, NARC_msg_msg_0444_bin }, + { _std_mystery_gift, NARC_scr_seq_scr_seq_0144_bin, NARC_msg_msg_0209_bin }, + { 10150, NARC_scr_seq_scr_seq_0955_bin, NARC_msg_msg_0732_bin }, + { _std_tv, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin }, + { _std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin }, + { _std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin }, + { 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin }, + { _std_pokeathlon, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin }, + { 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin }, + { _std_following_mon, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin }, + { _std_init, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin }, + { _std_daycare, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin }, + { _std_group, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin }, + { _std_wifi_reception, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin }, + { _std_colosseum, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin }, + { _std_comm_reception, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin }, + { _std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin }, + { _std_safari, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin }, + { _std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin }, // Hidden Items + { _std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin }, + { _std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin }, + { _std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin }, + { _std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin }, + { _std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin }, + { _std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin }, }; void StartMapSceneScript(FieldSystem *fieldSystem, u16 script, LocalMapObject *lastInteracted) { diff --git a/src/font.c b/src/font.c index 8c688ded8e..be6e5e2f07 100644 --- a/src/font.c +++ b/src/font.c @@ -17,22 +17,22 @@ struct FontWork { static struct FontWork *sFontWork = NULL; static const u16 sFontArcParam[][2] = { - {0x0000, FALSE}, - { 0x0001, FALSE}, - { 0x0002, FALSE}, - { 0x0003, FALSE}, - { 0x0004, FALSE}, - { 0x000A, FALSE}, + { 0x0000, FALSE }, + { 0x0001, FALSE }, + { 0x0002, FALSE }, + { 0x0003, FALSE }, + { 0x0004, FALSE }, + { 0x000A, FALSE }, }; static const struct FontInfo sFontInfos[] = { - {0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02}, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x0B, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x0A, 0x10, 0x00, 0x00, 0x00, 0x01, 0x0F, 0x02 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; void FontWork_Init(void) { diff --git a/src/font_data.c b/src/font_data.c index f9865a0a48..81f8cf3fc6 100644 --- a/src/font_data.c +++ b/src/font_data.c @@ -77,8 +77,8 @@ void FontData_ModeSwitch(struct FontData *fontData, int mode, HeapID heapId) { static void FontData_Init(struct FontData *fontData, NarcId narcId, int fileId, BOOL isFixedWidth, HeapID heapId) { static const u8 _020F6324[][2] = { - {GLYPHSHAPE_8x8, GLYPHSHAPE_8x16 }, - { GLYPHSHAPE_16x8, GLYPHSHAPE_16x16} + { GLYPHSHAPE_8x8, GLYPHSHAPE_8x16 }, + { GLYPHSHAPE_16x8, GLYPHSHAPE_16x16 } }; fontData->narc = NARC_New(narcId, heapId); if (fontData->narc != NULL) { diff --git a/src/get_egg.c b/src/get_egg.c index 84d64422f2..043c203ba1 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -529,15 +529,15 @@ void Save_Daycare_ResetEggStats(Daycare *dayCare) { } static const u16 _020FF4AE[][3] = { - {SPECIES_WYNAUT, ITEM_LAX_INCENSE, SPECIES_WOBBUFFET}, - { SPECIES_AZURILL, ITEM_SEA_INCENSE, SPECIES_MARILL }, - { SPECIES_MIME_JR, ITEM_ODD_INCENSE, SPECIES_MR_MIME }, - { SPECIES_BONSLY, ITEM_ROCK_INCENSE, SPECIES_SUDOWOODO}, - { SPECIES_MUNCHLAX, ITEM_FULL_INCENSE, SPECIES_SNORLAX }, - { SPECIES_MANTYKE, ITEM_WAVE_INCENSE, SPECIES_MANTINE }, - { SPECIES_BUDEW, ITEM_ROSE_INCENSE, SPECIES_ROSELIA }, - { SPECIES_HAPPINY, ITEM_LUCK_INCENSE, SPECIES_CHANSEY }, - { SPECIES_CHINGLING, ITEM_PURE_INCENSE, SPECIES_CHIMECHO }, + { SPECIES_WYNAUT, ITEM_LAX_INCENSE, SPECIES_WOBBUFFET }, + { SPECIES_AZURILL, ITEM_SEA_INCENSE, SPECIES_MARILL }, + { SPECIES_MIME_JR, ITEM_ODD_INCENSE, SPECIES_MR_MIME }, + { SPECIES_BONSLY, ITEM_ROCK_INCENSE, SPECIES_SUDOWOODO }, + { SPECIES_MUNCHLAX, ITEM_FULL_INCENSE, SPECIES_SNORLAX }, + { SPECIES_MANTYKE, ITEM_WAVE_INCENSE, SPECIES_MANTINE }, + { SPECIES_BUDEW, ITEM_ROSE_INCENSE, SPECIES_ROSELIA }, + { SPECIES_HAPPINY, ITEM_LUCK_INCENSE, SPECIES_CHANSEY }, + { SPECIES_CHINGLING, ITEM_PURE_INCENSE, SPECIES_CHIMECHO }, }; static u16 Daycare_BreedingIncenseCheck(u16 species, Daycare *dayCare) { diff --git a/src/gymmick_init.c b/src/gymmick_init.c index c11a22d592..994bb1fde5 100644 --- a/src/gymmick_init.c +++ b/src/gymmick_init.c @@ -19,21 +19,21 @@ typedef struct TrashCan { } TrashCan; static const TrashCan sTrashCans[NUM_TRASH_CANS] = { - [0] = {.numNeighbors = 2, .neighbors = { 1, 5, 0xFF, 0xFF } }, - [1] = { .numNeighbors = 3, .neighbors = { 0, 2, 6, 0xFF } }, - [2] = { .numNeighbors = 3, .neighbors = { 1, 3, 7, 0xFF } }, - [3] = { .numNeighbors = 3, .neighbors = { 2, 4, 8, 0xFF } }, - [4] = { .numNeighbors = 2, .neighbors = { 3, 9, 0xFF, 0xFF } }, - [5] = { .numNeighbors = 3, .neighbors = { 0, 6, 10, 0xFF } }, - [6] = { .numNeighbors = 4, .neighbors = { 1, 5, 7, 11 } }, - [7] = { .numNeighbors = 4, .neighbors = { 2, 6, 8, 12 } }, - [8] = { .numNeighbors = 4, .neighbors = { 3, 7, 9, 13 } }, - [9] = { .numNeighbors = 3, .neighbors = { 4, 8, 14, 0xFF } }, - [10] = { .numNeighbors = 2, .neighbors = { 5, 11, 0xFF, 0xFF }}, - [11] = { .numNeighbors = 3, .neighbors = { 6, 10, 12, 0xFF } }, - [12] = { .numNeighbors = 3, .neighbors = { 7, 11, 13, 0xFF } }, - [13] = { .numNeighbors = 3, .neighbors = { 8, 12, 14, 0xFF } }, - [14] = { .numNeighbors = 2, .neighbors = { 9, 13, 0xFF, 0xFF }}, + [0] = { .numNeighbors = 2, .neighbors = { 1, 5, 0xFF, 0xFF } }, + [1] = { .numNeighbors = 3, .neighbors = { 0, 2, 6, 0xFF } }, + [2] = { .numNeighbors = 3, .neighbors = { 1, 3, 7, 0xFF } }, + [3] = { .numNeighbors = 3, .neighbors = { 2, 4, 8, 0xFF } }, + [4] = { .numNeighbors = 2, .neighbors = { 3, 9, 0xFF, 0xFF } }, + [5] = { .numNeighbors = 3, .neighbors = { 0, 6, 10, 0xFF } }, + [6] = { .numNeighbors = 4, .neighbors = { 1, 5, 7, 11 } }, + [7] = { .numNeighbors = 4, .neighbors = { 2, 6, 8, 12 } }, + [8] = { .numNeighbors = 4, .neighbors = { 3, 7, 9, 13 } }, + [9] = { .numNeighbors = 3, .neighbors = { 4, 8, 14, 0xFF } }, + [10] = { .numNeighbors = 2, .neighbors = { 5, 11, 0xFF, 0xFF } }, + [11] = { .numNeighbors = 3, .neighbors = { 6, 10, 12, 0xFF } }, + [12] = { .numNeighbors = 3, .neighbors = { 7, 11, 13, 0xFF } }, + [13] = { .numNeighbors = 3, .neighbors = { 8, 12, 14, 0xFF } }, + [14] = { .numNeighbors = 2, .neighbors = { 9, 13, 0xFF, 0xFF } }, }; void InitEcruteakGym(FieldSystem *fieldSystem) { diff --git a/src/intro_movie_scene_3.c b/src/intro_movie_scene_3.c index 5b758d8fb5..886c68caad 100644 --- a/src/intro_movie_scene_3.c +++ b/src/intro_movie_scene_3.c @@ -80,10 +80,10 @@ static const int sMap3dObjFileIds[3][2] = { static const CameraParam sCameraParam = { FX32_CONST(410.922119140625), - {0xD602, + { 0xD602, 0x0000, 0x0000, - 0}, + 0 }, 0, 0x05C1, FALSE, @@ -122,9 +122,9 @@ static const VecFx32 sLightVectors[3][4] = { }; static const GXRgb sLightColors[3][4] = { - {RGB(22, 22, 20), RGB(0, 0, 0), RGB(0, 4, 9), RGB(0, 0, 0)}, - { RGB(11, 11, 16), RGB(0, 0, 0), RGB(18, 10, 0), RGB(0, 0, 0)}, - { RGB(19, 16, 12), RGB(0, 0, 0), RGB(16, 6, 0), RGB(0, 0, 0)}, + { RGB(22, 22, 20), RGB(0, 0, 0), RGB(0, 4, 9), RGB(0, 0, 0) }, + { RGB(11, 11, 16), RGB(0, 0, 0), RGB(18, 10, 0), RGB(0, 0, 0) }, + { RGB(19, 16, 12), RGB(0, 0, 0), RGB(16, 6, 0), RGB(0, 0, 0) }, }; static const GXRgb sDiffUse[3] = { diff --git a/src/intro_movie_scene_4.c b/src/intro_movie_scene_4.c index 0835343a67..d4261877ad 100644 --- a/src/intro_movie_scene_4.c +++ b/src/intro_movie_scene_4.c @@ -58,9 +58,9 @@ static void IntroMovie_Scene4_FlipScreensAtNextVBlank(IntroMovieScene4Data *scen static void Task_IntroMovie_Scene4_FlipScreens(SysTask *task, void *pVoid); static const int sStarterParticleResIds[3][3] = { - {6, 7, 8}, - { 3, 4, 5}, - { 0, 1, 2} + { 6, 7, 8 }, + { 3, 4, 5 }, + { 0, 1, 2 } }; static const u8 sIntroMovieScene4SpriteResCounts[4] = { 4, 4, 4, 4 }; diff --git a/src/item.c b/src/item.c index 4ef0e2fbd0..bd345812d0 100644 --- a/src/item.c +++ b/src/item.c @@ -132,543 +132,543 @@ static const u16 sTMHMMoves[] = { }; static const u16 sItemNarcIds[ITEMS_COUNT][4] = { - [ITEM_NONE] = {NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_MASTER_BALL] = { NARC_item_data_0001_bin, NARC_item_icon_item_icon_002_NCGR, NARC_item_icon_item_icon_003_NCLR, AGB_ITEM_MASTER_BALL }, - [ITEM_ULTRA_BALL] = { NARC_item_data_0002_bin, NARC_item_icon_item_icon_004_NCGR, NARC_item_icon_item_icon_005_NCLR, AGB_ITEM_ULTRA_BALL }, - [ITEM_GREAT_BALL] = { NARC_item_data_0003_bin, NARC_item_icon_item_icon_006_NCGR, NARC_item_icon_item_icon_007_NCLR, AGB_ITEM_GREAT_BALL }, - [ITEM_POKE_BALL] = { NARC_item_data_0004_bin, NARC_item_icon_item_icon_008_NCGR, NARC_item_icon_item_icon_009_NCLR, AGB_ITEM_POKE_BALL }, - [ITEM_SAFARI_BALL] = { NARC_item_data_0005_bin, NARC_item_icon_item_icon_010_NCGR, NARC_item_icon_item_icon_011_NCLR, AGB_ITEM_SAFARI_BALL }, - [ITEM_NET_BALL] = { NARC_item_data_0006_bin, NARC_item_icon_item_icon_012_NCGR, NARC_item_icon_item_icon_013_NCLR, AGB_ITEM_NET_BALL }, - [ITEM_DIVE_BALL] = { NARC_item_data_0007_bin, NARC_item_icon_item_icon_014_NCGR, NARC_item_icon_item_icon_015_NCLR, AGB_ITEM_DIVE_BALL }, - [ITEM_NEST_BALL] = { NARC_item_data_0008_bin, NARC_item_icon_item_icon_016_NCGR, NARC_item_icon_item_icon_017_NCLR, AGB_ITEM_NEST_BALL }, - [ITEM_REPEAT_BALL] = { NARC_item_data_0009_bin, NARC_item_icon_item_icon_018_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_REPEAT_BALL }, - [ITEM_TIMER_BALL] = { NARC_item_data_0010_bin, NARC_item_icon_item_icon_020_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_TIMER_BALL }, - [ITEM_LUXURY_BALL] = { NARC_item_data_0011_bin, NARC_item_icon_item_icon_021_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_LUXURY_BALL }, - [ITEM_PREMIER_BALL] = { NARC_item_data_0012_bin, NARC_item_icon_item_icon_023_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_PREMIER_BALL }, - [ITEM_DUSK_BALL] = { NARC_item_data_0013_bin, NARC_item_icon_item_icon_663_NCGR, NARC_item_icon_item_icon_664_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAL_BALL] = { NARC_item_data_0014_bin, NARC_item_icon_item_icon_665_NCGR, NARC_item_icon_item_icon_666_NCLR, AGB_ITEM_NONE }, - [ITEM_QUICK_BALL] = { NARC_item_data_0015_bin, NARC_item_icon_item_icon_667_NCGR, NARC_item_icon_item_icon_668_NCLR, AGB_ITEM_NONE }, - [ITEM_CHERISH_BALL] = { NARC_item_data_0016_bin, NARC_item_icon_item_icon_669_NCGR, NARC_item_icon_item_icon_670_NCLR, AGB_ITEM_NONE }, - [ITEM_POTION] = { NARC_item_data_0017_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_025_NCLR, AGB_ITEM_POTION }, - [ITEM_ANTIDOTE] = { NARC_item_data_0018_bin, NARC_item_icon_item_icon_026_NCGR, NARC_item_icon_item_icon_027_NCLR, AGB_ITEM_ANTIDOTE }, - [ITEM_BURN_HEAL] = { NARC_item_data_0019_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_028_NCLR, AGB_ITEM_BURN_HEAL }, - [ITEM_ICE_HEAL] = { NARC_item_data_0020_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_029_NCLR, AGB_ITEM_ICE_HEAL }, - [ITEM_AWAKENING] = { NARC_item_data_0021_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_031_NCLR, AGB_ITEM_AWAKENING }, - [ITEM_PARLYZ_HEAL] = { NARC_item_data_0022_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_032_NCLR, AGB_ITEM_PARALYZE_HEAL }, - [ITEM_FULL_RESTORE] = { NARC_item_data_0023_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_034_NCLR, AGB_ITEM_FULL_RESTORE }, - [ITEM_MAX_POTION] = { NARC_item_data_0024_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_035_NCLR, AGB_ITEM_MAX_POTION }, - [ITEM_HYPER_POTION] = { NARC_item_data_0025_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_036_NCLR, AGB_ITEM_HYPER_POTION }, - [ITEM_SUPER_POTION] = { NARC_item_data_0026_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_037_NCLR, AGB_ITEM_SUPER_POTION }, - [ITEM_FULL_HEAL] = { NARC_item_data_0027_bin, NARC_item_icon_item_icon_038_NCGR, NARC_item_icon_item_icon_039_NCLR, AGB_ITEM_FULL_HEAL }, - [ITEM_REVIVE] = { NARC_item_data_0028_bin, NARC_item_icon_item_icon_040_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_REVIVE }, - [ITEM_MAX_REVIVE] = { NARC_item_data_0029_bin, NARC_item_icon_item_icon_041_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_MAX_REVIVE }, - [ITEM_FRESH_WATER] = { NARC_item_data_0030_bin, NARC_item_icon_item_icon_043_NCGR, NARC_item_icon_item_icon_044_NCLR, AGB_ITEM_FRESH_WATER }, - [ITEM_SODA_POP] = { NARC_item_data_0031_bin, NARC_item_icon_item_icon_045_NCGR, NARC_item_icon_item_icon_046_NCLR, AGB_ITEM_SODA_POP }, - [ITEM_LEMONADE] = { NARC_item_data_0032_bin, NARC_item_icon_item_icon_047_NCGR, NARC_item_icon_item_icon_048_NCLR, AGB_ITEM_LEMONADE }, - [ITEM_MOOMOO_MILK] = { NARC_item_data_0033_bin, NARC_item_icon_item_icon_049_NCGR, NARC_item_icon_item_icon_050_NCLR, AGB_ITEM_MOOMOO_MILK }, - [ITEM_ENERGYPOWDER] = { NARC_item_data_0034_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_052_NCLR, AGB_ITEM_ENERGY_POWDER }, - [ITEM_ENERGY_ROOT] = { NARC_item_data_0035_bin, NARC_item_icon_item_icon_053_NCGR, NARC_item_icon_item_icon_054_NCLR, AGB_ITEM_ENERGY_ROOT }, - [ITEM_HEAL_POWDER] = { NARC_item_data_0036_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_055_NCLR, AGB_ITEM_HEAL_POWDER }, - [ITEM_REVIVAL_HERB] = { NARC_item_data_0037_bin, NARC_item_icon_item_icon_056_NCGR, NARC_item_icon_item_icon_057_NCLR, AGB_ITEM_REVIVAL_HERB }, - [ITEM_ETHER] = { NARC_item_data_0038_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_059_NCLR, AGB_ITEM_ETHER }, - [ITEM_MAX_ETHER] = { NARC_item_data_0039_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_060_NCLR, AGB_ITEM_MAX_ETHER }, - [ITEM_ELIXIR] = { NARC_item_data_0040_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_061_NCLR, AGB_ITEM_ELIXIR }, - [ITEM_MAX_ELIXIR] = { NARC_item_data_0041_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_062_NCLR, AGB_ITEM_MAX_ELIXIR }, - [ITEM_LAVA_COOKIE] = { NARC_item_data_0042_bin, NARC_item_icon_item_icon_063_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_LAVA_COOKIE }, - [ITEM_BERRY_JUICE] = { NARC_item_data_0043_bin, NARC_item_icon_item_icon_071_NCGR, NARC_item_icon_item_icon_072_NCLR, AGB_ITEM_BERRY_JUICE }, - [ITEM_SACRED_ASH] = { NARC_item_data_0044_bin, NARC_item_icon_item_icon_073_NCGR, NARC_item_icon_item_icon_074_NCLR, AGB_ITEM_SACRED_ASH }, - [ITEM_HP_UP] = { NARC_item_data_0045_bin, NARC_item_icon_item_icon_083_NCGR, NARC_item_icon_item_icon_084_NCLR, AGB_ITEM_HP_UP }, - [ITEM_PROTEIN] = { NARC_item_data_0046_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_086_NCLR, AGB_ITEM_PROTEIN }, - [ITEM_IRON] = { NARC_item_data_0047_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_087_NCLR, AGB_ITEM_IRON }, - [ITEM_CARBOS] = { NARC_item_data_0048_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_088_NCLR, AGB_ITEM_CARBOS }, - [ITEM_CALCIUM] = { NARC_item_data_0049_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_089_NCLR, AGB_ITEM_CALCIUM }, - [ITEM_RARE_CANDY] = { NARC_item_data_0050_bin, NARC_item_icon_item_icon_090_NCGR, NARC_item_icon_item_icon_091_NCLR, AGB_ITEM_RARE_CANDY }, - [ITEM_PP_UP] = { NARC_item_data_0051_bin, NARC_item_icon_item_icon_092_NCGR, NARC_item_icon_item_icon_093_NCLR, AGB_ITEM_PP_UP }, - [ITEM_ZINC] = { NARC_item_data_0052_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_094_NCLR, AGB_ITEM_ZINC }, - [ITEM_PP_MAX] = { NARC_item_data_0053_bin, NARC_item_icon_item_icon_095_NCGR, NARC_item_icon_item_icon_096_NCLR, AGB_ITEM_PP_MAX }, - [ITEM_OLD_GATEAU] = { NARC_item_data_0054_bin, NARC_item_icon_item_icon_466_NCGR, NARC_item_icon_item_icon_467_NCLR, AGB_ITEM_NONE }, - [ITEM_GUARD_SPEC_] = { NARC_item_data_0055_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_097_NCLR, AGB_ITEM_POKEHEARTGOLD_AGB_SPEC}, - [ITEM_DIRE_HIT] = { NARC_item_data_0056_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_098_NCLR, AGB_ITEM_DIRE_HIT }, - [ITEM_X_ATTACK] = { NARC_item_data_0057_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_099_NCLR, AGB_ITEM_X_ATTACK }, - [ITEM_X_DEFENSE] = { NARC_item_data_0058_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_101_NCLR, AGB_ITEM_X_DEFEND }, - [ITEM_X_SPEED] = { NARC_item_data_0059_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_102_NCLR, AGB_ITEM_X_SPEED }, - [ITEM_X_ACCURACY] = { NARC_item_data_0060_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_103_NCLR, AGB_ITEM_X_ACCURACY }, - [ITEM_X_SPECIAL] = { NARC_item_data_0061_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_104_NCLR, AGB_ITEM_X_SPECIAL }, - [ITEM_X_SP__DEF] = { NARC_item_data_0062_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_469_NCLR, AGB_ITEM_NONE }, - [ITEM_POKE_DOLL] = { NARC_item_data_0063_bin, NARC_item_icon_item_icon_105_NCGR, NARC_item_icon_item_icon_106_NCLR, AGB_ITEM_POKE_DOLL }, - [ITEM_FLUFFY_TAIL] = { NARC_item_data_0064_bin, NARC_item_icon_item_icon_107_NCGR, NARC_item_icon_item_icon_108_NCLR, AGB_ITEM_FLUFFY_TAIL }, - [ITEM_BLUE_FLUTE] = { NARC_item_data_0065_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_066_NCLR, AGB_ITEM_BLUE_FLUTE }, - [ITEM_YELLOW_FLUTE] = { NARC_item_data_0066_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_067_NCLR, AGB_ITEM_YELLOW_FLUTE }, - [ITEM_RED_FLUTE] = { NARC_item_data_0067_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_068_NCLR, AGB_ITEM_RED_FLUTE }, - [ITEM_BLACK_FLUTE] = { NARC_item_data_0068_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_069_NCLR, AGB_ITEM_BLACK_FLUTE }, - [ITEM_WHITE_FLUTE] = { NARC_item_data_0069_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_070_NCLR, AGB_ITEM_WHITE_FLUTE }, - [ITEM_SHOAL_SALT] = { NARC_item_data_0070_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_075_NCLR, AGB_ITEM_SHOAL_SALT }, - [ITEM_SHOAL_SHELL] = { NARC_item_data_0071_bin, NARC_item_icon_item_icon_076_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHOAL_SHELL }, - [ITEM_RED_SHARD] = { NARC_item_data_0072_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_079_NCLR, AGB_ITEM_RED_SHARD }, - [ITEM_BLUE_SHARD] = { NARC_item_data_0073_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_080_NCLR, AGB_ITEM_BLUE_SHARD }, - [ITEM_YELLOW_SHARD] = { NARC_item_data_0074_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_081_NCLR, AGB_ITEM_YELLOW_SHARD }, - [ITEM_GREEN_SHARD] = { NARC_item_data_0075_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_082_NCLR, AGB_ITEM_GREEN_SHARD }, - [ITEM_SUPER_REPEL] = { NARC_item_data_0076_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_110_NCLR, AGB_ITEM_SUPER_REPEL }, - [ITEM_MAX_REPEL] = { NARC_item_data_0077_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_111_NCLR, AGB_ITEM_MAX_REPEL }, - [ITEM_ESCAPE_ROPE] = { NARC_item_data_0078_bin, NARC_item_icon_item_icon_112_NCGR, NARC_item_icon_item_icon_113_NCLR, AGB_ITEM_ESCAPE_ROPE }, - [ITEM_REPEL] = { NARC_item_data_0079_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_114_NCLR, AGB_ITEM_REPEL }, - [ITEM_SUN_STONE] = { NARC_item_data_0080_bin, NARC_item_icon_item_icon_115_NCGR, NARC_item_icon_item_icon_116_NCLR, AGB_ITEM_SUN_STONE }, - [ITEM_MOON_STONE] = { NARC_item_data_0081_bin, NARC_item_icon_item_icon_117_NCGR, NARC_item_icon_item_icon_118_NCLR, AGB_ITEM_MOON_STONE }, - [ITEM_FIRE_STONE] = { NARC_item_data_0082_bin, NARC_item_icon_item_icon_119_NCGR, NARC_item_icon_item_icon_120_NCLR, AGB_ITEM_FIRE_STONE }, - [ITEM_THUNDERSTONE] = { NARC_item_data_0083_bin, NARC_item_icon_item_icon_121_NCGR, NARC_item_icon_item_icon_122_NCLR, AGB_ITEM_THUNDER_STONE }, - [ITEM_WATER_STONE] = { NARC_item_data_0084_bin, NARC_item_icon_item_icon_123_NCGR, NARC_item_icon_item_icon_124_NCLR, AGB_ITEM_WATER_STONE }, - [ITEM_LEAF_STONE] = { NARC_item_data_0085_bin, NARC_item_icon_item_icon_125_NCGR, NARC_item_icon_item_icon_126_NCLR, AGB_ITEM_LEAF_STONE }, - [ITEM_TINYMUSHROOM] = { NARC_item_data_0086_bin, NARC_item_icon_item_icon_127_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_TINY_MUSHROOM }, - [ITEM_BIG_MUSHROOM] = { NARC_item_data_0087_bin, NARC_item_icon_item_icon_128_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_BIG_MUSHROOM }, - [ITEM_PEARL] = { NARC_item_data_0088_bin, NARC_item_icon_item_icon_130_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_PEARL }, - [ITEM_BIG_PEARL] = { NARC_item_data_0089_bin, NARC_item_icon_item_icon_132_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_BIG_PEARL }, - [ITEM_STARDUST] = { NARC_item_data_0090_bin, NARC_item_icon_item_icon_133_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STARDUST }, - [ITEM_STAR_PIECE] = { NARC_item_data_0091_bin, NARC_item_icon_item_icon_135_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STAR_PIECE }, - [ITEM_NUGGET] = { NARC_item_data_0092_bin, NARC_item_icon_item_icon_136_NCGR, NARC_item_icon_item_icon_137_NCLR, AGB_ITEM_NUGGET }, - [ITEM_HEART_SCALE] = { NARC_item_data_0093_bin, NARC_item_icon_item_icon_138_NCGR, NARC_item_icon_item_icon_139_NCLR, AGB_ITEM_HEART_SCALE }, - [ITEM_HONEY] = { NARC_item_data_0094_bin, NARC_item_icon_item_icon_470_NCGR, NARC_item_icon_item_icon_471_NCLR, AGB_ITEM_NONE }, - [ITEM_GROWTH_MULCH] = { NARC_item_data_0095_bin, NARC_item_icon_item_icon_472_NCGR, NARC_item_icon_item_icon_473_NCLR, AGB_ITEM_NONE }, - [ITEM_DAMP_MULCH] = { NARC_item_data_0096_bin, NARC_item_icon_item_icon_474_NCGR, NARC_item_icon_item_icon_475_NCLR, AGB_ITEM_NONE }, - [ITEM_STABLE_MULCH] = { NARC_item_data_0097_bin, NARC_item_icon_item_icon_476_NCGR, NARC_item_icon_item_icon_477_NCLR, AGB_ITEM_NONE }, - [ITEM_GOOEY_MULCH] = { NARC_item_data_0098_bin, NARC_item_icon_item_icon_478_NCGR, NARC_item_icon_item_icon_479_NCLR, AGB_ITEM_NONE }, - [ITEM_ROOT_FOSSIL] = { NARC_item_data_0099_bin, NARC_item_icon_item_icon_392_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_ROOT_FOSSIL }, - [ITEM_CLAW_FOSSIL] = { NARC_item_data_0100_bin, NARC_item_icon_item_icon_394_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_CLAW_FOSSIL }, - [ITEM_HELIX_FOSSIL] = { NARC_item_data_0101_bin, NARC_item_icon_item_icon_431_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_HELIX_FOSSIL }, - [ITEM_DOME_FOSSIL] = { NARC_item_data_0102_bin, NARC_item_icon_item_icon_433_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_DOME_FOSSIL }, - [ITEM_OLD_AMBER] = { NARC_item_data_0103_bin, NARC_item_icon_item_icon_425_NCGR, NARC_item_icon_item_icon_426_NCLR, AGB_ITEM_OLD_AMBER }, - [ITEM_ARMOR_FOSSIL] = { NARC_item_data_0104_bin, NARC_item_icon_item_icon_617_NCGR, NARC_item_icon_item_icon_618_NCLR, AGB_ITEM_NONE }, - [ITEM_SKULL_FOSSIL] = { NARC_item_data_0105_bin, NARC_item_icon_item_icon_615_NCGR, NARC_item_icon_item_icon_616_NCLR, AGB_ITEM_NONE }, - [ITEM_RARE_BONE] = { NARC_item_data_0106_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_NONE }, - [ITEM_SHINY_STONE] = { NARC_item_data_0107_bin, NARC_item_icon_item_icon_480_NCGR, NARC_item_icon_item_icon_481_NCLR, AGB_ITEM_NONE }, - [ITEM_DUSK_STONE] = { NARC_item_data_0108_bin, NARC_item_icon_item_icon_482_NCGR, NARC_item_icon_item_icon_483_NCLR, AGB_ITEM_NONE }, - [ITEM_DAWN_STONE] = { NARC_item_data_0109_bin, NARC_item_icon_item_icon_484_NCGR, NARC_item_icon_item_icon_485_NCLR, AGB_ITEM_NONE }, - [ITEM_OVAL_STONE] = { NARC_item_data_0110_bin, NARC_item_icon_item_icon_486_NCGR, NARC_item_icon_item_icon_487_NCLR, AGB_ITEM_NONE }, - [ITEM_ODD_KEYSTONE] = { NARC_item_data_0111_bin, NARC_item_icon_item_icon_488_NCGR, NARC_item_icon_item_icon_489_NCLR, AGB_ITEM_NONE }, - [ITEM_GRISEOUS_ORB] = { NARC_item_data_0112_bin, NARC_item_icon_item_icon_699_NCGR, NARC_item_icon_item_icon_700_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_113] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_114] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_115] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_116] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_117] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_118] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_119] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_120] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_121] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_122] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_123] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_124] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_125] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_126] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_127] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_128] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_129] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_130] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_131] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_132] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_133] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_UNUSED_134] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_ADAMANT_ORB] = { NARC_item_data_0113_bin, NARC_item_icon_item_icon_648_NCGR, NARC_item_icon_item_icon_649_NCLR, AGB_ITEM_NONE }, - [ITEM_LUSTROUS_ORB] = { NARC_item_data_0114_bin, NARC_item_icon_item_icon_646_NCGR, NARC_item_icon_item_icon_647_NCLR, AGB_ITEM_NONE }, - [ITEM_GRASS_MAIL] = { NARC_item_data_0115_bin, NARC_item_icon_item_icon_140_NCGR, NARC_item_icon_item_icon_141_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_MAIL] = { NARC_item_data_0116_bin, NARC_item_icon_item_icon_142_NCGR, NARC_item_icon_item_icon_143_NCLR, AGB_ITEM_NONE }, - [ITEM_BUBBLE_MAIL] = { NARC_item_data_0117_bin, NARC_item_icon_item_icon_144_NCGR, NARC_item_icon_item_icon_145_NCLR, AGB_ITEM_NONE }, - [ITEM_BLOOM_MAIL] = { NARC_item_data_0118_bin, NARC_item_icon_item_icon_146_NCGR, NARC_item_icon_item_icon_147_NCLR, AGB_ITEM_NONE }, - [ITEM_TUNNEL_MAIL] = { NARC_item_data_0119_bin, NARC_item_icon_item_icon_148_NCGR, NARC_item_icon_item_icon_149_NCLR, AGB_ITEM_NONE }, - [ITEM_STEEL_MAIL] = { NARC_item_data_0120_bin, NARC_item_icon_item_icon_150_NCGR, NARC_item_icon_item_icon_151_NCLR, AGB_ITEM_NONE }, - [ITEM_HEART_MAIL] = { NARC_item_data_0121_bin, NARC_item_icon_item_icon_152_NCGR, NARC_item_icon_item_icon_153_NCLR, AGB_ITEM_NONE }, - [ITEM_SNOW_MAIL] = { NARC_item_data_0122_bin, NARC_item_icon_item_icon_154_NCGR, NARC_item_icon_item_icon_155_NCLR, AGB_ITEM_NONE }, - [ITEM_SPACE_MAIL] = { NARC_item_data_0123_bin, NARC_item_icon_item_icon_156_NCGR, NARC_item_icon_item_icon_157_NCLR, AGB_ITEM_NONE }, - [ITEM_AIR_MAIL] = { NARC_item_data_0124_bin, NARC_item_icon_item_icon_158_NCGR, NARC_item_icon_item_icon_159_NCLR, AGB_ITEM_NONE }, - [ITEM_MOSAIC_MAIL] = { NARC_item_data_0125_bin, NARC_item_icon_item_icon_160_NCGR, NARC_item_icon_item_icon_161_NCLR, AGB_ITEM_NONE }, - [ITEM_BRICK_MAIL] = { NARC_item_data_0126_bin, NARC_item_icon_item_icon_162_NCGR, NARC_item_icon_item_icon_163_NCLR, AGB_ITEM_NONE }, - [ITEM_CHERI_BERRY] = { NARC_item_data_0127_bin, NARC_item_icon_item_icon_164_NCGR, NARC_item_icon_item_icon_165_NCLR, AGB_ITEM_CHERI_BERRY }, - [ITEM_CHESTO_BERRY] = { NARC_item_data_0128_bin, NARC_item_icon_item_icon_166_NCGR, NARC_item_icon_item_icon_167_NCLR, AGB_ITEM_CHESTO_BERRY }, - [ITEM_PECHA_BERRY] = { NARC_item_data_0129_bin, NARC_item_icon_item_icon_168_NCGR, NARC_item_icon_item_icon_169_NCLR, AGB_ITEM_PECHA_BERRY }, - [ITEM_RAWST_BERRY] = { NARC_item_data_0130_bin, NARC_item_icon_item_icon_170_NCGR, NARC_item_icon_item_icon_171_NCLR, AGB_ITEM_RAWST_BERRY }, - [ITEM_ASPEAR_BERRY] = { NARC_item_data_0131_bin, NARC_item_icon_item_icon_172_NCGR, NARC_item_icon_item_icon_173_NCLR, AGB_ITEM_ASPEAR_BERRY }, - [ITEM_LEPPA_BERRY] = { NARC_item_data_0132_bin, NARC_item_icon_item_icon_174_NCGR, NARC_item_icon_item_icon_175_NCLR, AGB_ITEM_LEPPA_BERRY }, - [ITEM_ORAN_BERRY] = { NARC_item_data_0133_bin, NARC_item_icon_item_icon_176_NCGR, NARC_item_icon_item_icon_177_NCLR, AGB_ITEM_ORAN_BERRY }, - [ITEM_PERSIM_BERRY] = { NARC_item_data_0134_bin, NARC_item_icon_item_icon_178_NCGR, NARC_item_icon_item_icon_179_NCLR, AGB_ITEM_PERSIM_BERRY }, - [ITEM_LUM_BERRY] = { NARC_item_data_0135_bin, NARC_item_icon_item_icon_180_NCGR, NARC_item_icon_item_icon_181_NCLR, AGB_ITEM_LUM_BERRY }, - [ITEM_SITRUS_BERRY] = { NARC_item_data_0136_bin, NARC_item_icon_item_icon_182_NCGR, NARC_item_icon_item_icon_183_NCLR, AGB_ITEM_SITRUS_BERRY }, - [ITEM_FIGY_BERRY] = { NARC_item_data_0137_bin, NARC_item_icon_item_icon_184_NCGR, NARC_item_icon_item_icon_185_NCLR, AGB_ITEM_FIGY_BERRY }, - [ITEM_WIKI_BERRY] = { NARC_item_data_0138_bin, NARC_item_icon_item_icon_186_NCGR, NARC_item_icon_item_icon_187_NCLR, AGB_ITEM_WIKI_BERRY }, - [ITEM_MAGO_BERRY] = { NARC_item_data_0139_bin, NARC_item_icon_item_icon_188_NCGR, NARC_item_icon_item_icon_189_NCLR, AGB_ITEM_MAGO_BERRY }, - [ITEM_AGUAV_BERRY] = { NARC_item_data_0140_bin, NARC_item_icon_item_icon_190_NCGR, NARC_item_icon_item_icon_191_NCLR, AGB_ITEM_AGUAV_BERRY }, - [ITEM_IAPAPA_BERRY] = { NARC_item_data_0141_bin, NARC_item_icon_item_icon_192_NCGR, NARC_item_icon_item_icon_193_NCLR, AGB_ITEM_IAPAPA_BERRY }, - [ITEM_RAZZ_BERRY] = { NARC_item_data_0142_bin, NARC_item_icon_item_icon_194_NCGR, NARC_item_icon_item_icon_195_NCLR, AGB_ITEM_RAZZ_BERRY }, - [ITEM_BLUK_BERRY] = { NARC_item_data_0143_bin, NARC_item_icon_item_icon_196_NCGR, NARC_item_icon_item_icon_197_NCLR, AGB_ITEM_BLUK_BERRY }, - [ITEM_NANAB_BERRY] = { NARC_item_data_0144_bin, NARC_item_icon_item_icon_198_NCGR, NARC_item_icon_item_icon_199_NCLR, AGB_ITEM_NANAB_BERRY }, - [ITEM_WEPEAR_BERRY] = { NARC_item_data_0145_bin, NARC_item_icon_item_icon_200_NCGR, NARC_item_icon_item_icon_201_NCLR, AGB_ITEM_WEPEAR_BERRY }, - [ITEM_PINAP_BERRY] = { NARC_item_data_0146_bin, NARC_item_icon_item_icon_202_NCGR, NARC_item_icon_item_icon_203_NCLR, AGB_ITEM_PINAP_BERRY }, - [ITEM_POMEG_BERRY] = { NARC_item_data_0147_bin, NARC_item_icon_item_icon_204_NCGR, NARC_item_icon_item_icon_205_NCLR, AGB_ITEM_POMEG_BERRY }, - [ITEM_KELPSY_BERRY] = { NARC_item_data_0148_bin, NARC_item_icon_item_icon_206_NCGR, NARC_item_icon_item_icon_207_NCLR, AGB_ITEM_KELPSY_BERRY }, - [ITEM_QUALOT_BERRY] = { NARC_item_data_0149_bin, NARC_item_icon_item_icon_208_NCGR, NARC_item_icon_item_icon_209_NCLR, AGB_ITEM_QUALOT_BERRY }, - [ITEM_HONDEW_BERRY] = { NARC_item_data_0150_bin, NARC_item_icon_item_icon_210_NCGR, NARC_item_icon_item_icon_211_NCLR, AGB_ITEM_HONDEW_BERRY }, - [ITEM_GREPA_BERRY] = { NARC_item_data_0151_bin, NARC_item_icon_item_icon_212_NCGR, NARC_item_icon_item_icon_213_NCLR, AGB_ITEM_GREPA_BERRY }, - [ITEM_TAMATO_BERRY] = { NARC_item_data_0152_bin, NARC_item_icon_item_icon_214_NCGR, NARC_item_icon_item_icon_215_NCLR, AGB_ITEM_TAMATO_BERRY }, - [ITEM_CORNN_BERRY] = { NARC_item_data_0153_bin, NARC_item_icon_item_icon_216_NCGR, NARC_item_icon_item_icon_217_NCLR, AGB_ITEM_CORNN_BERRY }, - [ITEM_MAGOST_BERRY] = { NARC_item_data_0154_bin, NARC_item_icon_item_icon_218_NCGR, NARC_item_icon_item_icon_219_NCLR, AGB_ITEM_MAGOST_BERRY }, - [ITEM_RABUTA_BERRY] = { NARC_item_data_0155_bin, NARC_item_icon_item_icon_220_NCGR, NARC_item_icon_item_icon_221_NCLR, AGB_ITEM_RABUTA_BERRY }, - [ITEM_NOMEL_BERRY] = { NARC_item_data_0156_bin, NARC_item_icon_item_icon_222_NCGR, NARC_item_icon_item_icon_223_NCLR, AGB_ITEM_NOMEL_BERRY }, - [ITEM_SPELON_BERRY] = { NARC_item_data_0157_bin, NARC_item_icon_item_icon_224_NCGR, NARC_item_icon_item_icon_225_NCLR, AGB_ITEM_SPELON_BERRY }, - [ITEM_PAMTRE_BERRY] = { NARC_item_data_0158_bin, NARC_item_icon_item_icon_226_NCGR, NARC_item_icon_item_icon_227_NCLR, AGB_ITEM_PAMTRE_BERRY }, - [ITEM_WATMEL_BERRY] = { NARC_item_data_0159_bin, NARC_item_icon_item_icon_228_NCGR, NARC_item_icon_item_icon_229_NCLR, AGB_ITEM_WATMEL_BERRY }, - [ITEM_DURIN_BERRY] = { NARC_item_data_0160_bin, NARC_item_icon_item_icon_230_NCGR, NARC_item_icon_item_icon_231_NCLR, AGB_ITEM_DURIN_BERRY }, - [ITEM_BELUE_BERRY] = { NARC_item_data_0161_bin, NARC_item_icon_item_icon_232_NCGR, NARC_item_icon_item_icon_233_NCLR, AGB_ITEM_BELUE_BERRY }, - [ITEM_OCCA_BERRY] = { NARC_item_data_0162_bin, NARC_item_icon_item_icon_554_NCGR, NARC_item_icon_item_icon_555_NCLR, AGB_ITEM_NONE }, - [ITEM_PASSHO_BERRY] = { NARC_item_data_0163_bin, NARC_item_icon_item_icon_556_NCGR, NARC_item_icon_item_icon_557_NCLR, AGB_ITEM_NONE }, - [ITEM_WACAN_BERRY] = { NARC_item_data_0164_bin, NARC_item_icon_item_icon_558_NCGR, NARC_item_icon_item_icon_559_NCLR, AGB_ITEM_NONE }, - [ITEM_RINDO_BERRY] = { NARC_item_data_0165_bin, NARC_item_icon_item_icon_560_NCGR, NARC_item_icon_item_icon_561_NCLR, AGB_ITEM_NONE }, - [ITEM_YACHE_BERRY] = { NARC_item_data_0166_bin, NARC_item_icon_item_icon_562_NCGR, NARC_item_icon_item_icon_563_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOPLE_BERRY] = { NARC_item_data_0167_bin, NARC_item_icon_item_icon_564_NCGR, NARC_item_icon_item_icon_565_NCLR, AGB_ITEM_NONE }, - [ITEM_KEBIA_BERRY] = { NARC_item_data_0168_bin, NARC_item_icon_item_icon_566_NCGR, NARC_item_icon_item_icon_567_NCLR, AGB_ITEM_NONE }, - [ITEM_SHUCA_BERRY] = { NARC_item_data_0169_bin, NARC_item_icon_item_icon_568_NCGR, NARC_item_icon_item_icon_569_NCLR, AGB_ITEM_NONE }, - [ITEM_COBA_BERRY] = { NARC_item_data_0170_bin, NARC_item_icon_item_icon_570_NCGR, NARC_item_icon_item_icon_571_NCLR, AGB_ITEM_NONE }, - [ITEM_PAYAPA_BERRY] = { NARC_item_data_0171_bin, NARC_item_icon_item_icon_572_NCGR, NARC_item_icon_item_icon_573_NCLR, AGB_ITEM_NONE }, - [ITEM_TANGA_BERRY] = { NARC_item_data_0172_bin, NARC_item_icon_item_icon_574_NCGR, NARC_item_icon_item_icon_575_NCLR, AGB_ITEM_NONE }, - [ITEM_CHARTI_BERRY] = { NARC_item_data_0173_bin, NARC_item_icon_item_icon_576_NCGR, NARC_item_icon_item_icon_577_NCLR, AGB_ITEM_NONE }, - [ITEM_KASIB_BERRY] = { NARC_item_data_0174_bin, NARC_item_icon_item_icon_578_NCGR, NARC_item_icon_item_icon_579_NCLR, AGB_ITEM_NONE }, - [ITEM_HABAN_BERRY] = { NARC_item_data_0175_bin, NARC_item_icon_item_icon_580_NCGR, NARC_item_icon_item_icon_581_NCLR, AGB_ITEM_NONE }, - [ITEM_COLBUR_BERRY] = { NARC_item_data_0176_bin, NARC_item_icon_item_icon_582_NCGR, NARC_item_icon_item_icon_583_NCLR, AGB_ITEM_NONE }, - [ITEM_BABIRI_BERRY] = { NARC_item_data_0177_bin, NARC_item_icon_item_icon_584_NCGR, NARC_item_icon_item_icon_585_NCLR, AGB_ITEM_NONE }, - [ITEM_CHILAN_BERRY] = { NARC_item_data_0178_bin, NARC_item_icon_item_icon_586_NCGR, NARC_item_icon_item_icon_587_NCLR, AGB_ITEM_NONE }, - [ITEM_LIECHI_BERRY] = { NARC_item_data_0179_bin, NARC_item_icon_item_icon_234_NCGR, NARC_item_icon_item_icon_235_NCLR, AGB_ITEM_LIECHI_BERRY }, - [ITEM_GANLON_BERRY] = { NARC_item_data_0180_bin, NARC_item_icon_item_icon_236_NCGR, NARC_item_icon_item_icon_237_NCLR, AGB_ITEM_GANLON_BERRY }, - [ITEM_SALAC_BERRY] = { NARC_item_data_0181_bin, NARC_item_icon_item_icon_238_NCGR, NARC_item_icon_item_icon_239_NCLR, AGB_ITEM_SALAC_BERRY }, - [ITEM_PETAYA_BERRY] = { NARC_item_data_0182_bin, NARC_item_icon_item_icon_240_NCGR, NARC_item_icon_item_icon_241_NCLR, AGB_ITEM_PETAYA_BERRY }, - [ITEM_APICOT_BERRY] = { NARC_item_data_0183_bin, NARC_item_icon_item_icon_242_NCGR, NARC_item_icon_item_icon_243_NCLR, AGB_ITEM_APICOT_BERRY }, - [ITEM_LANSAT_BERRY] = { NARC_item_data_0184_bin, NARC_item_icon_item_icon_244_NCGR, NARC_item_icon_item_icon_245_NCLR, AGB_ITEM_LANSAT_BERRY }, - [ITEM_STARF_BERRY] = { NARC_item_data_0185_bin, NARC_item_icon_item_icon_246_NCGR, NARC_item_icon_item_icon_247_NCLR, AGB_ITEM_STARF_BERRY }, - [ITEM_ENIGMA_BERRY] = { NARC_item_data_0186_bin, NARC_item_icon_item_icon_248_NCGR, NARC_item_icon_item_icon_249_NCLR, AGB_ITEM_ENIGMA_BERRY }, - [ITEM_MICLE_BERRY] = { NARC_item_data_0187_bin, NARC_item_icon_item_icon_588_NCGR, NARC_item_icon_item_icon_589_NCLR, AGB_ITEM_NONE }, - [ITEM_CUSTAP_BERRY] = { NARC_item_data_0188_bin, NARC_item_icon_item_icon_590_NCGR, NARC_item_icon_item_icon_591_NCLR, AGB_ITEM_NONE }, - [ITEM_JABOCA_BERRY] = { NARC_item_data_0189_bin, NARC_item_icon_item_icon_592_NCGR, NARC_item_icon_item_icon_593_NCLR, AGB_ITEM_NONE }, - [ITEM_ROWAP_BERRY] = { NARC_item_data_0190_bin, NARC_item_icon_item_icon_594_NCGR, NARC_item_icon_item_icon_595_NCLR, AGB_ITEM_NONE }, - [ITEM_BRIGHTPOWDER] = { NARC_item_data_0191_bin, NARC_item_icon_item_icon_250_NCGR, NARC_item_icon_item_icon_251_NCLR, AGB_ITEM_BRIGHT_POWDER }, - [ITEM_WHITE_HERB] = { NARC_item_data_0192_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_253_NCLR, AGB_ITEM_WHITE_HERB }, - [ITEM_MACHO_BRACE] = { NARC_item_data_0193_bin, NARC_item_icon_item_icon_254_NCGR, NARC_item_icon_item_icon_255_NCLR, AGB_ITEM_MACHO_BRACE }, - [ITEM_EXP__SHARE] = { NARC_item_data_0194_bin, NARC_item_icon_item_icon_256_NCGR, NARC_item_icon_item_icon_257_NCLR, AGB_ITEM_EXP_SHARE }, - [ITEM_QUICK_CLAW] = { NARC_item_data_0195_bin, NARC_item_icon_item_icon_258_NCGR, NARC_item_icon_item_icon_259_NCLR, AGB_ITEM_QUICK_CLAW }, - [ITEM_SOOTHE_BELL] = { NARC_item_data_0196_bin, NARC_item_icon_item_icon_260_NCGR, NARC_item_icon_item_icon_261_NCLR, AGB_ITEM_SOOTHE_BELL }, - [ITEM_MENTAL_HERB] = { NARC_item_data_0197_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_262_NCLR, AGB_ITEM_MENTAL_HERB }, - [ITEM_CHOICE_BAND] = { NARC_item_data_0198_bin, NARC_item_icon_item_icon_263_NCGR, NARC_item_icon_item_icon_264_NCLR, AGB_ITEM_CHOICE_BAND }, - [ITEM_KINGS_ROCK] = { NARC_item_data_0199_bin, NARC_item_icon_item_icon_265_NCGR, NARC_item_icon_item_icon_266_NCLR, AGB_ITEM_KINGS_ROCK }, - [ITEM_SILVERPOWDER] = { NARC_item_data_0200_bin, NARC_item_icon_item_icon_267_NCGR, NARC_item_icon_item_icon_268_NCLR, AGB_ITEM_SILVER_POWDER }, - [ITEM_AMULET_COIN] = { NARC_item_data_0201_bin, NARC_item_icon_item_icon_269_NCGR, NARC_item_icon_item_icon_270_NCLR, AGB_ITEM_AMULET_COIN }, - [ITEM_CLEANSE_TAG] = { NARC_item_data_0202_bin, NARC_item_icon_item_icon_271_NCGR, NARC_item_icon_item_icon_272_NCLR, AGB_ITEM_CLEANSE_TAG }, - [ITEM_SOUL_DEW] = { NARC_item_data_0203_bin, NARC_item_icon_item_icon_273_NCGR, NARC_item_icon_item_icon_274_NCLR, AGB_ITEM_SOUL_DEW }, - [ITEM_DEEPSEATOOTH] = { NARC_item_data_0204_bin, NARC_item_icon_item_icon_275_NCGR, NARC_item_icon_item_icon_276_NCLR, AGB_ITEM_DEEP_SEA_TOOTH }, - [ITEM_DEEPSEASCALE] = { NARC_item_data_0205_bin, NARC_item_icon_item_icon_277_NCGR, NARC_item_icon_item_icon_278_NCLR, AGB_ITEM_DEEP_SEA_SCALE }, - [ITEM_SMOKE_BALL] = { NARC_item_data_0206_bin, NARC_item_icon_item_icon_279_NCGR, NARC_item_icon_item_icon_280_NCLR, AGB_ITEM_SMOKE_BALL }, - [ITEM_EVERSTONE] = { NARC_item_data_0207_bin, NARC_item_icon_item_icon_281_NCGR, NARC_item_icon_item_icon_282_NCLR, AGB_ITEM_EVERSTONE }, - [ITEM_FOCUS_BAND] = { NARC_item_data_0208_bin, NARC_item_icon_item_icon_283_NCGR, NARC_item_icon_item_icon_284_NCLR, AGB_ITEM_FOCUS_BAND }, - [ITEM_LUCKY_EGG] = { NARC_item_data_0209_bin, NARC_item_icon_item_icon_285_NCGR, NARC_item_icon_item_icon_286_NCLR, AGB_ITEM_LUCKY_EGG }, - [ITEM_SCOPE_LENS] = { NARC_item_data_0210_bin, NARC_item_icon_item_icon_287_NCGR, NARC_item_icon_item_icon_288_NCLR, AGB_ITEM_SCOPE_LENS }, - [ITEM_METAL_COAT] = { NARC_item_data_0211_bin, NARC_item_icon_item_icon_289_NCGR, NARC_item_icon_item_icon_290_NCLR, AGB_ITEM_METAL_COAT }, - [ITEM_LEFTOVERS] = { NARC_item_data_0212_bin, NARC_item_icon_item_icon_291_NCGR, NARC_item_icon_item_icon_292_NCLR, AGB_ITEM_LEFTOVERS }, - [ITEM_DRAGON_SCALE] = { NARC_item_data_0213_bin, NARC_item_icon_item_icon_293_NCGR, NARC_item_icon_item_icon_294_NCLR, AGB_ITEM_DRAGON_SCALE }, - [ITEM_LIGHT_BALL] = { NARC_item_data_0214_bin, NARC_item_icon_item_icon_295_NCGR, NARC_item_icon_item_icon_296_NCLR, AGB_ITEM_LIGHT_BALL }, - [ITEM_SOFT_SAND] = { NARC_item_data_0215_bin, NARC_item_icon_item_icon_297_NCGR, NARC_item_icon_item_icon_298_NCLR, AGB_ITEM_SOFT_SAND }, - [ITEM_HARD_STONE] = { NARC_item_data_0216_bin, NARC_item_icon_item_icon_299_NCGR, NARC_item_icon_item_icon_300_NCLR, AGB_ITEM_HARD_STONE }, - [ITEM_MIRACLE_SEED] = { NARC_item_data_0217_bin, NARC_item_icon_item_icon_301_NCGR, NARC_item_icon_item_icon_302_NCLR, AGB_ITEM_MIRACLE_SEED }, - [ITEM_BLACKGLASSES] = { NARC_item_data_0218_bin, NARC_item_icon_item_icon_303_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_GLASSES }, - [ITEM_BLACK_BELT] = { NARC_item_data_0219_bin, NARC_item_icon_item_icon_305_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_BELT }, - [ITEM_MAGNET] = { NARC_item_data_0220_bin, NARC_item_icon_item_icon_306_NCGR, NARC_item_icon_item_icon_307_NCLR, AGB_ITEM_MAGNET }, - [ITEM_MYSTIC_WATER] = { NARC_item_data_0221_bin, NARC_item_icon_item_icon_308_NCGR, NARC_item_icon_item_icon_309_NCLR, AGB_ITEM_MYSTIC_WATER }, - [ITEM_SHARP_BEAK] = { NARC_item_data_0222_bin, NARC_item_icon_item_icon_310_NCGR, NARC_item_icon_item_icon_311_NCLR, AGB_ITEM_SHARP_BEAK }, - [ITEM_POISON_BARB] = { NARC_item_data_0223_bin, NARC_item_icon_item_icon_312_NCGR, NARC_item_icon_item_icon_313_NCLR, AGB_ITEM_POISON_BARB }, - [ITEM_NEVERMELTICE] = { NARC_item_data_0224_bin, NARC_item_icon_item_icon_314_NCGR, NARC_item_icon_item_icon_315_NCLR, AGB_ITEM_NEVER_MELT_ICE }, - [ITEM_SPELL_TAG] = { NARC_item_data_0225_bin, NARC_item_icon_item_icon_316_NCGR, NARC_item_icon_item_icon_317_NCLR, AGB_ITEM_SPELL_TAG }, - [ITEM_TWISTEDSPOON] = { NARC_item_data_0226_bin, NARC_item_icon_item_icon_318_NCGR, NARC_item_icon_item_icon_319_NCLR, AGB_ITEM_TWISTED_SPOON }, - [ITEM_CHARCOAL] = { NARC_item_data_0227_bin, NARC_item_icon_item_icon_320_NCGR, NARC_item_icon_item_icon_321_NCLR, AGB_ITEM_CHARCOAL }, - [ITEM_DRAGON_FANG] = { NARC_item_data_0228_bin, NARC_item_icon_item_icon_322_NCGR, NARC_item_icon_item_icon_323_NCLR, AGB_ITEM_DRAGON_FANG }, - [ITEM_SILK_SCARF] = { NARC_item_data_0229_bin, NARC_item_icon_item_icon_324_NCGR, NARC_item_icon_item_icon_325_NCLR, AGB_ITEM_SILK_SCARF }, - [ITEM_UPGRADE] = { NARC_item_data_0230_bin, NARC_item_icon_item_icon_326_NCGR, NARC_item_icon_item_icon_327_NCLR, AGB_ITEM_UP_GRADE }, - [ITEM_SHELL_BELL] = { NARC_item_data_0231_bin, NARC_item_icon_item_icon_328_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHELL_BELL }, - [ITEM_SEA_INCENSE] = { NARC_item_data_0232_bin, NARC_item_icon_item_icon_329_NCGR, NARC_item_icon_item_icon_330_NCLR, AGB_ITEM_SEA_INCENSE }, - [ITEM_LAX_INCENSE] = { NARC_item_data_0233_bin, NARC_item_icon_item_icon_331_NCGR, NARC_item_icon_item_icon_332_NCLR, AGB_ITEM_LAX_INCENSE }, - [ITEM_LUCKY_PUNCH] = { NARC_item_data_0234_bin, NARC_item_icon_item_icon_333_NCGR, NARC_item_icon_item_icon_334_NCLR, AGB_ITEM_LUCKY_PUNCH }, - [ITEM_METAL_POWDER] = { NARC_item_data_0235_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_336_NCLR, AGB_ITEM_METAL_POWDER }, - [ITEM_THICK_CLUB] = { NARC_item_data_0236_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_THICK_CLUB }, - [ITEM_STICK] = { NARC_item_data_0237_bin, NARC_item_icon_item_icon_339_NCGR, NARC_item_icon_item_icon_340_NCLR, AGB_ITEM_STICK }, - [ITEM_RED_SCARF] = { NARC_item_data_0238_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_342_NCLR, AGB_ITEM_RED_SCARF }, - [ITEM_BLUE_SCARF] = { NARC_item_data_0239_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_343_NCLR, AGB_ITEM_BLUE_SCARF }, - [ITEM_PINK_SCARF] = { NARC_item_data_0240_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_344_NCLR, AGB_ITEM_PINK_SCARF }, - [ITEM_GREEN_SCARF] = { NARC_item_data_0241_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_345_NCLR, AGB_ITEM_GREEN_SCARF }, - [ITEM_YELLOW_SCARF] = { NARC_item_data_0242_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_346_NCLR, AGB_ITEM_YELLOW_SCARF }, - [ITEM_WIDE_LENS] = { NARC_item_data_0243_bin, NARC_item_icon_item_icon_490_NCGR, NARC_item_icon_item_icon_491_NCLR, AGB_ITEM_NONE }, - [ITEM_MUSCLE_BAND] = { NARC_item_data_0244_bin, NARC_item_icon_item_icon_492_NCGR, NARC_item_icon_item_icon_493_NCLR, AGB_ITEM_NONE }, - [ITEM_WISE_GLASSES] = { NARC_item_data_0245_bin, NARC_item_icon_item_icon_494_NCGR, NARC_item_icon_item_icon_495_NCLR, AGB_ITEM_NONE }, - [ITEM_EXPERT_BELT] = { NARC_item_data_0246_bin, NARC_item_icon_item_icon_496_NCGR, NARC_item_icon_item_icon_497_NCLR, AGB_ITEM_NONE }, - [ITEM_LIGHT_CLAY] = { NARC_item_data_0247_bin, NARC_item_icon_item_icon_611_NCGR, NARC_item_icon_item_icon_612_NCLR, AGB_ITEM_NONE }, - [ITEM_LIFE_ORB] = { NARC_item_data_0248_bin, NARC_item_icon_item_icon_498_NCGR, NARC_item_icon_item_icon_499_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_HERB] = { NARC_item_data_0249_bin, NARC_item_icon_item_icon_500_NCGR, NARC_item_icon_item_icon_501_NCLR, AGB_ITEM_NONE }, - [ITEM_TOXIC_ORB] = { NARC_item_data_0250_bin, NARC_item_icon_item_icon_502_NCGR, NARC_item_icon_item_icon_503_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_ORB] = { NARC_item_data_0251_bin, NARC_item_icon_item_icon_504_NCGR, NARC_item_icon_item_icon_505_NCLR, AGB_ITEM_NONE }, - [ITEM_QUICK_POWDER] = { NARC_item_data_0252_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_658_NCLR, AGB_ITEM_NONE }, - [ITEM_FOCUS_SASH] = { NARC_item_data_0253_bin, NARC_item_icon_item_icon_659_NCGR, NARC_item_icon_item_icon_660_NCLR, AGB_ITEM_NONE }, - [ITEM_ZOOM_LENS] = { NARC_item_data_0254_bin, NARC_item_icon_item_icon_506_NCGR, NARC_item_icon_item_icon_507_NCLR, AGB_ITEM_NONE }, - [ITEM_METRONOME] = { NARC_item_data_0255_bin, NARC_item_icon_item_icon_508_NCGR, NARC_item_icon_item_icon_509_NCLR, AGB_ITEM_NONE }, - [ITEM_IRON_BALL] = { NARC_item_data_0256_bin, NARC_item_icon_item_icon_613_NCGR, NARC_item_icon_item_icon_614_NCLR, AGB_ITEM_NONE }, - [ITEM_LAGGING_TAIL] = { NARC_item_data_0257_bin, NARC_item_icon_item_icon_650_NCGR, NARC_item_icon_item_icon_651_NCLR, AGB_ITEM_NONE }, - [ITEM_DESTINY_KNOT] = { NARC_item_data_0258_bin, NARC_item_icon_item_icon_654_NCGR, NARC_item_icon_item_icon_655_NCLR, AGB_ITEM_NONE }, - [ITEM_BLACK_SLUDGE] = { NARC_item_data_0259_bin, NARC_item_icon_item_icon_510_NCGR, NARC_item_icon_item_icon_511_NCLR, AGB_ITEM_NONE }, - [ITEM_ICY_ROCK] = { NARC_item_data_0260_bin, NARC_item_icon_item_icon_636_NCGR, NARC_item_icon_item_icon_637_NCLR, AGB_ITEM_NONE }, - [ITEM_SMOOTH_ROCK] = { NARC_item_data_0261_bin, NARC_item_icon_item_icon_638_NCGR, NARC_item_icon_item_icon_639_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAT_ROCK] = { NARC_item_data_0262_bin, NARC_item_icon_item_icon_640_NCGR, NARC_item_icon_item_icon_641_NCLR, AGB_ITEM_NONE }, - [ITEM_DAMP_ROCK] = { NARC_item_data_0263_bin, NARC_item_icon_item_icon_642_NCGR, NARC_item_icon_item_icon_643_NCLR, AGB_ITEM_NONE }, - [ITEM_GRIP_CLAW] = { NARC_item_data_0264_bin, NARC_item_icon_item_icon_652_NCGR, NARC_item_icon_item_icon_653_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOICE_SCARF] = { NARC_item_data_0265_bin, NARC_item_icon_item_icon_512_NCGR, NARC_item_icon_item_icon_513_NCLR, AGB_ITEM_NONE }, - [ITEM_STICKY_BARB] = { NARC_item_data_0266_bin, NARC_item_icon_item_icon_514_NCGR, NARC_item_icon_item_icon_515_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BRACER] = { NARC_item_data_0267_bin, NARC_item_icon_item_icon_683_NCGR, NARC_item_icon_item_icon_684_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BELT] = { NARC_item_data_0268_bin, NARC_item_icon_item_icon_691_NCGR, NARC_item_icon_item_icon_692_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_LENS] = { NARC_item_data_0269_bin, NARC_item_icon_item_icon_693_NCGR, NARC_item_icon_item_icon_694_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_BAND] = { NARC_item_data_0270_bin, NARC_item_icon_item_icon_685_NCGR, NARC_item_icon_item_icon_686_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_ANKLET] = { NARC_item_data_0271_bin, NARC_item_icon_item_icon_687_NCGR, NARC_item_icon_item_icon_688_NCLR, AGB_ITEM_NONE }, - [ITEM_POWER_WEIGHT] = { NARC_item_data_0272_bin, NARC_item_icon_item_icon_689_NCGR, NARC_item_icon_item_icon_690_NCLR, AGB_ITEM_NONE }, - [ITEM_SHED_SHELL] = { NARC_item_data_0273_bin, NARC_item_icon_item_icon_516_NCGR, NARC_item_icon_item_icon_517_NCLR, AGB_ITEM_NONE }, - [ITEM_BIG_ROOT] = { NARC_item_data_0274_bin, NARC_item_icon_item_icon_518_NCGR, NARC_item_icon_item_icon_519_NCLR, AGB_ITEM_NONE }, - [ITEM_CHOICE_SPECS] = { NARC_item_data_0275_bin, NARC_item_icon_item_icon_520_NCGR, NARC_item_icon_item_icon_521_NCLR, AGB_ITEM_NONE }, - [ITEM_FLAME_PLATE] = { NARC_item_data_0276_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_620_NCLR, AGB_ITEM_NONE }, - [ITEM_SPLASH_PLATE] = { NARC_item_data_0277_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_621_NCLR, AGB_ITEM_NONE }, - [ITEM_ZAP_PLATE] = { NARC_item_data_0278_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_622_NCLR, AGB_ITEM_NONE }, - [ITEM_MEADOW_PLATE] = { NARC_item_data_0279_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_623_NCLR, AGB_ITEM_NONE }, - [ITEM_ICICLE_PLATE] = { NARC_item_data_0280_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_624_NCLR, AGB_ITEM_NONE }, - [ITEM_FIST_PLATE] = { NARC_item_data_0281_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_625_NCLR, AGB_ITEM_NONE }, - [ITEM_TOXIC_PLATE] = { NARC_item_data_0282_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_626_NCLR, AGB_ITEM_NONE }, - [ITEM_EARTH_PLATE] = { NARC_item_data_0283_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_627_NCLR, AGB_ITEM_NONE }, - [ITEM_SKY_PLATE] = { NARC_item_data_0284_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_628_NCLR, AGB_ITEM_NONE }, - [ITEM_MIND_PLATE] = { NARC_item_data_0285_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_629_NCLR, AGB_ITEM_NONE }, - [ITEM_INSECT_PLATE] = { NARC_item_data_0286_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_630_NCLR, AGB_ITEM_NONE }, - [ITEM_STONE_PLATE] = { NARC_item_data_0287_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_631_NCLR, AGB_ITEM_NONE }, - [ITEM_SPOOKY_PLATE] = { NARC_item_data_0288_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_632_NCLR, AGB_ITEM_NONE }, - [ITEM_DRACO_PLATE] = { NARC_item_data_0289_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_633_NCLR, AGB_ITEM_NONE }, - [ITEM_DREAD_PLATE] = { NARC_item_data_0290_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_634_NCLR, AGB_ITEM_NONE }, - [ITEM_IRON_PLATE] = { NARC_item_data_0291_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_635_NCLR, AGB_ITEM_NONE }, - [ITEM_ODD_INCENSE] = { NARC_item_data_0292_bin, NARC_item_icon_item_icon_522_NCGR, NARC_item_icon_item_icon_523_NCLR, AGB_ITEM_NONE }, - [ITEM_ROCK_INCENSE] = { NARC_item_data_0293_bin, NARC_item_icon_item_icon_524_NCGR, NARC_item_icon_item_icon_525_NCLR, AGB_ITEM_NONE }, - [ITEM_FULL_INCENSE] = { NARC_item_data_0294_bin, NARC_item_icon_item_icon_526_NCGR, NARC_item_icon_item_icon_527_NCLR, AGB_ITEM_NONE }, - [ITEM_WAVE_INCENSE] = { NARC_item_data_0295_bin, NARC_item_icon_item_icon_528_NCGR, NARC_item_icon_item_icon_529_NCLR, AGB_ITEM_NONE }, - [ITEM_ROSE_INCENSE] = { NARC_item_data_0296_bin, NARC_item_icon_item_icon_530_NCGR, NARC_item_icon_item_icon_531_NCLR, AGB_ITEM_NONE }, - [ITEM_LUCK_INCENSE] = { NARC_item_data_0297_bin, NARC_item_icon_item_icon_532_NCGR, NARC_item_icon_item_icon_533_NCLR, AGB_ITEM_NONE }, - [ITEM_PURE_INCENSE] = { NARC_item_data_0298_bin, NARC_item_icon_item_icon_534_NCGR, NARC_item_icon_item_icon_535_NCLR, AGB_ITEM_NONE }, - [ITEM_PROTECTOR] = { NARC_item_data_0299_bin, NARC_item_icon_item_icon_695_NCGR, NARC_item_icon_item_icon_696_NCLR, AGB_ITEM_NONE }, - [ITEM_ELECTIRIZER] = { NARC_item_data_0300_bin, NARC_item_icon_item_icon_536_NCGR, NARC_item_icon_item_icon_537_NCLR, AGB_ITEM_NONE }, - [ITEM_MAGMARIZER] = { NARC_item_data_0301_bin, NARC_item_icon_item_icon_538_NCGR, NARC_item_icon_item_icon_539_NCLR, AGB_ITEM_NONE }, - [ITEM_DUBIOUS_DISC] = { NARC_item_data_0302_bin, NARC_item_icon_item_icon_540_NCGR, NARC_item_icon_item_icon_541_NCLR, AGB_ITEM_NONE }, - [ITEM_REAPER_CLOTH] = { NARC_item_data_0303_bin, NARC_item_icon_item_icon_542_NCGR, NARC_item_icon_item_icon_543_NCLR, AGB_ITEM_NONE }, - [ITEM_RAZOR_CLAW] = { NARC_item_data_0304_bin, NARC_item_icon_item_icon_544_NCGR, NARC_item_icon_item_icon_545_NCLR, AGB_ITEM_NONE }, - [ITEM_RAZOR_FANG] = { NARC_item_data_0305_bin, NARC_item_icon_item_icon_546_NCGR, NARC_item_icon_item_icon_547_NCLR, AGB_ITEM_NONE }, - [ITEM_TM01] = { NARC_item_data_0306_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM01 }, - [ITEM_TM02] = { NARC_item_data_0307_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_TM02 }, - [ITEM_TM03] = { NARC_item_data_0308_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM03 }, - [ITEM_TM04] = { NARC_item_data_0309_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM04 }, - [ITEM_TM05] = { NARC_item_data_0310_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM05 }, - [ITEM_TM06] = { NARC_item_data_0311_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM06 }, - [ITEM_TM07] = { NARC_item_data_0312_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM07 }, - [ITEM_TM08] = { NARC_item_data_0313_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM08 }, - [ITEM_TM09] = { NARC_item_data_0314_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM09 }, - [ITEM_TM10] = { NARC_item_data_0315_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM10 }, - [ITEM_TM11] = { NARC_item_data_0316_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM11 }, - [ITEM_TM12] = { NARC_item_data_0317_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM12 }, - [ITEM_TM13] = { NARC_item_data_0318_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM13 }, - [ITEM_TM14] = { NARC_item_data_0319_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM14 }, - [ITEM_TM15] = { NARC_item_data_0320_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM15 }, - [ITEM_TM16] = { NARC_item_data_0321_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM16 }, - [ITEM_TM17] = { NARC_item_data_0322_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM17 }, - [ITEM_TM18] = { NARC_item_data_0323_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM18 }, - [ITEM_TM19] = { NARC_item_data_0324_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM19 }, - [ITEM_TM20] = { NARC_item_data_0325_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM20 }, - [ITEM_TM21] = { NARC_item_data_0326_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM21 }, - [ITEM_TM22] = { NARC_item_data_0327_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM22 }, - [ITEM_TM23] = { NARC_item_data_0328_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM23 }, - [ITEM_TM24] = { NARC_item_data_0329_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM24 }, - [ITEM_TM25] = { NARC_item_data_0330_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM25 }, - [ITEM_TM26] = { NARC_item_data_0331_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM26 }, - [ITEM_TM27] = { NARC_item_data_0332_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM27 }, - [ITEM_TM28] = { NARC_item_data_0333_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM28 }, - [ITEM_TM29] = { NARC_item_data_0334_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM29 }, - [ITEM_TM30] = { NARC_item_data_0335_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_TM30 }, - [ITEM_TM31] = { NARC_item_data_0336_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM31 }, - [ITEM_TM32] = { NARC_item_data_0337_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM32 }, - [ITEM_TM33] = { NARC_item_data_0338_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM33 }, - [ITEM_TM34] = { NARC_item_data_0339_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM34 }, - [ITEM_TM35] = { NARC_item_data_0340_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM35 }, - [ITEM_TM36] = { NARC_item_data_0341_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM36 }, - [ITEM_TM37] = { NARC_item_data_0342_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM37 }, - [ITEM_TM38] = { NARC_item_data_0343_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM38 }, - [ITEM_TM39] = { NARC_item_data_0344_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM39 }, - [ITEM_TM40] = { NARC_item_data_0345_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_TM40 }, - [ITEM_TM41] = { NARC_item_data_0346_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM41 }, - [ITEM_TM42] = { NARC_item_data_0347_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM42 }, - [ITEM_TM43] = { NARC_item_data_0348_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM43 }, - [ITEM_TM44] = { NARC_item_data_0349_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM44 }, - [ITEM_TM45] = { NARC_item_data_0350_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM45 }, - [ITEM_TM46] = { NARC_item_data_0351_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM46 }, - [ITEM_TM47] = { NARC_item_data_0352_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM47 }, - [ITEM_TM48] = { NARC_item_data_0353_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM48 }, - [ITEM_TM49] = { NARC_item_data_0354_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM49 }, - [ITEM_TM50] = { NARC_item_data_0355_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM50 }, - [ITEM_TM51] = { NARC_item_data_0356_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, - [ITEM_TM52] = { NARC_item_data_0357_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, - [ITEM_TM53] = { NARC_item_data_0358_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, - [ITEM_TM54] = { NARC_item_data_0359_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM55] = { NARC_item_data_0360_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_NONE }, - [ITEM_TM56] = { NARC_item_data_0361_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM57] = { NARC_item_data_0362_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, - [ITEM_TM58] = { NARC_item_data_0363_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM59] = { NARC_item_data_0364_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_NONE }, - [ITEM_TM60] = { NARC_item_data_0365_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, - [ITEM_TM61] = { NARC_item_data_0366_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_NONE }, - [ITEM_TM62] = { NARC_item_data_0367_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM63] = { NARC_item_data_0368_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM64] = { NARC_item_data_0369_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM65] = { NARC_item_data_0370_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_NONE }, - [ITEM_TM66] = { NARC_item_data_0371_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM67] = { NARC_item_data_0372_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM68] = { NARC_item_data_0373_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM69] = { NARC_item_data_0374_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM70] = { NARC_item_data_0375_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM71] = { NARC_item_data_0376_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM72] = { NARC_item_data_0377_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_NONE }, - [ITEM_TM73] = { NARC_item_data_0378_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, - [ITEM_TM74] = { NARC_item_data_0379_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, - [ITEM_TM75] = { NARC_item_data_0380_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM76] = { NARC_item_data_0381_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM77] = { NARC_item_data_0382_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM78] = { NARC_item_data_0383_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM79] = { NARC_item_data_0384_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, - [ITEM_TM80] = { NARC_item_data_0385_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, - [ITEM_TM81] = { NARC_item_data_0386_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM82] = { NARC_item_data_0387_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM83] = { NARC_item_data_0388_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM84] = { NARC_item_data_0389_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_NONE }, - [ITEM_TM85] = { NARC_item_data_0390_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, - [ITEM_TM86] = { NARC_item_data_0391_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, - [ITEM_TM87] = { NARC_item_data_0392_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM88] = { NARC_item_data_0393_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, - [ITEM_TM89] = { NARC_item_data_0394_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, - [ITEM_TM90] = { NARC_item_data_0395_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, - [ITEM_TM91] = { NARC_item_data_0396_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, - [ITEM_TM92] = { NARC_item_data_0397_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, - [ITEM_HM01] = { NARC_item_data_0398_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM01 }, - [ITEM_HM02] = { NARC_item_data_0399_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_HM02 }, - [ITEM_HM03] = { NARC_item_data_0400_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM03 }, - [ITEM_HM04] = { NARC_item_data_0401_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM04 }, - [ITEM_HM05] = { NARC_item_data_0402_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM05 }, - [ITEM_HM06] = { NARC_item_data_0403_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_HM06 }, - [ITEM_HM07] = { NARC_item_data_0404_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM07 }, - [ITEM_HM08] = { NARC_item_data_0405_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM08 }, - [ITEM_EXPLORER_KIT] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, - [ITEM_LOOT_SACK] = { NARC_item_data_0406_bin, NARC_item_icon_item_icon_550_NCGR, NARC_item_icon_item_icon_551_NCLR, AGB_ITEM_NONE }, - [ITEM_RULE_BOOK] = { NARC_item_data_0407_bin, NARC_item_icon_item_icon_552_NCGR, NARC_item_icon_item_icon_553_NCLR, AGB_ITEM_NONE }, - [ITEM_POKE_RADAR] = { NARC_item_data_0408_bin, NARC_item_icon_item_icon_697_NCGR, NARC_item_icon_item_icon_698_NCLR, AGB_ITEM_NONE }, - [ITEM_POINT_CARD] = { NARC_item_data_0409_bin, NARC_item_icon_item_icon_681_NCGR, NARC_item_icon_item_icon_682_NCLR, AGB_ITEM_NONE }, - [ITEM_JOURNAL] = { NARC_item_data_0410_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, - [ITEM_SEAL_CASE] = { NARC_item_data_0411_bin, NARC_item_icon_item_icon_671_NCGR, NARC_item_icon_item_icon_672_NCLR, AGB_ITEM_NONE }, - [ITEM_FASHION_CASE] = { NARC_item_data_0412_bin, NARC_item_icon_item_icon_675_NCGR, NARC_item_icon_item_icon_676_NCLR, AGB_ITEM_NONE }, - [ITEM_SEAL_BAG] = { NARC_item_data_0413_bin, NARC_item_icon_item_icon_673_NCGR, NARC_item_icon_item_icon_674_NCLR, AGB_ITEM_NONE }, - [ITEM_PAL_PAD] = { NARC_item_data_0414_bin, NARC_item_icon_item_icon_661_NCGR, NARC_item_icon_item_icon_662_NCLR, AGB_ITEM_NONE }, - [ITEM_WORKS_KEY] = { NARC_item_data_0415_bin, NARC_item_icon_item_icon_644_NCGR, NARC_item_icon_item_icon_645_NCLR, AGB_ITEM_NONE }, - [ITEM_OLD_CHARM] = { NARC_item_data_0416_bin, NARC_item_icon_item_icon_604_NCGR, NARC_item_icon_item_icon_605_NCLR, AGB_ITEM_NONE }, - [ITEM_GALACTIC_KEY] = { NARC_item_data_0417_bin, NARC_item_icon_item_icon_656_NCGR, NARC_item_icon_item_icon_657_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_CHAIN] = { NARC_item_data_0418_bin, NARC_item_icon_item_icon_679_NCGR, NARC_item_icon_item_icon_680_NCLR, AGB_ITEM_NONE }, - [ITEM_TOWN_MAP] = { NARC_item_data_0419_bin, NARC_item_icon_item_icon_439_NCGR, NARC_item_icon_item_icon_440_NCLR, AGB_ITEM_TOWN_MAP }, - [ITEM_VS__SEEKER] = { NARC_item_data_0420_bin, NARC_item_icon_item_icon_441_NCGR, NARC_item_icon_item_icon_442_NCLR, AGB_ITEM_VS_SEEKER }, - [ITEM_COIN_CASE] = { NARC_item_data_0421_bin, NARC_item_icon_item_icon_349_NCGR, NARC_item_icon_item_icon_350_NCLR, AGB_ITEM_COIN_CASE }, - [ITEM_OLD_ROD] = { NARC_item_data_0422_bin, NARC_item_icon_item_icon_353_NCGR, NARC_item_icon_item_icon_354_NCLR, AGB_ITEM_OLD_ROD }, - [ITEM_GOOD_ROD] = { NARC_item_data_0423_bin, NARC_item_icon_item_icon_355_NCGR, NARC_item_icon_item_icon_356_NCLR, AGB_ITEM_GOOD_ROD }, - [ITEM_SUPER_ROD] = { NARC_item_data_0424_bin, NARC_item_icon_item_icon_357_NCGR, NARC_item_icon_item_icon_358_NCLR, AGB_ITEM_SUPER_ROD }, - [ITEM_SPRAYDUCK] = { NARC_item_data_0425_bin, NARC_item_icon_item_icon_363_NCGR, NARC_item_icon_item_icon_364_NCLR, AGB_ITEM_NONE }, - [ITEM_POFFIN_CASE] = { NARC_item_data_0426_bin, NARC_item_icon_item_icon_373_NCGR, NARC_item_icon_item_icon_374_NCLR, AGB_ITEM_NONE }, - [ITEM_BICYCLE] = { NARC_item_data_0427_bin, NARC_item_icon_item_icon_437_NCGR, NARC_item_icon_item_icon_438_NCLR, AGB_ITEM_BICYCLE }, - [ITEM_SUITE_KEY] = { NARC_item_data_0428_bin, NARC_item_icon_item_icon_429_NCGR, NARC_item_icon_item_icon_430_NCLR, AGB_ITEM_NONE }, - [ITEM_OAKS_LETTER] = { NARC_item_data_0429_bin, NARC_item_icon_item_icon_375_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_NONE }, - [ITEM_LUNAR_WING] = { NARC_item_data_0430_bin, NARC_item_icon_item_icon_602_NCGR, NARC_item_icon_item_icon_603_NCLR, AGB_ITEM_NONE }, - [ITEM_MEMBER_CARD] = { NARC_item_data_0431_bin, NARC_item_icon_item_icon_608_NCGR, NARC_item_icon_item_icon_609_NCLR, AGB_ITEM_NONE }, - [ITEM_AZURE_FLUTE] = { NARC_item_data_0432_bin, NARC_item_icon_item_icon_677_NCGR, NARC_item_icon_item_icon_678_NCLR, AGB_ITEM_NONE }, - [ITEM_S_S__TICKET] = { NARC_item_data_0433_bin, NARC_item_icon_item_icon_359_NCGR, NARC_item_icon_item_icon_360_NCLR, AGB_ITEM_SS_TICKET }, - [ITEM_CONTEST_PASS] = { NARC_item_data_0434_bin, NARC_item_icon_item_icon_361_NCGR, NARC_item_icon_item_icon_362_NCLR, AGB_ITEM_CONTEST_PASS }, - [ITEM_MAGMA_STONE] = { NARC_item_data_0435_bin, NARC_item_icon_item_icon_596_NCGR, NARC_item_icon_item_icon_597_NCLR, AGB_ITEM_NONE }, - [ITEM_PARCEL] = { NARC_item_data_0436_bin, NARC_item_icon_item_icon_415_NCGR, NARC_item_icon_item_icon_416_NCLR, AGB_ITEM_OAKS_PARCEL }, - [ITEM_COUPON_1] = { NARC_item_data_0437_bin, NARC_item_icon_item_icon_417_NCGR, NARC_item_icon_item_icon_418_NCLR, AGB_ITEM_NONE }, - [ITEM_COUPON_2] = { NARC_item_data_0438_bin, NARC_item_icon_item_icon_419_NCGR, NARC_item_icon_item_icon_420_NCLR, AGB_ITEM_NONE }, - [ITEM_COUPON_3] = { NARC_item_data_0439_bin, NARC_item_icon_item_icon_421_NCGR, NARC_item_icon_item_icon_422_NCLR, AGB_ITEM_NONE }, - [ITEM_STORAGE_KEY] = { NARC_item_data_0440_bin, NARC_item_icon_item_icon_598_NCGR, NARC_item_icon_item_icon_599_NCLR, AGB_ITEM_STORAGE_KEY }, - [ITEM_SECRETPOTION] = { NARC_item_data_0441_bin, NARC_item_icon_item_icon_600_NCGR, NARC_item_icon_item_icon_601_NCLR, AGB_ITEM_NONE }, - [ITEM_VS__RECORDER] = { NARC_item_data_0442_bin, NARC_item_icon_item_icon_701_NCGR, NARC_item_icon_item_icon_702_NCLR, AGB_ITEM_NONE }, - [ITEM_GRACIDEA] = { NARC_item_data_0443_bin, NARC_item_icon_item_icon_703_NCGR, NARC_item_icon_item_icon_704_NCLR, AGB_ITEM_NONE }, - [ITEM_SECRET_KEY] = { NARC_item_data_0444_bin, NARC_item_icon_item_icon_705_NCGR, NARC_item_icon_item_icon_706_NCLR, AGB_ITEM_SECRET_KEY }, - [ITEM_APRICORN_BOX] = { NARC_item_data_0445_bin, NARC_item_icon_item_icon_709_NCGR, NARC_item_icon_item_icon_710_NCLR, AGB_ITEM_NONE }, - [ITEM_UNOWN_REPORT] = { NARC_item_data_0446_bin, NARC_item_icon_item_icon_759_NCGR, NARC_item_icon_item_icon_760_NCLR, AGB_ITEM_NONE }, - [ITEM_BERRY_POTS] = { NARC_item_data_0447_bin, NARC_item_icon_item_icon_711_NCGR, NARC_item_icon_item_icon_712_NCLR, AGB_ITEM_NONE }, - [ITEM_DOWSING_MCHN] = { NARC_item_data_0448_bin, NARC_item_icon_item_icon_747_NCGR, NARC_item_icon_item_icon_748_NCLR, AGB_ITEM_ITEMFINDER }, - [ITEM_BLUE_CARD] = { NARC_item_data_0449_bin, NARC_item_icon_item_icon_761_NCGR, NARC_item_icon_item_icon_762_NCLR, AGB_ITEM_NONE }, - [ITEM_SLOWPOKETAIL] = { NARC_item_data_0450_bin, NARC_item_icon_item_icon_763_NCGR, NARC_item_icon_item_icon_764_NCLR, AGB_ITEM_NONE }, - [ITEM_CLEAR_BELL] = { NARC_item_data_0451_bin, NARC_item_icon_item_icon_765_NCGR, NARC_item_icon_item_icon_766_NCLR, AGB_ITEM_NONE }, - [ITEM_CARD_KEY] = { NARC_item_data_0452_bin, NARC_item_icon_item_icon_767_NCGR, NARC_item_icon_item_icon_768_NCLR, AGB_ITEM_CARD_KEY }, - [ITEM_BASEMENT_KEY] = { NARC_item_data_0453_bin, NARC_item_icon_item_icon_769_NCGR, NARC_item_icon_item_icon_770_NCLR, AGB_ITEM_BASEMENT_KEY }, - [ITEM_SQUIRTBOTTLE] = { NARC_item_data_0454_bin, NARC_item_icon_item_icon_713_NCGR, NARC_item_icon_item_icon_714_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_SCALE] = { NARC_item_data_0455_bin, NARC_item_icon_item_icon_771_NCGR, NARC_item_icon_item_icon_772_NCLR, AGB_ITEM_NONE }, - [ITEM_LOST_ITEM] = { NARC_item_data_0456_bin, NARC_item_icon_item_icon_773_NCGR, NARC_item_icon_item_icon_774_NCLR, AGB_ITEM_NONE }, - [ITEM_PASS] = { NARC_item_data_0457_bin, NARC_item_icon_item_icon_775_NCGR, NARC_item_icon_item_icon_776_NCLR, AGB_ITEM_NONE }, - [ITEM_MACHINE_PART] = { NARC_item_data_0458_bin, NARC_item_icon_item_icon_777_NCGR, NARC_item_icon_item_icon_778_NCLR, AGB_ITEM_NONE }, - [ITEM_SILVER_WING] = { NARC_item_data_0459_bin, NARC_item_icon_item_icon_779_NCGR, NARC_item_icon_item_icon_780_NCLR, AGB_ITEM_NONE }, - [ITEM_RAINBOW_WING] = { NARC_item_data_0460_bin, NARC_item_icon_item_icon_781_NCGR, NARC_item_icon_item_icon_782_NCLR, AGB_ITEM_NONE }, - [ITEM_MYSTERY_EGG] = { NARC_item_data_0461_bin, NARC_item_icon_item_icon_783_NCGR, NARC_item_icon_item_icon_784_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_APRICORN] = { NARC_item_data_0462_bin, NARC_item_icon_item_icon_733_NCGR, NARC_item_icon_item_icon_734_NCLR, AGB_ITEM_NONE }, - [ITEM_YLW_APRICORN] = { NARC_item_data_0463_bin, NARC_item_icon_item_icon_737_NCGR, NARC_item_icon_item_icon_738_NCLR, AGB_ITEM_NONE }, - [ITEM_BLU_APRICORN] = { NARC_item_data_0464_bin, NARC_item_icon_item_icon_735_NCGR, NARC_item_icon_item_icon_736_NCLR, AGB_ITEM_NONE }, - [ITEM_GRN_APRICORN] = { NARC_item_data_0465_bin, NARC_item_icon_item_icon_739_NCGR, NARC_item_icon_item_icon_740_NCLR, AGB_ITEM_NONE }, - [ITEM_PNK_APRICORN] = { NARC_item_data_0466_bin, NARC_item_icon_item_icon_741_NCGR, NARC_item_icon_item_icon_742_NCLR, AGB_ITEM_NONE }, - [ITEM_WHT_APRICORN] = { NARC_item_data_0467_bin, NARC_item_icon_item_icon_743_NCGR, NARC_item_icon_item_icon_744_NCLR, AGB_ITEM_NONE }, - [ITEM_BLK_APRICORN] = { NARC_item_data_0468_bin, NARC_item_icon_item_icon_745_NCGR, NARC_item_icon_item_icon_746_NCLR, AGB_ITEM_NONE }, - [ITEM_FAST_BALL] = { NARC_item_data_0469_bin, NARC_item_icon_item_icon_723_NCGR, NARC_item_icon_item_icon_724_NCLR, AGB_ITEM_NONE }, - [ITEM_LEVEL_BALL] = { NARC_item_data_0470_bin, NARC_item_icon_item_icon_717_NCGR, NARC_item_icon_item_icon_718_NCLR, AGB_ITEM_NONE }, - [ITEM_LURE_BALL] = { NARC_item_data_0471_bin, NARC_item_icon_item_icon_715_NCGR, NARC_item_icon_item_icon_716_NCLR, AGB_ITEM_NONE }, - [ITEM_HEAVY_BALL] = { NARC_item_data_0472_bin, NARC_item_icon_item_icon_721_NCGR, NARC_item_icon_item_icon_722_NCLR, AGB_ITEM_NONE }, - [ITEM_LOVE_BALL] = { NARC_item_data_0473_bin, NARC_item_icon_item_icon_727_NCGR, NARC_item_icon_item_icon_728_NCLR, AGB_ITEM_NONE }, - [ITEM_FRIEND_BALL] = { NARC_item_data_0474_bin, NARC_item_icon_item_icon_725_NCGR, NARC_item_icon_item_icon_726_NCLR, AGB_ITEM_NONE }, - [ITEM_MOON_BALL] = { NARC_item_data_0475_bin, NARC_item_icon_item_icon_719_NCGR, NARC_item_icon_item_icon_720_NCLR, AGB_ITEM_NONE }, - [ITEM_SPORT_BALL] = { NARC_item_data_0476_bin, NARC_item_icon_item_icon_731_NCGR, NARC_item_icon_item_icon_732_NCLR, AGB_ITEM_NONE }, - [ITEM_PARK_BALL] = { NARC_item_data_0477_bin, NARC_item_icon_item_icon_729_NCGR, NARC_item_icon_item_icon_730_NCLR, AGB_ITEM_NONE }, - [ITEM_PHOTO_ALBUM] = { NARC_item_data_0478_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, - [ITEM_GB_SOUNDS] = { NARC_item_data_0479_bin, NARC_item_icon_item_icon_785_NCGR, NARC_item_icon_item_icon_786_NCLR, AGB_ITEM_NONE }, - [ITEM_TIDAL_BELL] = { NARC_item_data_0480_bin, NARC_item_icon_item_icon_787_NCGR, NARC_item_icon_item_icon_788_NCLR, AGB_ITEM_NONE }, - [ITEM_RAGECANDYBAR] = { NARC_item_data_0481_bin, NARC_item_icon_item_icon_749_NCGR, NARC_item_icon_item_icon_750_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_01] = { NARC_item_data_0482_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_02] = { NARC_item_data_0483_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_03] = { NARC_item_data_0484_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_04] = { NARC_item_data_0485_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_05] = { NARC_item_data_0486_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_06] = { NARC_item_data_0487_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_07] = { NARC_item_data_0488_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_08] = { NARC_item_data_0489_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_09] = { NARC_item_data_0490_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_10] = { NARC_item_data_0491_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_11] = { NARC_item_data_0492_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_12] = { NARC_item_data_0493_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_13] = { NARC_item_data_0494_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_14] = { NARC_item_data_0495_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_15] = { NARC_item_data_0496_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_16] = { NARC_item_data_0497_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_17] = { NARC_item_data_0498_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_18] = { NARC_item_data_0499_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_19] = { NARC_item_data_0500_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_20] = { NARC_item_data_0501_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_21] = { NARC_item_data_0502_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_22] = { NARC_item_data_0503_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_23] = { NARC_item_data_0504_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_24] = { NARC_item_data_0505_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_25] = { NARC_item_data_0506_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_26] = { NARC_item_data_0507_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_DATA_CARD_27] = { NARC_item_data_0508_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, - [ITEM_JADE_ORB] = { NARC_item_data_0509_bin, NARC_item_icon_item_icon_755_NCGR, NARC_item_icon_item_icon_756_NCLR, AGB_ITEM_NONE }, - [ITEM_LOCK_CAPSULE] = { NARC_item_data_0510_bin, NARC_item_icon_item_icon_791_NCGR, NARC_item_icon_item_icon_792_NCLR, AGB_ITEM_NONE }, - [ITEM_RED_ORB] = { NARC_item_data_0511_bin, NARC_item_icon_item_icon_751_NCGR, NARC_item_icon_item_icon_752_NCLR, AGB_ITEM_RED_ORB }, - [ITEM_BLUE_ORB] = { NARC_item_data_0512_bin, NARC_item_icon_item_icon_753_NCGR, NARC_item_icon_item_icon_754_NCLR, AGB_ITEM_BLUE_ORB }, - [ITEM_ENIGMA_STONE] = { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, + [ITEM_NONE] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_MASTER_BALL] = { NARC_item_data_0001_bin, NARC_item_icon_item_icon_002_NCGR, NARC_item_icon_item_icon_003_NCLR, AGB_ITEM_MASTER_BALL }, + [ITEM_ULTRA_BALL] = { NARC_item_data_0002_bin, NARC_item_icon_item_icon_004_NCGR, NARC_item_icon_item_icon_005_NCLR, AGB_ITEM_ULTRA_BALL }, + [ITEM_GREAT_BALL] = { NARC_item_data_0003_bin, NARC_item_icon_item_icon_006_NCGR, NARC_item_icon_item_icon_007_NCLR, AGB_ITEM_GREAT_BALL }, + [ITEM_POKE_BALL] = { NARC_item_data_0004_bin, NARC_item_icon_item_icon_008_NCGR, NARC_item_icon_item_icon_009_NCLR, AGB_ITEM_POKE_BALL }, + [ITEM_SAFARI_BALL] = { NARC_item_data_0005_bin, NARC_item_icon_item_icon_010_NCGR, NARC_item_icon_item_icon_011_NCLR, AGB_ITEM_SAFARI_BALL }, + [ITEM_NET_BALL] = { NARC_item_data_0006_bin, NARC_item_icon_item_icon_012_NCGR, NARC_item_icon_item_icon_013_NCLR, AGB_ITEM_NET_BALL }, + [ITEM_DIVE_BALL] = { NARC_item_data_0007_bin, NARC_item_icon_item_icon_014_NCGR, NARC_item_icon_item_icon_015_NCLR, AGB_ITEM_DIVE_BALL }, + [ITEM_NEST_BALL] = { NARC_item_data_0008_bin, NARC_item_icon_item_icon_016_NCGR, NARC_item_icon_item_icon_017_NCLR, AGB_ITEM_NEST_BALL }, + [ITEM_REPEAT_BALL] = { NARC_item_data_0009_bin, NARC_item_icon_item_icon_018_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_REPEAT_BALL }, + [ITEM_TIMER_BALL] = { NARC_item_data_0010_bin, NARC_item_icon_item_icon_020_NCGR, NARC_item_icon_item_icon_019_NCLR, AGB_ITEM_TIMER_BALL }, + [ITEM_LUXURY_BALL] = { NARC_item_data_0011_bin, NARC_item_icon_item_icon_021_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_LUXURY_BALL }, + [ITEM_PREMIER_BALL] = { NARC_item_data_0012_bin, NARC_item_icon_item_icon_023_NCGR, NARC_item_icon_item_icon_022_NCLR, AGB_ITEM_PREMIER_BALL }, + [ITEM_DUSK_BALL] = { NARC_item_data_0013_bin, NARC_item_icon_item_icon_663_NCGR, NARC_item_icon_item_icon_664_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAL_BALL] = { NARC_item_data_0014_bin, NARC_item_icon_item_icon_665_NCGR, NARC_item_icon_item_icon_666_NCLR, AGB_ITEM_NONE }, + [ITEM_QUICK_BALL] = { NARC_item_data_0015_bin, NARC_item_icon_item_icon_667_NCGR, NARC_item_icon_item_icon_668_NCLR, AGB_ITEM_NONE }, + [ITEM_CHERISH_BALL] = { NARC_item_data_0016_bin, NARC_item_icon_item_icon_669_NCGR, NARC_item_icon_item_icon_670_NCLR, AGB_ITEM_NONE }, + [ITEM_POTION] = { NARC_item_data_0017_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_025_NCLR, AGB_ITEM_POTION }, + [ITEM_ANTIDOTE] = { NARC_item_data_0018_bin, NARC_item_icon_item_icon_026_NCGR, NARC_item_icon_item_icon_027_NCLR, AGB_ITEM_ANTIDOTE }, + [ITEM_BURN_HEAL] = { NARC_item_data_0019_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_028_NCLR, AGB_ITEM_BURN_HEAL }, + [ITEM_ICE_HEAL] = { NARC_item_data_0020_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_029_NCLR, AGB_ITEM_ICE_HEAL }, + [ITEM_AWAKENING] = { NARC_item_data_0021_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_031_NCLR, AGB_ITEM_AWAKENING }, + [ITEM_PARLYZ_HEAL] = { NARC_item_data_0022_bin, NARC_item_icon_item_icon_030_NCGR, NARC_item_icon_item_icon_032_NCLR, AGB_ITEM_PARALYZE_HEAL }, + [ITEM_FULL_RESTORE] = { NARC_item_data_0023_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_034_NCLR, AGB_ITEM_FULL_RESTORE }, + [ITEM_MAX_POTION] = { NARC_item_data_0024_bin, NARC_item_icon_item_icon_033_NCGR, NARC_item_icon_item_icon_035_NCLR, AGB_ITEM_MAX_POTION }, + [ITEM_HYPER_POTION] = { NARC_item_data_0025_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_036_NCLR, AGB_ITEM_HYPER_POTION }, + [ITEM_SUPER_POTION] = { NARC_item_data_0026_bin, NARC_item_icon_item_icon_024_NCGR, NARC_item_icon_item_icon_037_NCLR, AGB_ITEM_SUPER_POTION }, + [ITEM_FULL_HEAL] = { NARC_item_data_0027_bin, NARC_item_icon_item_icon_038_NCGR, NARC_item_icon_item_icon_039_NCLR, AGB_ITEM_FULL_HEAL }, + [ITEM_REVIVE] = { NARC_item_data_0028_bin, NARC_item_icon_item_icon_040_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_REVIVE }, + [ITEM_MAX_REVIVE] = { NARC_item_data_0029_bin, NARC_item_icon_item_icon_041_NCGR, NARC_item_icon_item_icon_042_NCLR, AGB_ITEM_MAX_REVIVE }, + [ITEM_FRESH_WATER] = { NARC_item_data_0030_bin, NARC_item_icon_item_icon_043_NCGR, NARC_item_icon_item_icon_044_NCLR, AGB_ITEM_FRESH_WATER }, + [ITEM_SODA_POP] = { NARC_item_data_0031_bin, NARC_item_icon_item_icon_045_NCGR, NARC_item_icon_item_icon_046_NCLR, AGB_ITEM_SODA_POP }, + [ITEM_LEMONADE] = { NARC_item_data_0032_bin, NARC_item_icon_item_icon_047_NCGR, NARC_item_icon_item_icon_048_NCLR, AGB_ITEM_LEMONADE }, + [ITEM_MOOMOO_MILK] = { NARC_item_data_0033_bin, NARC_item_icon_item_icon_049_NCGR, NARC_item_icon_item_icon_050_NCLR, AGB_ITEM_MOOMOO_MILK }, + [ITEM_ENERGYPOWDER] = { NARC_item_data_0034_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_052_NCLR, AGB_ITEM_ENERGY_POWDER }, + [ITEM_ENERGY_ROOT] = { NARC_item_data_0035_bin, NARC_item_icon_item_icon_053_NCGR, NARC_item_icon_item_icon_054_NCLR, AGB_ITEM_ENERGY_ROOT }, + [ITEM_HEAL_POWDER] = { NARC_item_data_0036_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_055_NCLR, AGB_ITEM_HEAL_POWDER }, + [ITEM_REVIVAL_HERB] = { NARC_item_data_0037_bin, NARC_item_icon_item_icon_056_NCGR, NARC_item_icon_item_icon_057_NCLR, AGB_ITEM_REVIVAL_HERB }, + [ITEM_ETHER] = { NARC_item_data_0038_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_059_NCLR, AGB_ITEM_ETHER }, + [ITEM_MAX_ETHER] = { NARC_item_data_0039_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_060_NCLR, AGB_ITEM_MAX_ETHER }, + [ITEM_ELIXIR] = { NARC_item_data_0040_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_061_NCLR, AGB_ITEM_ELIXIR }, + [ITEM_MAX_ELIXIR] = { NARC_item_data_0041_bin, NARC_item_icon_item_icon_058_NCGR, NARC_item_icon_item_icon_062_NCLR, AGB_ITEM_MAX_ELIXIR }, + [ITEM_LAVA_COOKIE] = { NARC_item_data_0042_bin, NARC_item_icon_item_icon_063_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_LAVA_COOKIE }, + [ITEM_BERRY_JUICE] = { NARC_item_data_0043_bin, NARC_item_icon_item_icon_071_NCGR, NARC_item_icon_item_icon_072_NCLR, AGB_ITEM_BERRY_JUICE }, + [ITEM_SACRED_ASH] = { NARC_item_data_0044_bin, NARC_item_icon_item_icon_073_NCGR, NARC_item_icon_item_icon_074_NCLR, AGB_ITEM_SACRED_ASH }, + [ITEM_HP_UP] = { NARC_item_data_0045_bin, NARC_item_icon_item_icon_083_NCGR, NARC_item_icon_item_icon_084_NCLR, AGB_ITEM_HP_UP }, + [ITEM_PROTEIN] = { NARC_item_data_0046_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_086_NCLR, AGB_ITEM_PROTEIN }, + [ITEM_IRON] = { NARC_item_data_0047_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_087_NCLR, AGB_ITEM_IRON }, + [ITEM_CARBOS] = { NARC_item_data_0048_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_088_NCLR, AGB_ITEM_CARBOS }, + [ITEM_CALCIUM] = { NARC_item_data_0049_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_089_NCLR, AGB_ITEM_CALCIUM }, + [ITEM_RARE_CANDY] = { NARC_item_data_0050_bin, NARC_item_icon_item_icon_090_NCGR, NARC_item_icon_item_icon_091_NCLR, AGB_ITEM_RARE_CANDY }, + [ITEM_PP_UP] = { NARC_item_data_0051_bin, NARC_item_icon_item_icon_092_NCGR, NARC_item_icon_item_icon_093_NCLR, AGB_ITEM_PP_UP }, + [ITEM_ZINC] = { NARC_item_data_0052_bin, NARC_item_icon_item_icon_085_NCGR, NARC_item_icon_item_icon_094_NCLR, AGB_ITEM_ZINC }, + [ITEM_PP_MAX] = { NARC_item_data_0053_bin, NARC_item_icon_item_icon_095_NCGR, NARC_item_icon_item_icon_096_NCLR, AGB_ITEM_PP_MAX }, + [ITEM_OLD_GATEAU] = { NARC_item_data_0054_bin, NARC_item_icon_item_icon_466_NCGR, NARC_item_icon_item_icon_467_NCLR, AGB_ITEM_NONE }, + [ITEM_GUARD_SPEC_] = { NARC_item_data_0055_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_097_NCLR, AGB_ITEM_POKEHEARTGOLD_AGB_SPEC }, + [ITEM_DIRE_HIT] = { NARC_item_data_0056_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_098_NCLR, AGB_ITEM_DIRE_HIT }, + [ITEM_X_ATTACK] = { NARC_item_data_0057_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_099_NCLR, AGB_ITEM_X_ATTACK }, + [ITEM_X_DEFENSE] = { NARC_item_data_0058_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_101_NCLR, AGB_ITEM_X_DEFEND }, + [ITEM_X_SPEED] = { NARC_item_data_0059_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_102_NCLR, AGB_ITEM_X_SPEED }, + [ITEM_X_ACCURACY] = { NARC_item_data_0060_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_103_NCLR, AGB_ITEM_X_ACCURACY }, + [ITEM_X_SPECIAL] = { NARC_item_data_0061_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_104_NCLR, AGB_ITEM_X_SPECIAL }, + [ITEM_X_SP__DEF] = { NARC_item_data_0062_bin, NARC_item_icon_item_icon_100_NCGR, NARC_item_icon_item_icon_469_NCLR, AGB_ITEM_NONE }, + [ITEM_POKE_DOLL] = { NARC_item_data_0063_bin, NARC_item_icon_item_icon_105_NCGR, NARC_item_icon_item_icon_106_NCLR, AGB_ITEM_POKE_DOLL }, + [ITEM_FLUFFY_TAIL] = { NARC_item_data_0064_bin, NARC_item_icon_item_icon_107_NCGR, NARC_item_icon_item_icon_108_NCLR, AGB_ITEM_FLUFFY_TAIL }, + [ITEM_BLUE_FLUTE] = { NARC_item_data_0065_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_066_NCLR, AGB_ITEM_BLUE_FLUTE }, + [ITEM_YELLOW_FLUTE] = { NARC_item_data_0066_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_067_NCLR, AGB_ITEM_YELLOW_FLUTE }, + [ITEM_RED_FLUTE] = { NARC_item_data_0067_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_068_NCLR, AGB_ITEM_RED_FLUTE }, + [ITEM_BLACK_FLUTE] = { NARC_item_data_0068_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_069_NCLR, AGB_ITEM_BLACK_FLUTE }, + [ITEM_WHITE_FLUTE] = { NARC_item_data_0069_bin, NARC_item_icon_item_icon_065_NCGR, NARC_item_icon_item_icon_070_NCLR, AGB_ITEM_WHITE_FLUTE }, + [ITEM_SHOAL_SALT] = { NARC_item_data_0070_bin, NARC_item_icon_item_icon_051_NCGR, NARC_item_icon_item_icon_075_NCLR, AGB_ITEM_SHOAL_SALT }, + [ITEM_SHOAL_SHELL] = { NARC_item_data_0071_bin, NARC_item_icon_item_icon_076_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHOAL_SHELL }, + [ITEM_RED_SHARD] = { NARC_item_data_0072_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_079_NCLR, AGB_ITEM_RED_SHARD }, + [ITEM_BLUE_SHARD] = { NARC_item_data_0073_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_080_NCLR, AGB_ITEM_BLUE_SHARD }, + [ITEM_YELLOW_SHARD] = { NARC_item_data_0074_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_081_NCLR, AGB_ITEM_YELLOW_SHARD }, + [ITEM_GREEN_SHARD] = { NARC_item_data_0075_bin, NARC_item_icon_item_icon_078_NCGR, NARC_item_icon_item_icon_082_NCLR, AGB_ITEM_GREEN_SHARD }, + [ITEM_SUPER_REPEL] = { NARC_item_data_0076_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_110_NCLR, AGB_ITEM_SUPER_REPEL }, + [ITEM_MAX_REPEL] = { NARC_item_data_0077_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_111_NCLR, AGB_ITEM_MAX_REPEL }, + [ITEM_ESCAPE_ROPE] = { NARC_item_data_0078_bin, NARC_item_icon_item_icon_112_NCGR, NARC_item_icon_item_icon_113_NCLR, AGB_ITEM_ESCAPE_ROPE }, + [ITEM_REPEL] = { NARC_item_data_0079_bin, NARC_item_icon_item_icon_109_NCGR, NARC_item_icon_item_icon_114_NCLR, AGB_ITEM_REPEL }, + [ITEM_SUN_STONE] = { NARC_item_data_0080_bin, NARC_item_icon_item_icon_115_NCGR, NARC_item_icon_item_icon_116_NCLR, AGB_ITEM_SUN_STONE }, + [ITEM_MOON_STONE] = { NARC_item_data_0081_bin, NARC_item_icon_item_icon_117_NCGR, NARC_item_icon_item_icon_118_NCLR, AGB_ITEM_MOON_STONE }, + [ITEM_FIRE_STONE] = { NARC_item_data_0082_bin, NARC_item_icon_item_icon_119_NCGR, NARC_item_icon_item_icon_120_NCLR, AGB_ITEM_FIRE_STONE }, + [ITEM_THUNDERSTONE] = { NARC_item_data_0083_bin, NARC_item_icon_item_icon_121_NCGR, NARC_item_icon_item_icon_122_NCLR, AGB_ITEM_THUNDER_STONE }, + [ITEM_WATER_STONE] = { NARC_item_data_0084_bin, NARC_item_icon_item_icon_123_NCGR, NARC_item_icon_item_icon_124_NCLR, AGB_ITEM_WATER_STONE }, + [ITEM_LEAF_STONE] = { NARC_item_data_0085_bin, NARC_item_icon_item_icon_125_NCGR, NARC_item_icon_item_icon_126_NCLR, AGB_ITEM_LEAF_STONE }, + [ITEM_TINYMUSHROOM] = { NARC_item_data_0086_bin, NARC_item_icon_item_icon_127_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_TINY_MUSHROOM }, + [ITEM_BIG_MUSHROOM] = { NARC_item_data_0087_bin, NARC_item_icon_item_icon_128_NCGR, NARC_item_icon_item_icon_129_NCLR, AGB_ITEM_BIG_MUSHROOM }, + [ITEM_PEARL] = { NARC_item_data_0088_bin, NARC_item_icon_item_icon_130_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_PEARL }, + [ITEM_BIG_PEARL] = { NARC_item_data_0089_bin, NARC_item_icon_item_icon_132_NCGR, NARC_item_icon_item_icon_131_NCLR, AGB_ITEM_BIG_PEARL }, + [ITEM_STARDUST] = { NARC_item_data_0090_bin, NARC_item_icon_item_icon_133_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STARDUST }, + [ITEM_STAR_PIECE] = { NARC_item_data_0091_bin, NARC_item_icon_item_icon_135_NCGR, NARC_item_icon_item_icon_134_NCLR, AGB_ITEM_STAR_PIECE }, + [ITEM_NUGGET] = { NARC_item_data_0092_bin, NARC_item_icon_item_icon_136_NCGR, NARC_item_icon_item_icon_137_NCLR, AGB_ITEM_NUGGET }, + [ITEM_HEART_SCALE] = { NARC_item_data_0093_bin, NARC_item_icon_item_icon_138_NCGR, NARC_item_icon_item_icon_139_NCLR, AGB_ITEM_HEART_SCALE }, + [ITEM_HONEY] = { NARC_item_data_0094_bin, NARC_item_icon_item_icon_470_NCGR, NARC_item_icon_item_icon_471_NCLR, AGB_ITEM_NONE }, + [ITEM_GROWTH_MULCH] = { NARC_item_data_0095_bin, NARC_item_icon_item_icon_472_NCGR, NARC_item_icon_item_icon_473_NCLR, AGB_ITEM_NONE }, + [ITEM_DAMP_MULCH] = { NARC_item_data_0096_bin, NARC_item_icon_item_icon_474_NCGR, NARC_item_icon_item_icon_475_NCLR, AGB_ITEM_NONE }, + [ITEM_STABLE_MULCH] = { NARC_item_data_0097_bin, NARC_item_icon_item_icon_476_NCGR, NARC_item_icon_item_icon_477_NCLR, AGB_ITEM_NONE }, + [ITEM_GOOEY_MULCH] = { NARC_item_data_0098_bin, NARC_item_icon_item_icon_478_NCGR, NARC_item_icon_item_icon_479_NCLR, AGB_ITEM_NONE }, + [ITEM_ROOT_FOSSIL] = { NARC_item_data_0099_bin, NARC_item_icon_item_icon_392_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_ROOT_FOSSIL }, + [ITEM_CLAW_FOSSIL] = { NARC_item_data_0100_bin, NARC_item_icon_item_icon_394_NCGR, NARC_item_icon_item_icon_393_NCLR, AGB_ITEM_CLAW_FOSSIL }, + [ITEM_HELIX_FOSSIL] = { NARC_item_data_0101_bin, NARC_item_icon_item_icon_431_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_HELIX_FOSSIL }, + [ITEM_DOME_FOSSIL] = { NARC_item_data_0102_bin, NARC_item_icon_item_icon_433_NCGR, NARC_item_icon_item_icon_432_NCLR, AGB_ITEM_DOME_FOSSIL }, + [ITEM_OLD_AMBER] = { NARC_item_data_0103_bin, NARC_item_icon_item_icon_425_NCGR, NARC_item_icon_item_icon_426_NCLR, AGB_ITEM_OLD_AMBER }, + [ITEM_ARMOR_FOSSIL] = { NARC_item_data_0104_bin, NARC_item_icon_item_icon_617_NCGR, NARC_item_icon_item_icon_618_NCLR, AGB_ITEM_NONE }, + [ITEM_SKULL_FOSSIL] = { NARC_item_data_0105_bin, NARC_item_icon_item_icon_615_NCGR, NARC_item_icon_item_icon_616_NCLR, AGB_ITEM_NONE }, + [ITEM_RARE_BONE] = { NARC_item_data_0106_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_NONE }, + [ITEM_SHINY_STONE] = { NARC_item_data_0107_bin, NARC_item_icon_item_icon_480_NCGR, NARC_item_icon_item_icon_481_NCLR, AGB_ITEM_NONE }, + [ITEM_DUSK_STONE] = { NARC_item_data_0108_bin, NARC_item_icon_item_icon_482_NCGR, NARC_item_icon_item_icon_483_NCLR, AGB_ITEM_NONE }, + [ITEM_DAWN_STONE] = { NARC_item_data_0109_bin, NARC_item_icon_item_icon_484_NCGR, NARC_item_icon_item_icon_485_NCLR, AGB_ITEM_NONE }, + [ITEM_OVAL_STONE] = { NARC_item_data_0110_bin, NARC_item_icon_item_icon_486_NCGR, NARC_item_icon_item_icon_487_NCLR, AGB_ITEM_NONE }, + [ITEM_ODD_KEYSTONE] = { NARC_item_data_0111_bin, NARC_item_icon_item_icon_488_NCGR, NARC_item_icon_item_icon_489_NCLR, AGB_ITEM_NONE }, + [ITEM_GRISEOUS_ORB] = { NARC_item_data_0112_bin, NARC_item_icon_item_icon_699_NCGR, NARC_item_icon_item_icon_700_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_113] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_114] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_115] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_116] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_117] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_118] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_119] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_120] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_121] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_122] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_123] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_124] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_125] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_126] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_127] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_128] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_129] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_130] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_131] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_132] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_133] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_UNUSED_134] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_ADAMANT_ORB] = { NARC_item_data_0113_bin, NARC_item_icon_item_icon_648_NCGR, NARC_item_icon_item_icon_649_NCLR, AGB_ITEM_NONE }, + [ITEM_LUSTROUS_ORB] = { NARC_item_data_0114_bin, NARC_item_icon_item_icon_646_NCGR, NARC_item_icon_item_icon_647_NCLR, AGB_ITEM_NONE }, + [ITEM_GRASS_MAIL] = { NARC_item_data_0115_bin, NARC_item_icon_item_icon_140_NCGR, NARC_item_icon_item_icon_141_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_MAIL] = { NARC_item_data_0116_bin, NARC_item_icon_item_icon_142_NCGR, NARC_item_icon_item_icon_143_NCLR, AGB_ITEM_NONE }, + [ITEM_BUBBLE_MAIL] = { NARC_item_data_0117_bin, NARC_item_icon_item_icon_144_NCGR, NARC_item_icon_item_icon_145_NCLR, AGB_ITEM_NONE }, + [ITEM_BLOOM_MAIL] = { NARC_item_data_0118_bin, NARC_item_icon_item_icon_146_NCGR, NARC_item_icon_item_icon_147_NCLR, AGB_ITEM_NONE }, + [ITEM_TUNNEL_MAIL] = { NARC_item_data_0119_bin, NARC_item_icon_item_icon_148_NCGR, NARC_item_icon_item_icon_149_NCLR, AGB_ITEM_NONE }, + [ITEM_STEEL_MAIL] = { NARC_item_data_0120_bin, NARC_item_icon_item_icon_150_NCGR, NARC_item_icon_item_icon_151_NCLR, AGB_ITEM_NONE }, + [ITEM_HEART_MAIL] = { NARC_item_data_0121_bin, NARC_item_icon_item_icon_152_NCGR, NARC_item_icon_item_icon_153_NCLR, AGB_ITEM_NONE }, + [ITEM_SNOW_MAIL] = { NARC_item_data_0122_bin, NARC_item_icon_item_icon_154_NCGR, NARC_item_icon_item_icon_155_NCLR, AGB_ITEM_NONE }, + [ITEM_SPACE_MAIL] = { NARC_item_data_0123_bin, NARC_item_icon_item_icon_156_NCGR, NARC_item_icon_item_icon_157_NCLR, AGB_ITEM_NONE }, + [ITEM_AIR_MAIL] = { NARC_item_data_0124_bin, NARC_item_icon_item_icon_158_NCGR, NARC_item_icon_item_icon_159_NCLR, AGB_ITEM_NONE }, + [ITEM_MOSAIC_MAIL] = { NARC_item_data_0125_bin, NARC_item_icon_item_icon_160_NCGR, NARC_item_icon_item_icon_161_NCLR, AGB_ITEM_NONE }, + [ITEM_BRICK_MAIL] = { NARC_item_data_0126_bin, NARC_item_icon_item_icon_162_NCGR, NARC_item_icon_item_icon_163_NCLR, AGB_ITEM_NONE }, + [ITEM_CHERI_BERRY] = { NARC_item_data_0127_bin, NARC_item_icon_item_icon_164_NCGR, NARC_item_icon_item_icon_165_NCLR, AGB_ITEM_CHERI_BERRY }, + [ITEM_CHESTO_BERRY] = { NARC_item_data_0128_bin, NARC_item_icon_item_icon_166_NCGR, NARC_item_icon_item_icon_167_NCLR, AGB_ITEM_CHESTO_BERRY }, + [ITEM_PECHA_BERRY] = { NARC_item_data_0129_bin, NARC_item_icon_item_icon_168_NCGR, NARC_item_icon_item_icon_169_NCLR, AGB_ITEM_PECHA_BERRY }, + [ITEM_RAWST_BERRY] = { NARC_item_data_0130_bin, NARC_item_icon_item_icon_170_NCGR, NARC_item_icon_item_icon_171_NCLR, AGB_ITEM_RAWST_BERRY }, + [ITEM_ASPEAR_BERRY] = { NARC_item_data_0131_bin, NARC_item_icon_item_icon_172_NCGR, NARC_item_icon_item_icon_173_NCLR, AGB_ITEM_ASPEAR_BERRY }, + [ITEM_LEPPA_BERRY] = { NARC_item_data_0132_bin, NARC_item_icon_item_icon_174_NCGR, NARC_item_icon_item_icon_175_NCLR, AGB_ITEM_LEPPA_BERRY }, + [ITEM_ORAN_BERRY] = { NARC_item_data_0133_bin, NARC_item_icon_item_icon_176_NCGR, NARC_item_icon_item_icon_177_NCLR, AGB_ITEM_ORAN_BERRY }, + [ITEM_PERSIM_BERRY] = { NARC_item_data_0134_bin, NARC_item_icon_item_icon_178_NCGR, NARC_item_icon_item_icon_179_NCLR, AGB_ITEM_PERSIM_BERRY }, + [ITEM_LUM_BERRY] = { NARC_item_data_0135_bin, NARC_item_icon_item_icon_180_NCGR, NARC_item_icon_item_icon_181_NCLR, AGB_ITEM_LUM_BERRY }, + [ITEM_SITRUS_BERRY] = { NARC_item_data_0136_bin, NARC_item_icon_item_icon_182_NCGR, NARC_item_icon_item_icon_183_NCLR, AGB_ITEM_SITRUS_BERRY }, + [ITEM_FIGY_BERRY] = { NARC_item_data_0137_bin, NARC_item_icon_item_icon_184_NCGR, NARC_item_icon_item_icon_185_NCLR, AGB_ITEM_FIGY_BERRY }, + [ITEM_WIKI_BERRY] = { NARC_item_data_0138_bin, NARC_item_icon_item_icon_186_NCGR, NARC_item_icon_item_icon_187_NCLR, AGB_ITEM_WIKI_BERRY }, + [ITEM_MAGO_BERRY] = { NARC_item_data_0139_bin, NARC_item_icon_item_icon_188_NCGR, NARC_item_icon_item_icon_189_NCLR, AGB_ITEM_MAGO_BERRY }, + [ITEM_AGUAV_BERRY] = { NARC_item_data_0140_bin, NARC_item_icon_item_icon_190_NCGR, NARC_item_icon_item_icon_191_NCLR, AGB_ITEM_AGUAV_BERRY }, + [ITEM_IAPAPA_BERRY] = { NARC_item_data_0141_bin, NARC_item_icon_item_icon_192_NCGR, NARC_item_icon_item_icon_193_NCLR, AGB_ITEM_IAPAPA_BERRY }, + [ITEM_RAZZ_BERRY] = { NARC_item_data_0142_bin, NARC_item_icon_item_icon_194_NCGR, NARC_item_icon_item_icon_195_NCLR, AGB_ITEM_RAZZ_BERRY }, + [ITEM_BLUK_BERRY] = { NARC_item_data_0143_bin, NARC_item_icon_item_icon_196_NCGR, NARC_item_icon_item_icon_197_NCLR, AGB_ITEM_BLUK_BERRY }, + [ITEM_NANAB_BERRY] = { NARC_item_data_0144_bin, NARC_item_icon_item_icon_198_NCGR, NARC_item_icon_item_icon_199_NCLR, AGB_ITEM_NANAB_BERRY }, + [ITEM_WEPEAR_BERRY] = { NARC_item_data_0145_bin, NARC_item_icon_item_icon_200_NCGR, NARC_item_icon_item_icon_201_NCLR, AGB_ITEM_WEPEAR_BERRY }, + [ITEM_PINAP_BERRY] = { NARC_item_data_0146_bin, NARC_item_icon_item_icon_202_NCGR, NARC_item_icon_item_icon_203_NCLR, AGB_ITEM_PINAP_BERRY }, + [ITEM_POMEG_BERRY] = { NARC_item_data_0147_bin, NARC_item_icon_item_icon_204_NCGR, NARC_item_icon_item_icon_205_NCLR, AGB_ITEM_POMEG_BERRY }, + [ITEM_KELPSY_BERRY] = { NARC_item_data_0148_bin, NARC_item_icon_item_icon_206_NCGR, NARC_item_icon_item_icon_207_NCLR, AGB_ITEM_KELPSY_BERRY }, + [ITEM_QUALOT_BERRY] = { NARC_item_data_0149_bin, NARC_item_icon_item_icon_208_NCGR, NARC_item_icon_item_icon_209_NCLR, AGB_ITEM_QUALOT_BERRY }, + [ITEM_HONDEW_BERRY] = { NARC_item_data_0150_bin, NARC_item_icon_item_icon_210_NCGR, NARC_item_icon_item_icon_211_NCLR, AGB_ITEM_HONDEW_BERRY }, + [ITEM_GREPA_BERRY] = { NARC_item_data_0151_bin, NARC_item_icon_item_icon_212_NCGR, NARC_item_icon_item_icon_213_NCLR, AGB_ITEM_GREPA_BERRY }, + [ITEM_TAMATO_BERRY] = { NARC_item_data_0152_bin, NARC_item_icon_item_icon_214_NCGR, NARC_item_icon_item_icon_215_NCLR, AGB_ITEM_TAMATO_BERRY }, + [ITEM_CORNN_BERRY] = { NARC_item_data_0153_bin, NARC_item_icon_item_icon_216_NCGR, NARC_item_icon_item_icon_217_NCLR, AGB_ITEM_CORNN_BERRY }, + [ITEM_MAGOST_BERRY] = { NARC_item_data_0154_bin, NARC_item_icon_item_icon_218_NCGR, NARC_item_icon_item_icon_219_NCLR, AGB_ITEM_MAGOST_BERRY }, + [ITEM_RABUTA_BERRY] = { NARC_item_data_0155_bin, NARC_item_icon_item_icon_220_NCGR, NARC_item_icon_item_icon_221_NCLR, AGB_ITEM_RABUTA_BERRY }, + [ITEM_NOMEL_BERRY] = { NARC_item_data_0156_bin, NARC_item_icon_item_icon_222_NCGR, NARC_item_icon_item_icon_223_NCLR, AGB_ITEM_NOMEL_BERRY }, + [ITEM_SPELON_BERRY] = { NARC_item_data_0157_bin, NARC_item_icon_item_icon_224_NCGR, NARC_item_icon_item_icon_225_NCLR, AGB_ITEM_SPELON_BERRY }, + [ITEM_PAMTRE_BERRY] = { NARC_item_data_0158_bin, NARC_item_icon_item_icon_226_NCGR, NARC_item_icon_item_icon_227_NCLR, AGB_ITEM_PAMTRE_BERRY }, + [ITEM_WATMEL_BERRY] = { NARC_item_data_0159_bin, NARC_item_icon_item_icon_228_NCGR, NARC_item_icon_item_icon_229_NCLR, AGB_ITEM_WATMEL_BERRY }, + [ITEM_DURIN_BERRY] = { NARC_item_data_0160_bin, NARC_item_icon_item_icon_230_NCGR, NARC_item_icon_item_icon_231_NCLR, AGB_ITEM_DURIN_BERRY }, + [ITEM_BELUE_BERRY] = { NARC_item_data_0161_bin, NARC_item_icon_item_icon_232_NCGR, NARC_item_icon_item_icon_233_NCLR, AGB_ITEM_BELUE_BERRY }, + [ITEM_OCCA_BERRY] = { NARC_item_data_0162_bin, NARC_item_icon_item_icon_554_NCGR, NARC_item_icon_item_icon_555_NCLR, AGB_ITEM_NONE }, + [ITEM_PASSHO_BERRY] = { NARC_item_data_0163_bin, NARC_item_icon_item_icon_556_NCGR, NARC_item_icon_item_icon_557_NCLR, AGB_ITEM_NONE }, + [ITEM_WACAN_BERRY] = { NARC_item_data_0164_bin, NARC_item_icon_item_icon_558_NCGR, NARC_item_icon_item_icon_559_NCLR, AGB_ITEM_NONE }, + [ITEM_RINDO_BERRY] = { NARC_item_data_0165_bin, NARC_item_icon_item_icon_560_NCGR, NARC_item_icon_item_icon_561_NCLR, AGB_ITEM_NONE }, + [ITEM_YACHE_BERRY] = { NARC_item_data_0166_bin, NARC_item_icon_item_icon_562_NCGR, NARC_item_icon_item_icon_563_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOPLE_BERRY] = { NARC_item_data_0167_bin, NARC_item_icon_item_icon_564_NCGR, NARC_item_icon_item_icon_565_NCLR, AGB_ITEM_NONE }, + [ITEM_KEBIA_BERRY] = { NARC_item_data_0168_bin, NARC_item_icon_item_icon_566_NCGR, NARC_item_icon_item_icon_567_NCLR, AGB_ITEM_NONE }, + [ITEM_SHUCA_BERRY] = { NARC_item_data_0169_bin, NARC_item_icon_item_icon_568_NCGR, NARC_item_icon_item_icon_569_NCLR, AGB_ITEM_NONE }, + [ITEM_COBA_BERRY] = { NARC_item_data_0170_bin, NARC_item_icon_item_icon_570_NCGR, NARC_item_icon_item_icon_571_NCLR, AGB_ITEM_NONE }, + [ITEM_PAYAPA_BERRY] = { NARC_item_data_0171_bin, NARC_item_icon_item_icon_572_NCGR, NARC_item_icon_item_icon_573_NCLR, AGB_ITEM_NONE }, + [ITEM_TANGA_BERRY] = { NARC_item_data_0172_bin, NARC_item_icon_item_icon_574_NCGR, NARC_item_icon_item_icon_575_NCLR, AGB_ITEM_NONE }, + [ITEM_CHARTI_BERRY] = { NARC_item_data_0173_bin, NARC_item_icon_item_icon_576_NCGR, NARC_item_icon_item_icon_577_NCLR, AGB_ITEM_NONE }, + [ITEM_KASIB_BERRY] = { NARC_item_data_0174_bin, NARC_item_icon_item_icon_578_NCGR, NARC_item_icon_item_icon_579_NCLR, AGB_ITEM_NONE }, + [ITEM_HABAN_BERRY] = { NARC_item_data_0175_bin, NARC_item_icon_item_icon_580_NCGR, NARC_item_icon_item_icon_581_NCLR, AGB_ITEM_NONE }, + [ITEM_COLBUR_BERRY] = { NARC_item_data_0176_bin, NARC_item_icon_item_icon_582_NCGR, NARC_item_icon_item_icon_583_NCLR, AGB_ITEM_NONE }, + [ITEM_BABIRI_BERRY] = { NARC_item_data_0177_bin, NARC_item_icon_item_icon_584_NCGR, NARC_item_icon_item_icon_585_NCLR, AGB_ITEM_NONE }, + [ITEM_CHILAN_BERRY] = { NARC_item_data_0178_bin, NARC_item_icon_item_icon_586_NCGR, NARC_item_icon_item_icon_587_NCLR, AGB_ITEM_NONE }, + [ITEM_LIECHI_BERRY] = { NARC_item_data_0179_bin, NARC_item_icon_item_icon_234_NCGR, NARC_item_icon_item_icon_235_NCLR, AGB_ITEM_LIECHI_BERRY }, + [ITEM_GANLON_BERRY] = { NARC_item_data_0180_bin, NARC_item_icon_item_icon_236_NCGR, NARC_item_icon_item_icon_237_NCLR, AGB_ITEM_GANLON_BERRY }, + [ITEM_SALAC_BERRY] = { NARC_item_data_0181_bin, NARC_item_icon_item_icon_238_NCGR, NARC_item_icon_item_icon_239_NCLR, AGB_ITEM_SALAC_BERRY }, + [ITEM_PETAYA_BERRY] = { NARC_item_data_0182_bin, NARC_item_icon_item_icon_240_NCGR, NARC_item_icon_item_icon_241_NCLR, AGB_ITEM_PETAYA_BERRY }, + [ITEM_APICOT_BERRY] = { NARC_item_data_0183_bin, NARC_item_icon_item_icon_242_NCGR, NARC_item_icon_item_icon_243_NCLR, AGB_ITEM_APICOT_BERRY }, + [ITEM_LANSAT_BERRY] = { NARC_item_data_0184_bin, NARC_item_icon_item_icon_244_NCGR, NARC_item_icon_item_icon_245_NCLR, AGB_ITEM_LANSAT_BERRY }, + [ITEM_STARF_BERRY] = { NARC_item_data_0185_bin, NARC_item_icon_item_icon_246_NCGR, NARC_item_icon_item_icon_247_NCLR, AGB_ITEM_STARF_BERRY }, + [ITEM_ENIGMA_BERRY] = { NARC_item_data_0186_bin, NARC_item_icon_item_icon_248_NCGR, NARC_item_icon_item_icon_249_NCLR, AGB_ITEM_ENIGMA_BERRY }, + [ITEM_MICLE_BERRY] = { NARC_item_data_0187_bin, NARC_item_icon_item_icon_588_NCGR, NARC_item_icon_item_icon_589_NCLR, AGB_ITEM_NONE }, + [ITEM_CUSTAP_BERRY] = { NARC_item_data_0188_bin, NARC_item_icon_item_icon_590_NCGR, NARC_item_icon_item_icon_591_NCLR, AGB_ITEM_NONE }, + [ITEM_JABOCA_BERRY] = { NARC_item_data_0189_bin, NARC_item_icon_item_icon_592_NCGR, NARC_item_icon_item_icon_593_NCLR, AGB_ITEM_NONE }, + [ITEM_ROWAP_BERRY] = { NARC_item_data_0190_bin, NARC_item_icon_item_icon_594_NCGR, NARC_item_icon_item_icon_595_NCLR, AGB_ITEM_NONE }, + [ITEM_BRIGHTPOWDER] = { NARC_item_data_0191_bin, NARC_item_icon_item_icon_250_NCGR, NARC_item_icon_item_icon_251_NCLR, AGB_ITEM_BRIGHT_POWDER }, + [ITEM_WHITE_HERB] = { NARC_item_data_0192_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_253_NCLR, AGB_ITEM_WHITE_HERB }, + [ITEM_MACHO_BRACE] = { NARC_item_data_0193_bin, NARC_item_icon_item_icon_254_NCGR, NARC_item_icon_item_icon_255_NCLR, AGB_ITEM_MACHO_BRACE }, + [ITEM_EXP__SHARE] = { NARC_item_data_0194_bin, NARC_item_icon_item_icon_256_NCGR, NARC_item_icon_item_icon_257_NCLR, AGB_ITEM_EXP_SHARE }, + [ITEM_QUICK_CLAW] = { NARC_item_data_0195_bin, NARC_item_icon_item_icon_258_NCGR, NARC_item_icon_item_icon_259_NCLR, AGB_ITEM_QUICK_CLAW }, + [ITEM_SOOTHE_BELL] = { NARC_item_data_0196_bin, NARC_item_icon_item_icon_260_NCGR, NARC_item_icon_item_icon_261_NCLR, AGB_ITEM_SOOTHE_BELL }, + [ITEM_MENTAL_HERB] = { NARC_item_data_0197_bin, NARC_item_icon_item_icon_252_NCGR, NARC_item_icon_item_icon_262_NCLR, AGB_ITEM_MENTAL_HERB }, + [ITEM_CHOICE_BAND] = { NARC_item_data_0198_bin, NARC_item_icon_item_icon_263_NCGR, NARC_item_icon_item_icon_264_NCLR, AGB_ITEM_CHOICE_BAND }, + [ITEM_KINGS_ROCK] = { NARC_item_data_0199_bin, NARC_item_icon_item_icon_265_NCGR, NARC_item_icon_item_icon_266_NCLR, AGB_ITEM_KINGS_ROCK }, + [ITEM_SILVERPOWDER] = { NARC_item_data_0200_bin, NARC_item_icon_item_icon_267_NCGR, NARC_item_icon_item_icon_268_NCLR, AGB_ITEM_SILVER_POWDER }, + [ITEM_AMULET_COIN] = { NARC_item_data_0201_bin, NARC_item_icon_item_icon_269_NCGR, NARC_item_icon_item_icon_270_NCLR, AGB_ITEM_AMULET_COIN }, + [ITEM_CLEANSE_TAG] = { NARC_item_data_0202_bin, NARC_item_icon_item_icon_271_NCGR, NARC_item_icon_item_icon_272_NCLR, AGB_ITEM_CLEANSE_TAG }, + [ITEM_SOUL_DEW] = { NARC_item_data_0203_bin, NARC_item_icon_item_icon_273_NCGR, NARC_item_icon_item_icon_274_NCLR, AGB_ITEM_SOUL_DEW }, + [ITEM_DEEPSEATOOTH] = { NARC_item_data_0204_bin, NARC_item_icon_item_icon_275_NCGR, NARC_item_icon_item_icon_276_NCLR, AGB_ITEM_DEEP_SEA_TOOTH }, + [ITEM_DEEPSEASCALE] = { NARC_item_data_0205_bin, NARC_item_icon_item_icon_277_NCGR, NARC_item_icon_item_icon_278_NCLR, AGB_ITEM_DEEP_SEA_SCALE }, + [ITEM_SMOKE_BALL] = { NARC_item_data_0206_bin, NARC_item_icon_item_icon_279_NCGR, NARC_item_icon_item_icon_280_NCLR, AGB_ITEM_SMOKE_BALL }, + [ITEM_EVERSTONE] = { NARC_item_data_0207_bin, NARC_item_icon_item_icon_281_NCGR, NARC_item_icon_item_icon_282_NCLR, AGB_ITEM_EVERSTONE }, + [ITEM_FOCUS_BAND] = { NARC_item_data_0208_bin, NARC_item_icon_item_icon_283_NCGR, NARC_item_icon_item_icon_284_NCLR, AGB_ITEM_FOCUS_BAND }, + [ITEM_LUCKY_EGG] = { NARC_item_data_0209_bin, NARC_item_icon_item_icon_285_NCGR, NARC_item_icon_item_icon_286_NCLR, AGB_ITEM_LUCKY_EGG }, + [ITEM_SCOPE_LENS] = { NARC_item_data_0210_bin, NARC_item_icon_item_icon_287_NCGR, NARC_item_icon_item_icon_288_NCLR, AGB_ITEM_SCOPE_LENS }, + [ITEM_METAL_COAT] = { NARC_item_data_0211_bin, NARC_item_icon_item_icon_289_NCGR, NARC_item_icon_item_icon_290_NCLR, AGB_ITEM_METAL_COAT }, + [ITEM_LEFTOVERS] = { NARC_item_data_0212_bin, NARC_item_icon_item_icon_291_NCGR, NARC_item_icon_item_icon_292_NCLR, AGB_ITEM_LEFTOVERS }, + [ITEM_DRAGON_SCALE] = { NARC_item_data_0213_bin, NARC_item_icon_item_icon_293_NCGR, NARC_item_icon_item_icon_294_NCLR, AGB_ITEM_DRAGON_SCALE }, + [ITEM_LIGHT_BALL] = { NARC_item_data_0214_bin, NARC_item_icon_item_icon_295_NCGR, NARC_item_icon_item_icon_296_NCLR, AGB_ITEM_LIGHT_BALL }, + [ITEM_SOFT_SAND] = { NARC_item_data_0215_bin, NARC_item_icon_item_icon_297_NCGR, NARC_item_icon_item_icon_298_NCLR, AGB_ITEM_SOFT_SAND }, + [ITEM_HARD_STONE] = { NARC_item_data_0216_bin, NARC_item_icon_item_icon_299_NCGR, NARC_item_icon_item_icon_300_NCLR, AGB_ITEM_HARD_STONE }, + [ITEM_MIRACLE_SEED] = { NARC_item_data_0217_bin, NARC_item_icon_item_icon_301_NCGR, NARC_item_icon_item_icon_302_NCLR, AGB_ITEM_MIRACLE_SEED }, + [ITEM_BLACKGLASSES] = { NARC_item_data_0218_bin, NARC_item_icon_item_icon_303_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_GLASSES }, + [ITEM_BLACK_BELT] = { NARC_item_data_0219_bin, NARC_item_icon_item_icon_305_NCGR, NARC_item_icon_item_icon_304_NCLR, AGB_ITEM_BLACK_BELT }, + [ITEM_MAGNET] = { NARC_item_data_0220_bin, NARC_item_icon_item_icon_306_NCGR, NARC_item_icon_item_icon_307_NCLR, AGB_ITEM_MAGNET }, + [ITEM_MYSTIC_WATER] = { NARC_item_data_0221_bin, NARC_item_icon_item_icon_308_NCGR, NARC_item_icon_item_icon_309_NCLR, AGB_ITEM_MYSTIC_WATER }, + [ITEM_SHARP_BEAK] = { NARC_item_data_0222_bin, NARC_item_icon_item_icon_310_NCGR, NARC_item_icon_item_icon_311_NCLR, AGB_ITEM_SHARP_BEAK }, + [ITEM_POISON_BARB] = { NARC_item_data_0223_bin, NARC_item_icon_item_icon_312_NCGR, NARC_item_icon_item_icon_313_NCLR, AGB_ITEM_POISON_BARB }, + [ITEM_NEVERMELTICE] = { NARC_item_data_0224_bin, NARC_item_icon_item_icon_314_NCGR, NARC_item_icon_item_icon_315_NCLR, AGB_ITEM_NEVER_MELT_ICE }, + [ITEM_SPELL_TAG] = { NARC_item_data_0225_bin, NARC_item_icon_item_icon_316_NCGR, NARC_item_icon_item_icon_317_NCLR, AGB_ITEM_SPELL_TAG }, + [ITEM_TWISTEDSPOON] = { NARC_item_data_0226_bin, NARC_item_icon_item_icon_318_NCGR, NARC_item_icon_item_icon_319_NCLR, AGB_ITEM_TWISTED_SPOON }, + [ITEM_CHARCOAL] = { NARC_item_data_0227_bin, NARC_item_icon_item_icon_320_NCGR, NARC_item_icon_item_icon_321_NCLR, AGB_ITEM_CHARCOAL }, + [ITEM_DRAGON_FANG] = { NARC_item_data_0228_bin, NARC_item_icon_item_icon_322_NCGR, NARC_item_icon_item_icon_323_NCLR, AGB_ITEM_DRAGON_FANG }, + [ITEM_SILK_SCARF] = { NARC_item_data_0229_bin, NARC_item_icon_item_icon_324_NCGR, NARC_item_icon_item_icon_325_NCLR, AGB_ITEM_SILK_SCARF }, + [ITEM_UPGRADE] = { NARC_item_data_0230_bin, NARC_item_icon_item_icon_326_NCGR, NARC_item_icon_item_icon_327_NCLR, AGB_ITEM_UP_GRADE }, + [ITEM_SHELL_BELL] = { NARC_item_data_0231_bin, NARC_item_icon_item_icon_328_NCGR, NARC_item_icon_item_icon_077_NCLR, AGB_ITEM_SHELL_BELL }, + [ITEM_SEA_INCENSE] = { NARC_item_data_0232_bin, NARC_item_icon_item_icon_329_NCGR, NARC_item_icon_item_icon_330_NCLR, AGB_ITEM_SEA_INCENSE }, + [ITEM_LAX_INCENSE] = { NARC_item_data_0233_bin, NARC_item_icon_item_icon_331_NCGR, NARC_item_icon_item_icon_332_NCLR, AGB_ITEM_LAX_INCENSE }, + [ITEM_LUCKY_PUNCH] = { NARC_item_data_0234_bin, NARC_item_icon_item_icon_333_NCGR, NARC_item_icon_item_icon_334_NCLR, AGB_ITEM_LUCKY_PUNCH }, + [ITEM_METAL_POWDER] = { NARC_item_data_0235_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_336_NCLR, AGB_ITEM_METAL_POWDER }, + [ITEM_THICK_CLUB] = { NARC_item_data_0236_bin, NARC_item_icon_item_icon_337_NCGR, NARC_item_icon_item_icon_338_NCLR, AGB_ITEM_THICK_CLUB }, + [ITEM_STICK] = { NARC_item_data_0237_bin, NARC_item_icon_item_icon_339_NCGR, NARC_item_icon_item_icon_340_NCLR, AGB_ITEM_STICK }, + [ITEM_RED_SCARF] = { NARC_item_data_0238_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_342_NCLR, AGB_ITEM_RED_SCARF }, + [ITEM_BLUE_SCARF] = { NARC_item_data_0239_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_343_NCLR, AGB_ITEM_BLUE_SCARF }, + [ITEM_PINK_SCARF] = { NARC_item_data_0240_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_344_NCLR, AGB_ITEM_PINK_SCARF }, + [ITEM_GREEN_SCARF] = { NARC_item_data_0241_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_345_NCLR, AGB_ITEM_GREEN_SCARF }, + [ITEM_YELLOW_SCARF] = { NARC_item_data_0242_bin, NARC_item_icon_item_icon_341_NCGR, NARC_item_icon_item_icon_346_NCLR, AGB_ITEM_YELLOW_SCARF }, + [ITEM_WIDE_LENS] = { NARC_item_data_0243_bin, NARC_item_icon_item_icon_490_NCGR, NARC_item_icon_item_icon_491_NCLR, AGB_ITEM_NONE }, + [ITEM_MUSCLE_BAND] = { NARC_item_data_0244_bin, NARC_item_icon_item_icon_492_NCGR, NARC_item_icon_item_icon_493_NCLR, AGB_ITEM_NONE }, + [ITEM_WISE_GLASSES] = { NARC_item_data_0245_bin, NARC_item_icon_item_icon_494_NCGR, NARC_item_icon_item_icon_495_NCLR, AGB_ITEM_NONE }, + [ITEM_EXPERT_BELT] = { NARC_item_data_0246_bin, NARC_item_icon_item_icon_496_NCGR, NARC_item_icon_item_icon_497_NCLR, AGB_ITEM_NONE }, + [ITEM_LIGHT_CLAY] = { NARC_item_data_0247_bin, NARC_item_icon_item_icon_611_NCGR, NARC_item_icon_item_icon_612_NCLR, AGB_ITEM_NONE }, + [ITEM_LIFE_ORB] = { NARC_item_data_0248_bin, NARC_item_icon_item_icon_498_NCGR, NARC_item_icon_item_icon_499_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_HERB] = { NARC_item_data_0249_bin, NARC_item_icon_item_icon_500_NCGR, NARC_item_icon_item_icon_501_NCLR, AGB_ITEM_NONE }, + [ITEM_TOXIC_ORB] = { NARC_item_data_0250_bin, NARC_item_icon_item_icon_502_NCGR, NARC_item_icon_item_icon_503_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_ORB] = { NARC_item_data_0251_bin, NARC_item_icon_item_icon_504_NCGR, NARC_item_icon_item_icon_505_NCLR, AGB_ITEM_NONE }, + [ITEM_QUICK_POWDER] = { NARC_item_data_0252_bin, NARC_item_icon_item_icon_335_NCGR, NARC_item_icon_item_icon_658_NCLR, AGB_ITEM_NONE }, + [ITEM_FOCUS_SASH] = { NARC_item_data_0253_bin, NARC_item_icon_item_icon_659_NCGR, NARC_item_icon_item_icon_660_NCLR, AGB_ITEM_NONE }, + [ITEM_ZOOM_LENS] = { NARC_item_data_0254_bin, NARC_item_icon_item_icon_506_NCGR, NARC_item_icon_item_icon_507_NCLR, AGB_ITEM_NONE }, + [ITEM_METRONOME] = { NARC_item_data_0255_bin, NARC_item_icon_item_icon_508_NCGR, NARC_item_icon_item_icon_509_NCLR, AGB_ITEM_NONE }, + [ITEM_IRON_BALL] = { NARC_item_data_0256_bin, NARC_item_icon_item_icon_613_NCGR, NARC_item_icon_item_icon_614_NCLR, AGB_ITEM_NONE }, + [ITEM_LAGGING_TAIL] = { NARC_item_data_0257_bin, NARC_item_icon_item_icon_650_NCGR, NARC_item_icon_item_icon_651_NCLR, AGB_ITEM_NONE }, + [ITEM_DESTINY_KNOT] = { NARC_item_data_0258_bin, NARC_item_icon_item_icon_654_NCGR, NARC_item_icon_item_icon_655_NCLR, AGB_ITEM_NONE }, + [ITEM_BLACK_SLUDGE] = { NARC_item_data_0259_bin, NARC_item_icon_item_icon_510_NCGR, NARC_item_icon_item_icon_511_NCLR, AGB_ITEM_NONE }, + [ITEM_ICY_ROCK] = { NARC_item_data_0260_bin, NARC_item_icon_item_icon_636_NCGR, NARC_item_icon_item_icon_637_NCLR, AGB_ITEM_NONE }, + [ITEM_SMOOTH_ROCK] = { NARC_item_data_0261_bin, NARC_item_icon_item_icon_638_NCGR, NARC_item_icon_item_icon_639_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAT_ROCK] = { NARC_item_data_0262_bin, NARC_item_icon_item_icon_640_NCGR, NARC_item_icon_item_icon_641_NCLR, AGB_ITEM_NONE }, + [ITEM_DAMP_ROCK] = { NARC_item_data_0263_bin, NARC_item_icon_item_icon_642_NCGR, NARC_item_icon_item_icon_643_NCLR, AGB_ITEM_NONE }, + [ITEM_GRIP_CLAW] = { NARC_item_data_0264_bin, NARC_item_icon_item_icon_652_NCGR, NARC_item_icon_item_icon_653_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOICE_SCARF] = { NARC_item_data_0265_bin, NARC_item_icon_item_icon_512_NCGR, NARC_item_icon_item_icon_513_NCLR, AGB_ITEM_NONE }, + [ITEM_STICKY_BARB] = { NARC_item_data_0266_bin, NARC_item_icon_item_icon_514_NCGR, NARC_item_icon_item_icon_515_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BRACER] = { NARC_item_data_0267_bin, NARC_item_icon_item_icon_683_NCGR, NARC_item_icon_item_icon_684_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BELT] = { NARC_item_data_0268_bin, NARC_item_icon_item_icon_691_NCGR, NARC_item_icon_item_icon_692_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_LENS] = { NARC_item_data_0269_bin, NARC_item_icon_item_icon_693_NCGR, NARC_item_icon_item_icon_694_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_BAND] = { NARC_item_data_0270_bin, NARC_item_icon_item_icon_685_NCGR, NARC_item_icon_item_icon_686_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_ANKLET] = { NARC_item_data_0271_bin, NARC_item_icon_item_icon_687_NCGR, NARC_item_icon_item_icon_688_NCLR, AGB_ITEM_NONE }, + [ITEM_POWER_WEIGHT] = { NARC_item_data_0272_bin, NARC_item_icon_item_icon_689_NCGR, NARC_item_icon_item_icon_690_NCLR, AGB_ITEM_NONE }, + [ITEM_SHED_SHELL] = { NARC_item_data_0273_bin, NARC_item_icon_item_icon_516_NCGR, NARC_item_icon_item_icon_517_NCLR, AGB_ITEM_NONE }, + [ITEM_BIG_ROOT] = { NARC_item_data_0274_bin, NARC_item_icon_item_icon_518_NCGR, NARC_item_icon_item_icon_519_NCLR, AGB_ITEM_NONE }, + [ITEM_CHOICE_SPECS] = { NARC_item_data_0275_bin, NARC_item_icon_item_icon_520_NCGR, NARC_item_icon_item_icon_521_NCLR, AGB_ITEM_NONE }, + [ITEM_FLAME_PLATE] = { NARC_item_data_0276_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_620_NCLR, AGB_ITEM_NONE }, + [ITEM_SPLASH_PLATE] = { NARC_item_data_0277_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_621_NCLR, AGB_ITEM_NONE }, + [ITEM_ZAP_PLATE] = { NARC_item_data_0278_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_622_NCLR, AGB_ITEM_NONE }, + [ITEM_MEADOW_PLATE] = { NARC_item_data_0279_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_623_NCLR, AGB_ITEM_NONE }, + [ITEM_ICICLE_PLATE] = { NARC_item_data_0280_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_624_NCLR, AGB_ITEM_NONE }, + [ITEM_FIST_PLATE] = { NARC_item_data_0281_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_625_NCLR, AGB_ITEM_NONE }, + [ITEM_TOXIC_PLATE] = { NARC_item_data_0282_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_626_NCLR, AGB_ITEM_NONE }, + [ITEM_EARTH_PLATE] = { NARC_item_data_0283_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_627_NCLR, AGB_ITEM_NONE }, + [ITEM_SKY_PLATE] = { NARC_item_data_0284_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_628_NCLR, AGB_ITEM_NONE }, + [ITEM_MIND_PLATE] = { NARC_item_data_0285_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_629_NCLR, AGB_ITEM_NONE }, + [ITEM_INSECT_PLATE] = { NARC_item_data_0286_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_630_NCLR, AGB_ITEM_NONE }, + [ITEM_STONE_PLATE] = { NARC_item_data_0287_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_631_NCLR, AGB_ITEM_NONE }, + [ITEM_SPOOKY_PLATE] = { NARC_item_data_0288_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_632_NCLR, AGB_ITEM_NONE }, + [ITEM_DRACO_PLATE] = { NARC_item_data_0289_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_633_NCLR, AGB_ITEM_NONE }, + [ITEM_DREAD_PLATE] = { NARC_item_data_0290_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_634_NCLR, AGB_ITEM_NONE }, + [ITEM_IRON_PLATE] = { NARC_item_data_0291_bin, NARC_item_icon_item_icon_619_NCGR, NARC_item_icon_item_icon_635_NCLR, AGB_ITEM_NONE }, + [ITEM_ODD_INCENSE] = { NARC_item_data_0292_bin, NARC_item_icon_item_icon_522_NCGR, NARC_item_icon_item_icon_523_NCLR, AGB_ITEM_NONE }, + [ITEM_ROCK_INCENSE] = { NARC_item_data_0293_bin, NARC_item_icon_item_icon_524_NCGR, NARC_item_icon_item_icon_525_NCLR, AGB_ITEM_NONE }, + [ITEM_FULL_INCENSE] = { NARC_item_data_0294_bin, NARC_item_icon_item_icon_526_NCGR, NARC_item_icon_item_icon_527_NCLR, AGB_ITEM_NONE }, + [ITEM_WAVE_INCENSE] = { NARC_item_data_0295_bin, NARC_item_icon_item_icon_528_NCGR, NARC_item_icon_item_icon_529_NCLR, AGB_ITEM_NONE }, + [ITEM_ROSE_INCENSE] = { NARC_item_data_0296_bin, NARC_item_icon_item_icon_530_NCGR, NARC_item_icon_item_icon_531_NCLR, AGB_ITEM_NONE }, + [ITEM_LUCK_INCENSE] = { NARC_item_data_0297_bin, NARC_item_icon_item_icon_532_NCGR, NARC_item_icon_item_icon_533_NCLR, AGB_ITEM_NONE }, + [ITEM_PURE_INCENSE] = { NARC_item_data_0298_bin, NARC_item_icon_item_icon_534_NCGR, NARC_item_icon_item_icon_535_NCLR, AGB_ITEM_NONE }, + [ITEM_PROTECTOR] = { NARC_item_data_0299_bin, NARC_item_icon_item_icon_695_NCGR, NARC_item_icon_item_icon_696_NCLR, AGB_ITEM_NONE }, + [ITEM_ELECTIRIZER] = { NARC_item_data_0300_bin, NARC_item_icon_item_icon_536_NCGR, NARC_item_icon_item_icon_537_NCLR, AGB_ITEM_NONE }, + [ITEM_MAGMARIZER] = { NARC_item_data_0301_bin, NARC_item_icon_item_icon_538_NCGR, NARC_item_icon_item_icon_539_NCLR, AGB_ITEM_NONE }, + [ITEM_DUBIOUS_DISC] = { NARC_item_data_0302_bin, NARC_item_icon_item_icon_540_NCGR, NARC_item_icon_item_icon_541_NCLR, AGB_ITEM_NONE }, + [ITEM_REAPER_CLOTH] = { NARC_item_data_0303_bin, NARC_item_icon_item_icon_542_NCGR, NARC_item_icon_item_icon_543_NCLR, AGB_ITEM_NONE }, + [ITEM_RAZOR_CLAW] = { NARC_item_data_0304_bin, NARC_item_icon_item_icon_544_NCGR, NARC_item_icon_item_icon_545_NCLR, AGB_ITEM_NONE }, + [ITEM_RAZOR_FANG] = { NARC_item_data_0305_bin, NARC_item_icon_item_icon_546_NCGR, NARC_item_icon_item_icon_547_NCLR, AGB_ITEM_NONE }, + [ITEM_TM01] = { NARC_item_data_0306_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM01 }, + [ITEM_TM02] = { NARC_item_data_0307_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_TM02 }, + [ITEM_TM03] = { NARC_item_data_0308_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM03 }, + [ITEM_TM04] = { NARC_item_data_0309_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM04 }, + [ITEM_TM05] = { NARC_item_data_0310_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM05 }, + [ITEM_TM06] = { NARC_item_data_0311_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM06 }, + [ITEM_TM07] = { NARC_item_data_0312_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM07 }, + [ITEM_TM08] = { NARC_item_data_0313_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM08 }, + [ITEM_TM09] = { NARC_item_data_0314_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM09 }, + [ITEM_TM10] = { NARC_item_data_0315_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM10 }, + [ITEM_TM11] = { NARC_item_data_0316_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM11 }, + [ITEM_TM12] = { NARC_item_data_0317_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM12 }, + [ITEM_TM13] = { NARC_item_data_0318_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM13 }, + [ITEM_TM14] = { NARC_item_data_0319_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_TM14 }, + [ITEM_TM15] = { NARC_item_data_0320_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM15 }, + [ITEM_TM16] = { NARC_item_data_0321_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM16 }, + [ITEM_TM17] = { NARC_item_data_0322_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM17 }, + [ITEM_TM18] = { NARC_item_data_0323_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_TM18 }, + [ITEM_TM19] = { NARC_item_data_0324_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM19 }, + [ITEM_TM20] = { NARC_item_data_0325_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM20 }, + [ITEM_TM21] = { NARC_item_data_0326_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM21 }, + [ITEM_TM22] = { NARC_item_data_0327_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_TM22 }, + [ITEM_TM23] = { NARC_item_data_0328_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM23 }, + [ITEM_TM24] = { NARC_item_data_0329_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM24 }, + [ITEM_TM25] = { NARC_item_data_0330_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM25 }, + [ITEM_TM26] = { NARC_item_data_0331_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM26 }, + [ITEM_TM27] = { NARC_item_data_0332_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM27 }, + [ITEM_TM28] = { NARC_item_data_0333_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_410_NCLR, AGB_ITEM_TM28 }, + [ITEM_TM29] = { NARC_item_data_0334_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM29 }, + [ITEM_TM30] = { NARC_item_data_0335_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_TM30 }, + [ITEM_TM31] = { NARC_item_data_0336_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_TM31 }, + [ITEM_TM32] = { NARC_item_data_0337_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM32 }, + [ITEM_TM33] = { NARC_item_data_0338_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM33 }, + [ITEM_TM34] = { NARC_item_data_0339_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_TM34 }, + [ITEM_TM35] = { NARC_item_data_0340_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM35 }, + [ITEM_TM36] = { NARC_item_data_0341_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_TM36 }, + [ITEM_TM37] = { NARC_item_data_0342_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM37 }, + [ITEM_TM38] = { NARC_item_data_0343_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM38 }, + [ITEM_TM39] = { NARC_item_data_0344_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_TM39 }, + [ITEM_TM40] = { NARC_item_data_0345_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_TM40 }, + [ITEM_TM41] = { NARC_item_data_0346_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM41 }, + [ITEM_TM42] = { NARC_item_data_0347_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM42 }, + [ITEM_TM43] = { NARC_item_data_0348_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM43 }, + [ITEM_TM44] = { NARC_item_data_0349_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM44 }, + [ITEM_TM45] = { NARC_item_data_0350_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_TM45 }, + [ITEM_TM46] = { NARC_item_data_0351_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM46 }, + [ITEM_TM47] = { NARC_item_data_0352_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_TM47 }, + [ITEM_TM48] = { NARC_item_data_0353_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_TM48 }, + [ITEM_TM49] = { NARC_item_data_0354_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_TM49 }, + [ITEM_TM50] = { NARC_item_data_0355_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_TM50 }, + [ITEM_TM51] = { NARC_item_data_0356_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, + [ITEM_TM52] = { NARC_item_data_0357_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, + [ITEM_TM53] = { NARC_item_data_0358_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, + [ITEM_TM54] = { NARC_item_data_0359_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM55] = { NARC_item_data_0360_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_NONE }, + [ITEM_TM56] = { NARC_item_data_0361_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM57] = { NARC_item_data_0362_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, + [ITEM_TM58] = { NARC_item_data_0363_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM59] = { NARC_item_data_0364_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_399_NCLR, AGB_ITEM_NONE }, + [ITEM_TM60] = { NARC_item_data_0365_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_NONE }, + [ITEM_TM61] = { NARC_item_data_0366_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_406_NCLR, AGB_ITEM_NONE }, + [ITEM_TM62] = { NARC_item_data_0367_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM63] = { NARC_item_data_0368_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM64] = { NARC_item_data_0369_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM65] = { NARC_item_data_0370_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_411_NCLR, AGB_ITEM_NONE }, + [ITEM_TM66] = { NARC_item_data_0371_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM67] = { NARC_item_data_0372_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM68] = { NARC_item_data_0373_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM69] = { NARC_item_data_0374_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM70] = { NARC_item_data_0375_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM71] = { NARC_item_data_0376_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM72] = { NARC_item_data_0377_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_404_NCLR, AGB_ITEM_NONE }, + [ITEM_TM73] = { NARC_item_data_0378_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_409_NCLR, AGB_ITEM_NONE }, + [ITEM_TM74] = { NARC_item_data_0379_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, + [ITEM_TM75] = { NARC_item_data_0380_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM76] = { NARC_item_data_0381_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM77] = { NARC_item_data_0382_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM78] = { NARC_item_data_0383_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM79] = { NARC_item_data_0384_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_407_NCLR, AGB_ITEM_NONE }, + [ITEM_TM80] = { NARC_item_data_0385_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_412_NCLR, AGB_ITEM_NONE }, + [ITEM_TM81] = { NARC_item_data_0386_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM82] = { NARC_item_data_0387_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM83] = { NARC_item_data_0388_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM84] = { NARC_item_data_0389_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_403_NCLR, AGB_ITEM_NONE }, + [ITEM_TM85] = { NARC_item_data_0390_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, + [ITEM_TM86] = { NARC_item_data_0391_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_405_NCLR, AGB_ITEM_NONE }, + [ITEM_TM87] = { NARC_item_data_0392_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM88] = { NARC_item_data_0393_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_NONE }, + [ITEM_TM89] = { NARC_item_data_0394_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_610_NCLR, AGB_ITEM_NONE }, + [ITEM_TM90] = { NARC_item_data_0395_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_NONE }, + [ITEM_TM91] = { NARC_item_data_0396_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_408_NCLR, AGB_ITEM_NONE }, + [ITEM_TM92] = { NARC_item_data_0397_bin, NARC_item_icon_item_icon_397_NCGR, NARC_item_icon_item_icon_401_NCLR, AGB_ITEM_NONE }, + [ITEM_HM01] = { NARC_item_data_0398_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM01 }, + [ITEM_HM02] = { NARC_item_data_0399_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_413_NCLR, AGB_ITEM_HM02 }, + [ITEM_HM03] = { NARC_item_data_0400_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM03 }, + [ITEM_HM04] = { NARC_item_data_0401_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM04 }, + [ITEM_HM05] = { NARC_item_data_0402_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM05 }, + [ITEM_HM06] = { NARC_item_data_0403_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_398_NCLR, AGB_ITEM_HM06 }, + [ITEM_HM07] = { NARC_item_data_0404_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_400_NCLR, AGB_ITEM_HM07 }, + [ITEM_HM08] = { NARC_item_data_0405_bin, NARC_item_icon_item_icon_414_NCGR, NARC_item_icon_item_icon_402_NCLR, AGB_ITEM_HM08 }, + [ITEM_EXPLORER_KIT] = { NARC_item_data_0000_bin, NARC_item_icon_item_icon_793_NCGR, NARC_item_icon_item_icon_794_NCLR, AGB_ITEM_NONE }, + [ITEM_LOOT_SACK] = { NARC_item_data_0406_bin, NARC_item_icon_item_icon_550_NCGR, NARC_item_icon_item_icon_551_NCLR, AGB_ITEM_NONE }, + [ITEM_RULE_BOOK] = { NARC_item_data_0407_bin, NARC_item_icon_item_icon_552_NCGR, NARC_item_icon_item_icon_553_NCLR, AGB_ITEM_NONE }, + [ITEM_POKE_RADAR] = { NARC_item_data_0408_bin, NARC_item_icon_item_icon_697_NCGR, NARC_item_icon_item_icon_698_NCLR, AGB_ITEM_NONE }, + [ITEM_POINT_CARD] = { NARC_item_data_0409_bin, NARC_item_icon_item_icon_681_NCGR, NARC_item_icon_item_icon_682_NCLR, AGB_ITEM_NONE }, + [ITEM_JOURNAL] = { NARC_item_data_0410_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, + [ITEM_SEAL_CASE] = { NARC_item_data_0411_bin, NARC_item_icon_item_icon_671_NCGR, NARC_item_icon_item_icon_672_NCLR, AGB_ITEM_NONE }, + [ITEM_FASHION_CASE] = { NARC_item_data_0412_bin, NARC_item_icon_item_icon_675_NCGR, NARC_item_icon_item_icon_676_NCLR, AGB_ITEM_NONE }, + [ITEM_SEAL_BAG] = { NARC_item_data_0413_bin, NARC_item_icon_item_icon_673_NCGR, NARC_item_icon_item_icon_674_NCLR, AGB_ITEM_NONE }, + [ITEM_PAL_PAD] = { NARC_item_data_0414_bin, NARC_item_icon_item_icon_661_NCGR, NARC_item_icon_item_icon_662_NCLR, AGB_ITEM_NONE }, + [ITEM_WORKS_KEY] = { NARC_item_data_0415_bin, NARC_item_icon_item_icon_644_NCGR, NARC_item_icon_item_icon_645_NCLR, AGB_ITEM_NONE }, + [ITEM_OLD_CHARM] = { NARC_item_data_0416_bin, NARC_item_icon_item_icon_604_NCGR, NARC_item_icon_item_icon_605_NCLR, AGB_ITEM_NONE }, + [ITEM_GALACTIC_KEY] = { NARC_item_data_0417_bin, NARC_item_icon_item_icon_656_NCGR, NARC_item_icon_item_icon_657_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_CHAIN] = { NARC_item_data_0418_bin, NARC_item_icon_item_icon_679_NCGR, NARC_item_icon_item_icon_680_NCLR, AGB_ITEM_NONE }, + [ITEM_TOWN_MAP] = { NARC_item_data_0419_bin, NARC_item_icon_item_icon_439_NCGR, NARC_item_icon_item_icon_440_NCLR, AGB_ITEM_TOWN_MAP }, + [ITEM_VS__SEEKER] = { NARC_item_data_0420_bin, NARC_item_icon_item_icon_441_NCGR, NARC_item_icon_item_icon_442_NCLR, AGB_ITEM_VS_SEEKER }, + [ITEM_COIN_CASE] = { NARC_item_data_0421_bin, NARC_item_icon_item_icon_349_NCGR, NARC_item_icon_item_icon_350_NCLR, AGB_ITEM_COIN_CASE }, + [ITEM_OLD_ROD] = { NARC_item_data_0422_bin, NARC_item_icon_item_icon_353_NCGR, NARC_item_icon_item_icon_354_NCLR, AGB_ITEM_OLD_ROD }, + [ITEM_GOOD_ROD] = { NARC_item_data_0423_bin, NARC_item_icon_item_icon_355_NCGR, NARC_item_icon_item_icon_356_NCLR, AGB_ITEM_GOOD_ROD }, + [ITEM_SUPER_ROD] = { NARC_item_data_0424_bin, NARC_item_icon_item_icon_357_NCGR, NARC_item_icon_item_icon_358_NCLR, AGB_ITEM_SUPER_ROD }, + [ITEM_SPRAYDUCK] = { NARC_item_data_0425_bin, NARC_item_icon_item_icon_363_NCGR, NARC_item_icon_item_icon_364_NCLR, AGB_ITEM_NONE }, + [ITEM_POFFIN_CASE] = { NARC_item_data_0426_bin, NARC_item_icon_item_icon_373_NCGR, NARC_item_icon_item_icon_374_NCLR, AGB_ITEM_NONE }, + [ITEM_BICYCLE] = { NARC_item_data_0427_bin, NARC_item_icon_item_icon_437_NCGR, NARC_item_icon_item_icon_438_NCLR, AGB_ITEM_BICYCLE }, + [ITEM_SUITE_KEY] = { NARC_item_data_0428_bin, NARC_item_icon_item_icon_429_NCGR, NARC_item_icon_item_icon_430_NCLR, AGB_ITEM_NONE }, + [ITEM_OAKS_LETTER] = { NARC_item_data_0429_bin, NARC_item_icon_item_icon_375_NCGR, NARC_item_icon_item_icon_064_NCLR, AGB_ITEM_NONE }, + [ITEM_LUNAR_WING] = { NARC_item_data_0430_bin, NARC_item_icon_item_icon_602_NCGR, NARC_item_icon_item_icon_603_NCLR, AGB_ITEM_NONE }, + [ITEM_MEMBER_CARD] = { NARC_item_data_0431_bin, NARC_item_icon_item_icon_608_NCGR, NARC_item_icon_item_icon_609_NCLR, AGB_ITEM_NONE }, + [ITEM_AZURE_FLUTE] = { NARC_item_data_0432_bin, NARC_item_icon_item_icon_677_NCGR, NARC_item_icon_item_icon_678_NCLR, AGB_ITEM_NONE }, + [ITEM_S_S__TICKET] = { NARC_item_data_0433_bin, NARC_item_icon_item_icon_359_NCGR, NARC_item_icon_item_icon_360_NCLR, AGB_ITEM_SS_TICKET }, + [ITEM_CONTEST_PASS] = { NARC_item_data_0434_bin, NARC_item_icon_item_icon_361_NCGR, NARC_item_icon_item_icon_362_NCLR, AGB_ITEM_CONTEST_PASS }, + [ITEM_MAGMA_STONE] = { NARC_item_data_0435_bin, NARC_item_icon_item_icon_596_NCGR, NARC_item_icon_item_icon_597_NCLR, AGB_ITEM_NONE }, + [ITEM_PARCEL] = { NARC_item_data_0436_bin, NARC_item_icon_item_icon_415_NCGR, NARC_item_icon_item_icon_416_NCLR, AGB_ITEM_OAKS_PARCEL }, + [ITEM_COUPON_1] = { NARC_item_data_0437_bin, NARC_item_icon_item_icon_417_NCGR, NARC_item_icon_item_icon_418_NCLR, AGB_ITEM_NONE }, + [ITEM_COUPON_2] = { NARC_item_data_0438_bin, NARC_item_icon_item_icon_419_NCGR, NARC_item_icon_item_icon_420_NCLR, AGB_ITEM_NONE }, + [ITEM_COUPON_3] = { NARC_item_data_0439_bin, NARC_item_icon_item_icon_421_NCGR, NARC_item_icon_item_icon_422_NCLR, AGB_ITEM_NONE }, + [ITEM_STORAGE_KEY] = { NARC_item_data_0440_bin, NARC_item_icon_item_icon_598_NCGR, NARC_item_icon_item_icon_599_NCLR, AGB_ITEM_STORAGE_KEY }, + [ITEM_SECRETPOTION] = { NARC_item_data_0441_bin, NARC_item_icon_item_icon_600_NCGR, NARC_item_icon_item_icon_601_NCLR, AGB_ITEM_NONE }, + [ITEM_VS__RECORDER] = { NARC_item_data_0442_bin, NARC_item_icon_item_icon_701_NCGR, NARC_item_icon_item_icon_702_NCLR, AGB_ITEM_NONE }, + [ITEM_GRACIDEA] = { NARC_item_data_0443_bin, NARC_item_icon_item_icon_703_NCGR, NARC_item_icon_item_icon_704_NCLR, AGB_ITEM_NONE }, + [ITEM_SECRET_KEY] = { NARC_item_data_0444_bin, NARC_item_icon_item_icon_705_NCGR, NARC_item_icon_item_icon_706_NCLR, AGB_ITEM_SECRET_KEY }, + [ITEM_APRICORN_BOX] = { NARC_item_data_0445_bin, NARC_item_icon_item_icon_709_NCGR, NARC_item_icon_item_icon_710_NCLR, AGB_ITEM_NONE }, + [ITEM_UNOWN_REPORT] = { NARC_item_data_0446_bin, NARC_item_icon_item_icon_759_NCGR, NARC_item_icon_item_icon_760_NCLR, AGB_ITEM_NONE }, + [ITEM_BERRY_POTS] = { NARC_item_data_0447_bin, NARC_item_icon_item_icon_711_NCGR, NARC_item_icon_item_icon_712_NCLR, AGB_ITEM_NONE }, + [ITEM_DOWSING_MCHN] = { NARC_item_data_0448_bin, NARC_item_icon_item_icon_747_NCGR, NARC_item_icon_item_icon_748_NCLR, AGB_ITEM_ITEMFINDER }, + [ITEM_BLUE_CARD] = { NARC_item_data_0449_bin, NARC_item_icon_item_icon_761_NCGR, NARC_item_icon_item_icon_762_NCLR, AGB_ITEM_NONE }, + [ITEM_SLOWPOKETAIL] = { NARC_item_data_0450_bin, NARC_item_icon_item_icon_763_NCGR, NARC_item_icon_item_icon_764_NCLR, AGB_ITEM_NONE }, + [ITEM_CLEAR_BELL] = { NARC_item_data_0451_bin, NARC_item_icon_item_icon_765_NCGR, NARC_item_icon_item_icon_766_NCLR, AGB_ITEM_NONE }, + [ITEM_CARD_KEY] = { NARC_item_data_0452_bin, NARC_item_icon_item_icon_767_NCGR, NARC_item_icon_item_icon_768_NCLR, AGB_ITEM_CARD_KEY }, + [ITEM_BASEMENT_KEY] = { NARC_item_data_0453_bin, NARC_item_icon_item_icon_769_NCGR, NARC_item_icon_item_icon_770_NCLR, AGB_ITEM_BASEMENT_KEY }, + [ITEM_SQUIRTBOTTLE] = { NARC_item_data_0454_bin, NARC_item_icon_item_icon_713_NCGR, NARC_item_icon_item_icon_714_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_SCALE] = { NARC_item_data_0455_bin, NARC_item_icon_item_icon_771_NCGR, NARC_item_icon_item_icon_772_NCLR, AGB_ITEM_NONE }, + [ITEM_LOST_ITEM] = { NARC_item_data_0456_bin, NARC_item_icon_item_icon_773_NCGR, NARC_item_icon_item_icon_774_NCLR, AGB_ITEM_NONE }, + [ITEM_PASS] = { NARC_item_data_0457_bin, NARC_item_icon_item_icon_775_NCGR, NARC_item_icon_item_icon_776_NCLR, AGB_ITEM_NONE }, + [ITEM_MACHINE_PART] = { NARC_item_data_0458_bin, NARC_item_icon_item_icon_777_NCGR, NARC_item_icon_item_icon_778_NCLR, AGB_ITEM_NONE }, + [ITEM_SILVER_WING] = { NARC_item_data_0459_bin, NARC_item_icon_item_icon_779_NCGR, NARC_item_icon_item_icon_780_NCLR, AGB_ITEM_NONE }, + [ITEM_RAINBOW_WING] = { NARC_item_data_0460_bin, NARC_item_icon_item_icon_781_NCGR, NARC_item_icon_item_icon_782_NCLR, AGB_ITEM_NONE }, + [ITEM_MYSTERY_EGG] = { NARC_item_data_0461_bin, NARC_item_icon_item_icon_783_NCGR, NARC_item_icon_item_icon_784_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_APRICORN] = { NARC_item_data_0462_bin, NARC_item_icon_item_icon_733_NCGR, NARC_item_icon_item_icon_734_NCLR, AGB_ITEM_NONE }, + [ITEM_YLW_APRICORN] = { NARC_item_data_0463_bin, NARC_item_icon_item_icon_737_NCGR, NARC_item_icon_item_icon_738_NCLR, AGB_ITEM_NONE }, + [ITEM_BLU_APRICORN] = { NARC_item_data_0464_bin, NARC_item_icon_item_icon_735_NCGR, NARC_item_icon_item_icon_736_NCLR, AGB_ITEM_NONE }, + [ITEM_GRN_APRICORN] = { NARC_item_data_0465_bin, NARC_item_icon_item_icon_739_NCGR, NARC_item_icon_item_icon_740_NCLR, AGB_ITEM_NONE }, + [ITEM_PNK_APRICORN] = { NARC_item_data_0466_bin, NARC_item_icon_item_icon_741_NCGR, NARC_item_icon_item_icon_742_NCLR, AGB_ITEM_NONE }, + [ITEM_WHT_APRICORN] = { NARC_item_data_0467_bin, NARC_item_icon_item_icon_743_NCGR, NARC_item_icon_item_icon_744_NCLR, AGB_ITEM_NONE }, + [ITEM_BLK_APRICORN] = { NARC_item_data_0468_bin, NARC_item_icon_item_icon_745_NCGR, NARC_item_icon_item_icon_746_NCLR, AGB_ITEM_NONE }, + [ITEM_FAST_BALL] = { NARC_item_data_0469_bin, NARC_item_icon_item_icon_723_NCGR, NARC_item_icon_item_icon_724_NCLR, AGB_ITEM_NONE }, + [ITEM_LEVEL_BALL] = { NARC_item_data_0470_bin, NARC_item_icon_item_icon_717_NCGR, NARC_item_icon_item_icon_718_NCLR, AGB_ITEM_NONE }, + [ITEM_LURE_BALL] = { NARC_item_data_0471_bin, NARC_item_icon_item_icon_715_NCGR, NARC_item_icon_item_icon_716_NCLR, AGB_ITEM_NONE }, + [ITEM_HEAVY_BALL] = { NARC_item_data_0472_bin, NARC_item_icon_item_icon_721_NCGR, NARC_item_icon_item_icon_722_NCLR, AGB_ITEM_NONE }, + [ITEM_LOVE_BALL] = { NARC_item_data_0473_bin, NARC_item_icon_item_icon_727_NCGR, NARC_item_icon_item_icon_728_NCLR, AGB_ITEM_NONE }, + [ITEM_FRIEND_BALL] = { NARC_item_data_0474_bin, NARC_item_icon_item_icon_725_NCGR, NARC_item_icon_item_icon_726_NCLR, AGB_ITEM_NONE }, + [ITEM_MOON_BALL] = { NARC_item_data_0475_bin, NARC_item_icon_item_icon_719_NCGR, NARC_item_icon_item_icon_720_NCLR, AGB_ITEM_NONE }, + [ITEM_SPORT_BALL] = { NARC_item_data_0476_bin, NARC_item_icon_item_icon_731_NCGR, NARC_item_icon_item_icon_732_NCLR, AGB_ITEM_NONE }, + [ITEM_PARK_BALL] = { NARC_item_data_0477_bin, NARC_item_icon_item_icon_729_NCGR, NARC_item_icon_item_icon_730_NCLR, AGB_ITEM_NONE }, + [ITEM_PHOTO_ALBUM] = { NARC_item_data_0478_bin, NARC_item_icon_item_icon_606_NCGR, NARC_item_icon_item_icon_607_NCLR, AGB_ITEM_NONE }, + [ITEM_GB_SOUNDS] = { NARC_item_data_0479_bin, NARC_item_icon_item_icon_785_NCGR, NARC_item_icon_item_icon_786_NCLR, AGB_ITEM_NONE }, + [ITEM_TIDAL_BELL] = { NARC_item_data_0480_bin, NARC_item_icon_item_icon_787_NCGR, NARC_item_icon_item_icon_788_NCLR, AGB_ITEM_NONE }, + [ITEM_RAGECANDYBAR] = { NARC_item_data_0481_bin, NARC_item_icon_item_icon_749_NCGR, NARC_item_icon_item_icon_750_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_01] = { NARC_item_data_0482_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_02] = { NARC_item_data_0483_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_03] = { NARC_item_data_0484_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_04] = { NARC_item_data_0485_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_05] = { NARC_item_data_0486_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_06] = { NARC_item_data_0487_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_07] = { NARC_item_data_0488_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_08] = { NARC_item_data_0489_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_09] = { NARC_item_data_0490_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_10] = { NARC_item_data_0491_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_11] = { NARC_item_data_0492_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_12] = { NARC_item_data_0493_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_13] = { NARC_item_data_0494_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_14] = { NARC_item_data_0495_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_15] = { NARC_item_data_0496_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_16] = { NARC_item_data_0497_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_17] = { NARC_item_data_0498_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_18] = { NARC_item_data_0499_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_19] = { NARC_item_data_0500_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_20] = { NARC_item_data_0501_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_21] = { NARC_item_data_0502_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_22] = { NARC_item_data_0503_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_23] = { NARC_item_data_0504_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_24] = { NARC_item_data_0505_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_25] = { NARC_item_data_0506_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_26] = { NARC_item_data_0507_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_DATA_CARD_27] = { NARC_item_data_0508_bin, NARC_item_icon_item_icon_789_NCGR, NARC_item_icon_item_icon_790_NCLR, AGB_ITEM_NONE }, + [ITEM_JADE_ORB] = { NARC_item_data_0509_bin, NARC_item_icon_item_icon_755_NCGR, NARC_item_icon_item_icon_756_NCLR, AGB_ITEM_NONE }, + [ITEM_LOCK_CAPSULE] = { NARC_item_data_0510_bin, NARC_item_icon_item_icon_791_NCGR, NARC_item_icon_item_icon_792_NCLR, AGB_ITEM_NONE }, + [ITEM_RED_ORB] = { NARC_item_data_0511_bin, NARC_item_icon_item_icon_751_NCGR, NARC_item_icon_item_icon_752_NCLR, AGB_ITEM_RED_ORB }, + [ITEM_BLUE_ORB] = { NARC_item_data_0512_bin, NARC_item_icon_item_icon_753_NCGR, NARC_item_icon_item_icon_754_NCLR, AGB_ITEM_BLUE_ORB }, + [ITEM_ENIGMA_STONE] = { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, }; void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, HeapID heapId) { diff --git a/src/mail.c b/src/mail.c index eff7985e04..107a4a756d 100644 --- a/src/mail.c +++ b/src/mail.c @@ -27,13 +27,13 @@ struct UnkStruct_020F67A4 { }; static const struct UnkStruct_020F67A4 sFormOverrides[] = { - {0x1EE, 0x21C, SPECIES_GIRATINA, GIRATINA_ORIGIN}, - { 0x1F3, 0x21D, SPECIES_SHAYMIN, SHAYMIN_SKY }, - { 0x1E6, 0x21E, SPECIES_ROTOM, ROTOM_HEAT }, - { 0x1E6, 0x21F, SPECIES_ROTOM, ROTOM_WASH }, - { 0x1E6, 0x220, SPECIES_ROTOM, ROTOM_FROST }, - { 0x1E6, 0x221, SPECIES_ROTOM, ROTOM_FAN }, - { 0x1E6, 0x222, SPECIES_ROTOM, ROTOM_MOW }, + { 0x1EE, 0x21C, SPECIES_GIRATINA, GIRATINA_ORIGIN }, + { 0x1F3, 0x21D, SPECIES_SHAYMIN, SHAYMIN_SKY }, + { 0x1E6, 0x21E, SPECIES_ROTOM, ROTOM_HEAT }, + { 0x1E6, 0x21F, SPECIES_ROTOM, ROTOM_WASH }, + { 0x1E6, 0x220, SPECIES_ROTOM, ROTOM_FROST }, + { 0x1E6, 0x221, SPECIES_ROTOM, ROTOM_FAN }, + { 0x1E6, 0x222, SPECIES_ROTOM, ROTOM_MOW }, }; int MailArray_GetFirstEmptySlotIdx(Mail *msgs, int nmsg); diff --git a/src/map_preview_graphic.c b/src/map_preview_graphic.c index 9113019a42..e1a884cb2d 100644 --- a/src/map_preview_graphic.c +++ b/src/map_preview_graphic.c @@ -54,7 +54,7 @@ typedef struct UnkStruct_0206A388 { } UnkStruct_0206A388; static MapPreviewGraphicData sMapPreviewGraphicData[] = { - // Dark Cave, North Side + // Dark Cave, North Side { .mapId = MAP_D42R0101, .unused4 = 0, @@ -82,7 +82,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 0, }, - // Dark Cave, South Side + // Dark Cave, South Side { .mapId = MAP_D42R0102, .unused4 = 0, @@ -110,7 +110,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 0, }, - // Sprout Tower + // Sprout Tower { .mapId = MAP_D15R0101, .unused4 = 0, @@ -138,7 +138,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 1, }, - // Ruins of Alph 1 + // Ruins of Alph 1 { .mapId = MAP_D24R0211, .unused4 = 0, @@ -166,7 +166,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 2, }, - // Ruins of Alph 2 + // Ruins of Alph 2 { .mapId = MAP_D24R0217, .unused4 = 0, @@ -194,7 +194,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 2, }, - // Union Cave + // Union Cave { .mapId = MAP_D25R0101, .unused4 = 0, @@ -222,7 +222,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 3, }, - // Slowpoke Well + // Slowpoke Well { .mapId = MAP_D26R0101, .unused4 = 0, @@ -250,7 +250,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 4, }, - // Ilex Forest + // Ilex Forest { .mapId = MAP_D36R0101, .unused4 = 0, @@ -278,7 +278,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 5, }, - // National Park + // National Park { .mapId = MAP_D22R0101, .unused4 = 0, @@ -306,7 +306,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 6, }, - // Burned Tower + // Burned Tower { .mapId = MAP_D18R0101, .unused4 = 0, @@ -334,7 +334,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 7, }, - // Bell Tower + // Bell Tower { .mapId = MAP_D17R0101, .unused4 = 0, @@ -362,7 +362,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 8, }, - // Whirl Islands + // Whirl Islands { .mapId = MAP_D40R0101, .unused4 = 0, @@ -390,7 +390,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 9, }, - // Mt Mortar + // Mt Mortar { .mapId = MAP_D38R0101, .unused4 = 0, @@ -418,7 +418,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 11, }, - // Ice Path + // Ice Path { .mapId = MAP_D39R0101, .unused4 = 0, @@ -446,7 +446,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 12, }, - // Dragon's Den + // Dragon's Den { .mapId = MAP_D44R0101, .unused4 = 0, @@ -474,7 +474,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 13, }, - // Tohjo Falls + // Tohjo Falls { .mapId = MAP_D45R0101, .unused4 = 0, @@ -502,7 +502,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 14, }, - // Victory Road South + // Victory Road South { .mapId = MAP_D43R0101, .unused4 = 0, @@ -530,7 +530,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 15, }, - // Victory Road North + // Victory Road North { .mapId = MAP_D43R0103, .unused4 = 0, @@ -558,7 +558,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 15, }, - // Viridian Forest + // Viridian Forest { .mapId = MAP_D46R0101, .unused4 = 0, @@ -586,7 +586,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 16, }, - // Diglett Cave + // Diglett Cave { .mapId = MAP_D01R0101, .unused4 = 0, @@ -614,7 +614,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 17, }, - // Rock Tunnel + // Rock Tunnel { .mapId = MAP_D05R0101, .unused4 = 0, @@ -642,7 +642,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 18, }, - // Mt Moon + // Mt Moon { .mapId = MAP_D02R0101, .unused4 = 0, @@ -670,7 +670,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 20, }, - // Seafoam Islands + // Seafoam Islands { .mapId = MAP_D11R0101, .unused4 = 0, @@ -698,7 +698,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 21, }, - // Mt Silver + // Mt Silver { .mapId = MAP_D41R0101, .unused4 = 0, @@ -726,7 +726,7 @@ static MapPreviewGraphicData sMapPreviewGraphicData[] = { }, .unused3C = 22, }, - // Cerulean Cave + // Cerulean Cave { .mapId = MAP_D03R0101, .unused4 = 0, diff --git a/src/message_printer.c b/src/message_printer.c index e48be73576..f51ba5c3e6 100644 --- a/src/message_printer.c +++ b/src/message_printer.c @@ -6,13 +6,13 @@ #include "gf_gfx_loader.h" static const u16 _020F5C24[][2] = { - {0x0140, 0x0008}, - { 0x0160, 0x0010}, - { 0x01A0, 0x0010}, - { 0x01E0, 0x0010}, - { 0x0220, 0x0010}, - { 0x0260, 0x0010}, - { 0x02A0, 0x0010}, + { 0x0140, 0x0008 }, + { 0x0160, 0x0010 }, + { 0x01A0, 0x0010 }, + { 0x01E0, 0x0010 }, + { 0x0220, 0x0010 }, + { 0x0260, 0x0010 }, + { 0x02A0, 0x0010 }, }; MessagePrinter *MessagePrinter_New(u32 foreground, u32 shadow, u32 background, HeapID heapId) { diff --git a/src/oaks_speech.c b/src/oaks_speech.c index 7b3e140e04..4926a9ba30 100644 --- a/src/oaks_speech.c +++ b/src/oaks_speech.c @@ -494,49 +494,49 @@ static const int sMultichoiceMenuParam[][4] = { }; static const int sBgPicNCGR_NCLR[10][2] = { - // undefined + // undefined { }, - // Oak + // Oak { NARC_intro_intro_00000010_NCGR, NARC_intro_intro_00000011_NCLR, }, - // Ethan 1 + // Ethan 1 { NARC_intro_intro_00000012_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 2 + // Ethan 2 { NARC_intro_intro_00000013_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 3 + // Ethan 3 { NARC_intro_intro_00000014_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Ethan 4 + // Ethan 4 { NARC_intro_intro_00000015_NCGR, NARC_intro_intro_00000016_NCLR, }, - // Lyra 1 + // Lyra 1 { NARC_intro_intro_00000017_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 2 + // Lyra 2 { NARC_intro_intro_00000018_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 3 + // Lyra 3 { NARC_intro_intro_00000019_NCGR, NARC_intro_intro_00000021_NCLR, }, - // Lyra 4 + // Lyra 4 { NARC_intro_intro_00000020_NCGR, NARC_intro_intro_00000021_NCLR, diff --git a/src/options_app.c b/src/options_app.c index 6d4cabd970..ed1397a812 100644 --- a/src/options_app.c +++ b/src/options_app.c @@ -118,21 +118,21 @@ static const int sMenuEntryBorderYCoords[MENU_ENTRY_COUNT] = { }; static const u16 sOptionChoiceLabelXCoords[MENU_ENTRY_COUNT][3] = { - {124, 172, 220}, - { 124, 172, 0 }, - { 132, 212, 0 }, - { 132, 212, 0 }, - { 132, 212, 0 }, - { 172, 0, 0 }, - { 0, 0, 0 }, + { 124, 172, 220 }, + { 124, 172, 0 }, + { 132, 212, 0 }, + { 132, 212, 0 }, + { 132, 212, 0 }, + { 172, 0, 0 }, + { 0, 0, 0 }, }; static const int sActiveButtonXCoords[5][3] = { - {112, 160, 208}, - { 112, 160, 208}, - { 112, 192, 0 }, - { 112, 192, 0 }, - { 112, 192, 0 }, + { 112, 160, 208 }, + { 112, 160, 208 }, + { 112, 192, 0 }, + { 112, 192, 0 }, + { 112, 192, 0 }, }; static const TouchscreenHitbox sOptionsAppTouchscreenHitboxes[16] = { @@ -155,21 +155,21 @@ static const TouchscreenHitbox sOptionsAppTouchscreenHitboxes[16] = { }; static const u32 ov54_021E6DA8[15][2] = { - {MENU_ENTRY_TEXT_SPEED, 0}, - { MENU_ENTRY_TEXT_SPEED, 1}, - { MENU_ENTRY_TEXT_SPEED, 2}, - { MENU_ENTRY_BATTLE_SCENE, 0}, - { MENU_ENTRY_BATTLE_SCENE, 1}, - { MENU_ENTRY_BATTLE_STYLE, 0}, - { MENU_ENTRY_BATTLE_STYLE, 1}, - { MENU_ENTRY_SOUND_METHOD, 0}, - { MENU_ENTRY_SOUND_METHOD, 1}, - { MENU_ENTRY_BUTTON_MODE, 0}, - { MENU_ENTRY_BUTTON_MODE, 1}, - { MENU_ENTRY_FRAME, 3}, - { MENU_ENTRY_FRAME, 4}, - { MENU_ENTRY_6, 5}, - { MENU_ENTRY_6, 6}, + { MENU_ENTRY_TEXT_SPEED, 0 }, + { MENU_ENTRY_TEXT_SPEED, 1 }, + { MENU_ENTRY_TEXT_SPEED, 2 }, + { MENU_ENTRY_BATTLE_SCENE, 0 }, + { MENU_ENTRY_BATTLE_SCENE, 1 }, + { MENU_ENTRY_BATTLE_STYLE, 0 }, + { MENU_ENTRY_BATTLE_STYLE, 1 }, + { MENU_ENTRY_SOUND_METHOD, 0 }, + { MENU_ENTRY_SOUND_METHOD, 1 }, + { MENU_ENTRY_BUTTON_MODE, 0 }, + { MENU_ENTRY_BUTTON_MODE, 1 }, + { MENU_ENTRY_FRAME, 3 }, + { MENU_ENTRY_FRAME, 4 }, + { MENU_ENTRY_6, 5 }, + { MENU_ENTRY_6, 6 }, }; static const UnkStruct_0200D2B4 ov54_021E6EAC[9] = { diff --git a/src/overlay_25.c b/src/overlay_25.c index 5bf13bd11a..0311334141 100644 --- a/src/overlay_25.c +++ b/src/overlay_25.c @@ -36,40 +36,40 @@ static const MailMessageTemplate TrainerHouse_DefaultLoseMessage = { .msg_bank = MAILMSG_BANK_0292_GMM, .msg_no = msg_0292_00000, - .ec_groups = {EC_GROUP_GREETINGS, EC_GROUP_NONE}, - .ec_words = { msg_0287_thanks, 0 }, + .ec_groups = { EC_GROUP_GREETINGS, EC_GROUP_NONE }, + .ec_words = { msg_0287_thanks, 0 }, }; static const MailMessageTemplate TrainerHouse_DefaultWinMessage = { .msg_bank = MAILMSG_BANK_0296_GMM, .msg_no = msg_0296_00007, - .ec_groups = {EC_GROUP_TRAINER, EC_GROUP_NONE}, - .ec_words = { msg_0285_victory, 0 }, + .ec_groups = { EC_GROUP_TRAINER, EC_GROUP_NONE }, + .ec_words = { msg_0285_victory, 0 }, }; static const MailMessageTemplate TrainerHouse_DefaultIntroMessage = { .msg_bank = MAILMSG_BANK_0294_GMM, .msg_no = msg_0294_00003, - .ec_groups = {EC_GROUP_TRAINER, EC_GROUP_NONE}, - .ec_words = { msg_0285_match, 0 }, + .ec_groups = { EC_GROUP_TRAINER, EC_GROUP_NONE }, + .ec_words = { msg_0285_match, 0 }, }; #define DUMMY_TRAINER_HOUSE_MON \ { \ .language = GAME_LANGUAGE, \ .nickname = { \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - }, \ - } + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + EOS, \ + }, \ +} static const TrainerHouseSet ov25_02259D9C = { .trainer = { diff --git a/src/overlay_26_022598C0.c b/src/overlay_26_022598C0.c index 2a5a6512c5..a84e3d7103 100644 --- a/src/overlay_26_022598C0.c +++ b/src/overlay_26_022598C0.c @@ -10,69 +10,69 @@ static u16 GetPreviousRematchIndexForTrainer(u32 rematch_set_no, u16 rematch_no) static u16 GetRematchTrainerIdByIndexPair(u16 rematch_set_no, u32 rematch_no); static const u16 sTrainerRematchSets[][6] = { - {TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE, TRAINER_BIRD_KEEPER_GS_JOSE_3, TRAINER_BIRD_KEEPER_GS_JOSE_4, TRAINER_NONE}, - { TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN_2, TRAINER_PICNICKER_ERIN_3, TRAINER_PICNICKER_ERIN_4, TRAINER_NONE}, - { TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ_2, TRAINER_PICNICKER_LIZ_3, TRAINER_PICNICKER_LIZ_4, TRAINER_NONE}, - { TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD_2, TRAINER_SCHOOL_KID_M_CHAD_3, TRAINER_SCHOOL_KID_M_CHAD_4, TRAINER_NONE}, - { TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY_2, TRAINER_SAILOR_HUEY_3, TRAINER_SAILOR_HUEY_4, TRAINER_NONE}, - { TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE_3, TRAINER_BUG_CATCHER_WADE_2, TRAINER_BUG_CATCHER_WADE_4, TRAINER_NONE}, - { TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY_2, TRAINER_YOUNGSTER_JOEY_3, TRAINER_YOUNGSTER_JOEY_4, TRAINER_NONE}, - { TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK_2, TRAINER_SCHOOL_KID_M_JACK_3, TRAINER_SCHOOL_KID_M_JACK_4, TRAINER_NONE}, - { TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN_2, TRAINER_ACE_TRAINER_M_GAVEN_3, TRAINER_ACE_TRAINER_M_GAVEN_4, TRAINER_NONE}, - { TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI_2, TRAINER_BLACK_BELT_KENJI_3, TRAINER_BLACK_BELT_KENJI_4, TRAINER_NONE}, - { TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY_2, TRAINER_HIKER_PARRY_3, TRAINER_HIKER_PARRY_4, TRAINER_NONE}, - { TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY_2, TRAINER_PICNICKER_TIFFANY_3, TRAINER_PICNICKER_TIFFANY_4, TRAINER_NONE}, - { TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY_2, TRAINER_HIKER_ANTHONY_3, TRAINER_HIKER_ANTHONY_4, TRAINER_NONE}, - { TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA_2, TRAINER_ACE_TRAINER_F_REENA_3, TRAINER_ACE_TRAINER_F_REENA_4, TRAINER_NONE}, - { TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON_2, TRAINER_FISHERMAN_WILTON_3, TRAINER_FISHERMAN_WILTON_4, TRAINER_NONE}, - { TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE_2, TRAINER_ACE_TRAINER_F_JAMIE_3, TRAINER_ACE_TRAINER_F_JAMIE_4, TRAINER_NONE}, - { TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN_2, TRAINER_JUGGLER_IRWIN_3, TRAINER_JUGGLER_IRWIN_4, TRAINER_NONE}, - { TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT_2, TRAINER_POKE_MANIAC_BRENT_3, TRAINER_POKE_MANIAC_BRENT_4, TRAINER_NONE}, - { TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN_2, TRAINER_SCHOOL_KID_M_ALAN_3, TRAINER_SCHOOL_KID_M_ALAN_4, TRAINER_NONE}, - { TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK_2, TRAINER_POKEFAN_M_DEREK_3, TRAINER_POKEFAN_M_DEREK_4, TRAINER_NONE}, - { TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA_2, TRAINER_PICNICKER_GINA_3, TRAINER_PICNICKER_GINA_4, TRAINER_NONE}, - { TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY_2, TRAINER_FISHERMAN_TULLY_3, TRAINER_FISHERMAN_TULLY_4, TRAINER_NONE}, - { TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY_2, TRAINER_POKEFAN_BEVERLY_3, TRAINER_POKEFAN_BEVERLY_4, TRAINER_NONE}, - { TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE_2, TRAINER_BIRD_KEEPER_GS_VANCE_3, TRAINER_BIRD_KEEPER_GS_VANCE_4, TRAINER_NONE}, - { TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH_2, TRAINER_FISHERMAN_RALPH_3, TRAINER_FISHERMAN_RALPH_4, TRAINER_NONE}, - { TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD_2, TRAINER_CAMPER_TODD_3, TRAINER_CAMPER_TODD_4, TRAINER_NONE}, - { TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE_2, TRAINER_BUG_CATCHER_ARNIE_3, TRAINER_BUG_CATCHER_ARNIE_4, TRAINER_NONE}, - { TRAINER_LASS_DANA, TRAINER_LASS_DANA, TRAINER_LASS_DANA_2, TRAINER_LASS_DANA_3, TRAINER_LASS_DANA_4, TRAINER_NONE}, - { TRAINER_LASS_KRISE, TRAINER_LASS_KRISE, TRAINER_LASS_KRISE_2, TRAINER_LASS_KRISE_3, TRAINER_LASS_KRISE_4, TRAINER_NONE}, - { TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN_2, TRAINER_YOUNGSTER_IAN_3, TRAINER_YOUNGSTER_IAN_4, TRAINER_NONE}, - { TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT_2, TRAINER_FIREBREATHER_WALT_3, TRAINER_FIREBREATHER_WALT_4, TRAINER_NONE}, - { TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG_2, TRAINER_BUG_CATCHER_DOUG_3, TRAINER_BUG_CATCHER_DOUG_4, TRAINER_NONE}, - { TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB_2, TRAINER_BUG_CATCHER_ROB_3, TRAINER_BUG_CATCHER_ROB_4, TRAINER_NONE}, - { TRAINER_BIKER_REESE, TRAINER_BIKER_REESE, TRAINER_BIKER_REESE_2, TRAINER_BIKER_REESE_3, TRAINER_BIKER_REESE_4, TRAINER_NONE}, - { TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN_2, TRAINER_BIKER_AIDEN_3, TRAINER_BIKER_AIDEN_4, TRAINER_NONE}, - { TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST_2, TRAINER_BIKER_ERNEST_3, TRAINER_BIKER_ERNEST_4, TRAINER_NONE}, - { TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY_2, TRAINER_TEACHER_HILLARY_3, TRAINER_TEACHER_HILLARY_4, TRAINER_NONE}, - { TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY_2, TRAINER_SCHOOL_KID_M_BILLY_3, TRAINER_SCHOOL_KID_M_BILLY_4, TRAINER_NONE}, - { TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA_2, TRAINER_TWINS_KAY_AND_TIA_3, TRAINER_TWINS_KAY_AND_TIA_4, TRAINER_NONE}, - { TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH_2, TRAINER_BIRD_KEEPER_GS_JOSH_3, TRAINER_BIRD_KEEPER_GS_JOSH_4, TRAINER_NONE}, - { TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN_2, TRAINER_SCHOOL_KID_M_TORIN_3, TRAINER_SCHOOL_KID_M_TORIN_4, TRAINER_NONE}, - { TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_2, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_3, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_4, TRAINER_NONE}, - { TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY_2, TRAINER_HIKER_KENNY_3, TRAINER_HIKER_KENNY_4, TRAINER_NONE}, - { TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER_2, TRAINER_CAMPER_TANNER_3, TRAINER_CAMPER_TANNER_4, TRAINER_NONE}, - { TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE_2, TRAINER_FISHERMAN_KYLE_3, TRAINER_FISHERMAN_KYLE_4, TRAINER_NONE}, - { TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER_2, TRAINER_FISHERMAN_KYLER_3, TRAINER_FISHERMAN_KYLER_4, TRAINER_NONE}, - { TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED_2, TRAINER_GENTLEMAN_ALFRED_3, TRAINER_GENTLEMAN_ALFRED_4, TRAINER_NONE}, - { TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, - { TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE}, + { TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE_2, TRAINER_BIRD_KEEPER_GS_JOSE, TRAINER_BIRD_KEEPER_GS_JOSE_3, TRAINER_BIRD_KEEPER_GS_JOSE_4, TRAINER_NONE }, + { TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN, TRAINER_PICNICKER_ERIN_2, TRAINER_PICNICKER_ERIN_3, TRAINER_PICNICKER_ERIN_4, TRAINER_NONE }, + { TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ, TRAINER_PICNICKER_LIZ_2, TRAINER_PICNICKER_LIZ_3, TRAINER_PICNICKER_LIZ_4, TRAINER_NONE }, + { TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD, TRAINER_SCHOOL_KID_M_CHAD_2, TRAINER_SCHOOL_KID_M_CHAD_3, TRAINER_SCHOOL_KID_M_CHAD_4, TRAINER_NONE }, + { TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY, TRAINER_SAILOR_HUEY_2, TRAINER_SAILOR_HUEY_3, TRAINER_SAILOR_HUEY_4, TRAINER_NONE }, + { TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE, TRAINER_BUG_CATCHER_WADE_3, TRAINER_BUG_CATCHER_WADE_2, TRAINER_BUG_CATCHER_WADE_4, TRAINER_NONE }, + { TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY_2, TRAINER_YOUNGSTER_JOEY_3, TRAINER_YOUNGSTER_JOEY_4, TRAINER_NONE }, + { TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK, TRAINER_SCHOOL_KID_M_JACK_2, TRAINER_SCHOOL_KID_M_JACK_3, TRAINER_SCHOOL_KID_M_JACK_4, TRAINER_NONE }, + { TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN, TRAINER_ACE_TRAINER_M_GAVEN_2, TRAINER_ACE_TRAINER_M_GAVEN_3, TRAINER_ACE_TRAINER_M_GAVEN_4, TRAINER_NONE }, + { TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI, TRAINER_BLACK_BELT_KENJI_2, TRAINER_BLACK_BELT_KENJI_3, TRAINER_BLACK_BELT_KENJI_4, TRAINER_NONE }, + { TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY, TRAINER_HIKER_PARRY_2, TRAINER_HIKER_PARRY_3, TRAINER_HIKER_PARRY_4, TRAINER_NONE }, + { TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY, TRAINER_PICNICKER_TIFFANY_2, TRAINER_PICNICKER_TIFFANY_3, TRAINER_PICNICKER_TIFFANY_4, TRAINER_NONE }, + { TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY, TRAINER_HIKER_ANTHONY_2, TRAINER_HIKER_ANTHONY_3, TRAINER_HIKER_ANTHONY_4, TRAINER_NONE }, + { TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA, TRAINER_ACE_TRAINER_F_REENA_2, TRAINER_ACE_TRAINER_F_REENA_3, TRAINER_ACE_TRAINER_F_REENA_4, TRAINER_NONE }, + { TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON, TRAINER_FISHERMAN_WILTON_2, TRAINER_FISHERMAN_WILTON_3, TRAINER_FISHERMAN_WILTON_4, TRAINER_NONE }, + { TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE, TRAINER_ACE_TRAINER_F_JAMIE_2, TRAINER_ACE_TRAINER_F_JAMIE_3, TRAINER_ACE_TRAINER_F_JAMIE_4, TRAINER_NONE }, + { TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN, TRAINER_JUGGLER_IRWIN_2, TRAINER_JUGGLER_IRWIN_3, TRAINER_JUGGLER_IRWIN_4, TRAINER_NONE }, + { TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT, TRAINER_POKE_MANIAC_BRENT_2, TRAINER_POKE_MANIAC_BRENT_3, TRAINER_POKE_MANIAC_BRENT_4, TRAINER_NONE }, + { TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN, TRAINER_SCHOOL_KID_M_ALAN_2, TRAINER_SCHOOL_KID_M_ALAN_3, TRAINER_SCHOOL_KID_M_ALAN_4, TRAINER_NONE }, + { TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK, TRAINER_POKEFAN_M_DEREK_2, TRAINER_POKEFAN_M_DEREK_3, TRAINER_POKEFAN_M_DEREK_4, TRAINER_NONE }, + { TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA, TRAINER_PICNICKER_GINA_2, TRAINER_PICNICKER_GINA_3, TRAINER_PICNICKER_GINA_4, TRAINER_NONE }, + { TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY, TRAINER_FISHERMAN_TULLY_2, TRAINER_FISHERMAN_TULLY_3, TRAINER_FISHERMAN_TULLY_4, TRAINER_NONE }, + { TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY, TRAINER_POKEFAN_BEVERLY_2, TRAINER_POKEFAN_BEVERLY_3, TRAINER_POKEFAN_BEVERLY_4, TRAINER_NONE }, + { TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE, TRAINER_BIRD_KEEPER_GS_VANCE_2, TRAINER_BIRD_KEEPER_GS_VANCE_3, TRAINER_BIRD_KEEPER_GS_VANCE_4, TRAINER_NONE }, + { TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH, TRAINER_FISHERMAN_RALPH_2, TRAINER_FISHERMAN_RALPH_3, TRAINER_FISHERMAN_RALPH_4, TRAINER_NONE }, + { TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD, TRAINER_CAMPER_TODD_2, TRAINER_CAMPER_TODD_3, TRAINER_CAMPER_TODD_4, TRAINER_NONE }, + { TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE, TRAINER_BUG_CATCHER_ARNIE_2, TRAINER_BUG_CATCHER_ARNIE_3, TRAINER_BUG_CATCHER_ARNIE_4, TRAINER_NONE }, + { TRAINER_LASS_DANA, TRAINER_LASS_DANA, TRAINER_LASS_DANA_2, TRAINER_LASS_DANA_3, TRAINER_LASS_DANA_4, TRAINER_NONE }, + { TRAINER_LASS_KRISE, TRAINER_LASS_KRISE, TRAINER_LASS_KRISE_2, TRAINER_LASS_KRISE_3, TRAINER_LASS_KRISE_4, TRAINER_NONE }, + { TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN, TRAINER_YOUNGSTER_IAN_2, TRAINER_YOUNGSTER_IAN_3, TRAINER_YOUNGSTER_IAN_4, TRAINER_NONE }, + { TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT, TRAINER_FIREBREATHER_WALT_2, TRAINER_FIREBREATHER_WALT_3, TRAINER_FIREBREATHER_WALT_4, TRAINER_NONE }, + { TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG, TRAINER_BUG_CATCHER_DOUG_2, TRAINER_BUG_CATCHER_DOUG_3, TRAINER_BUG_CATCHER_DOUG_4, TRAINER_NONE }, + { TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB, TRAINER_BUG_CATCHER_ROB_2, TRAINER_BUG_CATCHER_ROB_3, TRAINER_BUG_CATCHER_ROB_4, TRAINER_NONE }, + { TRAINER_BIKER_REESE, TRAINER_BIKER_REESE, TRAINER_BIKER_REESE_2, TRAINER_BIKER_REESE_3, TRAINER_BIKER_REESE_4, TRAINER_NONE }, + { TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN, TRAINER_BIKER_AIDEN_2, TRAINER_BIKER_AIDEN_3, TRAINER_BIKER_AIDEN_4, TRAINER_NONE }, + { TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST_2, TRAINER_BIKER_ERNEST_3, TRAINER_BIKER_ERNEST_4, TRAINER_NONE }, + { TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY, TRAINER_TEACHER_HILLARY_2, TRAINER_TEACHER_HILLARY_3, TRAINER_TEACHER_HILLARY_4, TRAINER_NONE }, + { TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY, TRAINER_SCHOOL_KID_M_BILLY_2, TRAINER_SCHOOL_KID_M_BILLY_3, TRAINER_SCHOOL_KID_M_BILLY_4, TRAINER_NONE }, + { TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA, TRAINER_TWINS_KAY_AND_TIA_2, TRAINER_TWINS_KAY_AND_TIA_3, TRAINER_TWINS_KAY_AND_TIA_4, TRAINER_NONE }, + { TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH, TRAINER_BIRD_KEEPER_GS_JOSH_2, TRAINER_BIRD_KEEPER_GS_JOSH_3, TRAINER_BIRD_KEEPER_GS_JOSH_4, TRAINER_NONE }, + { TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN, TRAINER_SCHOOL_KID_M_TORIN_2, TRAINER_SCHOOL_KID_M_TORIN_3, TRAINER_SCHOOL_KID_M_TORIN_4, TRAINER_NONE }, + { TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_2, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_3, TRAINER_YOUNG_COUPLE_TIM_AND_SUE_4, TRAINER_NONE }, + { TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY, TRAINER_HIKER_KENNY_2, TRAINER_HIKER_KENNY_3, TRAINER_HIKER_KENNY_4, TRAINER_NONE }, + { TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER, TRAINER_CAMPER_TANNER_2, TRAINER_CAMPER_TANNER_3, TRAINER_CAMPER_TANNER_4, TRAINER_NONE }, + { TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE, TRAINER_FISHERMAN_KYLE_2, TRAINER_FISHERMAN_KYLE_3, TRAINER_FISHERMAN_KYLE_4, TRAINER_NONE }, + { TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER, TRAINER_FISHERMAN_KYLER_2, TRAINER_FISHERMAN_KYLER_3, TRAINER_FISHERMAN_KYLER_4, TRAINER_NONE }, + { TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED, TRAINER_GENTLEMAN_ALFRED_2, TRAINER_GENTLEMAN_ALFRED_3, TRAINER_GENTLEMAN_ALFRED_4, TRAINER_NONE }, + { TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER, TRAINER_LEADER_FALKNER_FALKNER_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY, TRAINER_LEADER_BUGSY_BUGSY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY, TRAINER_LEADER_WHITNEY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY, TRAINER_LEADER_MORTY_MORTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE, TRAINER_LEADER_JASMINE_JASMINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK, TRAINER_LEADER_CHUCK_CHUCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE, TRAINER_LEADER_PRYCE_PRYCE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR, TRAINER_LEADER_CLAIR_CLAIR_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK, TRAINER_LEADER_BROCK_BROCK_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY, TRAINER_LEADER_MISTY_MISTY_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE, TRAINER_LEADER_LT_SURGE_LT__SURGE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA, TRAINER_LEADER_ERIKA_ERIKA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE, TRAINER_LEADER_JANINE_JANINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA, TRAINER_LEADER_SABRINA_SABRINA_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE, TRAINER_LEADER_BLAINE_BLAINE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, + { TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE, TRAINER_LEADER_BLUE_BLUE_2, TRAINER_NONE, TRAINER_NONE, TRAINER_NONE }, }; u16 TryGetRematchTrainerIdByBaseTrainerId(SaveData *saveData, u16 trainer_id) { diff --git a/src/overlay_94.c b/src/overlay_94.c index 8de383d965..c56b817bdc 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -177,12 +177,12 @@ static void _EmitParticles(IconFormChangeData *partyMenu) { } static const fx32 sPartyMonSpritePositions[][2] = { - {-16500, 12000}, - { 5000, 11500}, - { -16500, 5000 }, - { 5000, 3500 }, - { -16500, -3000}, - { 5000, -4500} + { -16500, 12000 }, + { 5000, 11500 }, + { -16500, 5000 }, + { 5000, 3500 }, + { -16500, -3000 }, + { 5000, -4500 } }; static void particleEmitCallback(SPLEmitter *emitter) { diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 6c2717df0c..6b9ef7747a 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -186,11 +186,11 @@ static const struct { }; static const UnkTemplate_0200D748 ov62_021E67C8[5] = { - {.x = 0x40, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, - { .x = 0xC0, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, - { .x = 0x80, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xB01, 0xB03, 0xB02, 0xB04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, - { .x = 0xD8, .y = 0xB0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, .resIdList = { 0xD01, 0xD03, 0xD02, 0xD04, 1, 0 }, .bgPriority = 0, .vramTransfer = 0}, - { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xC01, 0xC03, 0xC02, 0xC04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0}, + { .x = 0x40, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, + { .x = 0xC0, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, + { .x = 0x80, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xB01, 0xB03, 0xB02, 0xB04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, + { .x = 0xD8, .y = 0xB0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, .resIdList = { 0xD01, 0xD03, 0xD02, 0xD04, 1, 0 }, .bgPriority = 0, .vramTransfer = 0 }, + { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xC01, 0xC03, 0xC02, 0xC04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, }; static const u32 ov62_021E6694[7] = { 0, 1, 2, 3, 4, 4, 4 }; @@ -245,9 +245,9 @@ static const struct { u8 fontId; u32 color; } ov62_021E66F8[3] = { - {.bgId = 0, .x = 1, .y = 1, .width = 9, .height = 3, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200}, - { .bgId = 4, .x = 5, .y = 8, .width = 22, .height = 5, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200}, - { .bgId = 4, .x = 24, .y = 21, .width = 6, .height = 2, .palNum = 0, .baseTile = 0x6F, .fontId = 4, .color = 0xE0F00}, + { .bgId = 0, .x = 1, .y = 1, .width = 9, .height = 3, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200 }, + { .bgId = 4, .x = 5, .y = 8, .width = 22, .height = 5, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200 }, + { .bgId = 4, .x = 24, .y = 21, .width = 6, .height = 2, .palNum = 0, .baseTile = 0x6F, .fontId = 4, .color = 0xE0F00 }, }; const OVY_MGR_TEMPLATE gApplication_MicTest = { MicTest_Init, MicTest_Main, MicTest_Exit, FS_OVERLAY_ID_NONE }; diff --git a/src/party_context_menu.c b/src/party_context_menu.c index 5f99ae17e6..8474b72765 100644 --- a/src/party_context_menu.c +++ b/src/party_context_menu.c @@ -40,95 +40,95 @@ static BOOL handlePartyMenuTopLevelDpadInput(u8 *pSelection, int numItems, int d static BOOL handlePartyContextMenuDpadInput(u8 *pSelection, int numItems, int direction); static const WindowTemplate sMainWindowTemplates[] = { - {GF_BG_LYR_MAIN_1, 0x06, 0x01, 0x09, 0x02, 0x00, 0x0048}, - { GF_BG_LYR_MAIN_1, 0x00, 0x04, 0x06, 0x02, 0x00, 0x005A}, - { GF_BG_LYR_MAIN_1, 0x07, 0x04, 0x08, 0x02, 0x00, 0x0066}, - { GF_BG_LYR_MAIN_1, 0x08, 0x03, 0x06, 0x01, 0x03, 0x0076}, - { GF_BG_LYR_MAIN_1, 0x06, 0x04, 0x0A, 0x02, 0x00, 0x0066}, - { GF_BG_LYR_MAIN_1, 0x16, 0x02, 0x09, 0x02, 0x00, 0x007C}, - { GF_BG_LYR_MAIN_1, 0x10, 0x05, 0x06, 0x02, 0x00, 0x008E}, - { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A}, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, - { GF_BG_LYR_MAIN_1, 0x16, 0x05, 0x0A, 0x02, 0x00, 0x009A}, - { GF_BG_LYR_MAIN_1, 0x06, 0x07, 0x09, 0x02, 0x00, 0x00B0}, - { GF_BG_LYR_MAIN_1, 0x00, 0x0A, 0x06, 0x02, 0x00, 0x00C2}, - { GF_BG_LYR_MAIN_1, 0x07, 0x0A, 0x08, 0x02, 0x00, 0x00CE}, - { GF_BG_LYR_MAIN_1, 0x08, 0x09, 0x06, 0x01, 0x05, 0x00DE}, - { GF_BG_LYR_MAIN_1, 0x06, 0x0A, 0x0A, 0x02, 0x00, 0x00CE}, - { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4}, - { GF_BG_LYR_MAIN_1, 0x10, 0x0B, 0x06, 0x02, 0x00, 0x00F6}, - { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102}, - { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112}, - { GF_BG_LYR_MAIN_1, 0x16, 0x0B, 0x0A, 0x02, 0x00, 0x0102}, - { GF_BG_LYR_MAIN_1, 0x06, 0x0D, 0x09, 0x02, 0x00, 0x0118}, - { GF_BG_LYR_MAIN_1, 0x00, 0x10, 0x06, 0x02, 0x00, 0x012A}, - { GF_BG_LYR_MAIN_1, 0x07, 0x10, 0x08, 0x02, 0x00, 0x0136}, - { GF_BG_LYR_MAIN_1, 0x08, 0x0F, 0x06, 0x01, 0x07, 0x0146}, - { GF_BG_LYR_MAIN_1, 0x06, 0x10, 0x0A, 0x02, 0x00, 0x0136}, - { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C}, - { GF_BG_LYR_MAIN_1, 0x10, 0x11, 0x06, 0x02, 0x00, 0x015E}, - { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A}, - { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A}, - { GF_BG_LYR_MAIN_1, 0x16, 0x11, 0x0A, 0x02, 0x00, 0x016A}, - { GF_BG_LYR_MAIN_1, 0x16, 0x01, 0x09, 0x02, 0x00, 0x007C}, - { GF_BG_LYR_MAIN_1, 0x11, 0x05, 0x05, 0x02, 0x00, 0x008E}, - { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A}, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, - { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4}, - { GF_BG_LYR_MAIN_1, 0x11, 0x0B, 0x05, 0x02, 0x00, 0x00F6}, - { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102}, - { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112}, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, - { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C}, - { GF_BG_LYR_MAIN_1, 0x11, 0x11, 0x05, 0x02, 0x00, 0x015E}, - { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A}, - { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A}, - { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA}, - { GF_BG_LYR_SUB_2, 0x07, 0x18, 0x0A, 0x02, 0x02, 0x0001}, - { GF_BG_LYR_SUB_2, 0x11, 0x18, 0x06, 0x02, 0x02, 0x0015}, - { GF_BG_LYR_SUB_2, 0x11, 0x1A, 0x0C, 0x03, 0x02, 0x0021}, + { GF_BG_LYR_MAIN_1, 0x06, 0x01, 0x09, 0x02, 0x00, 0x0048 }, + { GF_BG_LYR_MAIN_1, 0x00, 0x04, 0x06, 0x02, 0x00, 0x005A }, + { GF_BG_LYR_MAIN_1, 0x07, 0x04, 0x08, 0x02, 0x00, 0x0066 }, + { GF_BG_LYR_MAIN_1, 0x08, 0x03, 0x06, 0x01, 0x03, 0x0076 }, + { GF_BG_LYR_MAIN_1, 0x06, 0x04, 0x0A, 0x02, 0x00, 0x0066 }, + { GF_BG_LYR_MAIN_1, 0x16, 0x02, 0x09, 0x02, 0x00, 0x007C }, + { GF_BG_LYR_MAIN_1, 0x10, 0x05, 0x06, 0x02, 0x00, 0x008E }, + { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A }, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, + { GF_BG_LYR_MAIN_1, 0x16, 0x05, 0x0A, 0x02, 0x00, 0x009A }, + { GF_BG_LYR_MAIN_1, 0x06, 0x07, 0x09, 0x02, 0x00, 0x00B0 }, + { GF_BG_LYR_MAIN_1, 0x00, 0x0A, 0x06, 0x02, 0x00, 0x00C2 }, + { GF_BG_LYR_MAIN_1, 0x07, 0x0A, 0x08, 0x02, 0x00, 0x00CE }, + { GF_BG_LYR_MAIN_1, 0x08, 0x09, 0x06, 0x01, 0x05, 0x00DE }, + { GF_BG_LYR_MAIN_1, 0x06, 0x0A, 0x0A, 0x02, 0x00, 0x00CE }, + { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4 }, + { GF_BG_LYR_MAIN_1, 0x10, 0x0B, 0x06, 0x02, 0x00, 0x00F6 }, + { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102 }, + { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112 }, + { GF_BG_LYR_MAIN_1, 0x16, 0x0B, 0x0A, 0x02, 0x00, 0x0102 }, + { GF_BG_LYR_MAIN_1, 0x06, 0x0D, 0x09, 0x02, 0x00, 0x0118 }, + { GF_BG_LYR_MAIN_1, 0x00, 0x10, 0x06, 0x02, 0x00, 0x012A }, + { GF_BG_LYR_MAIN_1, 0x07, 0x10, 0x08, 0x02, 0x00, 0x0136 }, + { GF_BG_LYR_MAIN_1, 0x08, 0x0F, 0x06, 0x01, 0x07, 0x0146 }, + { GF_BG_LYR_MAIN_1, 0x06, 0x10, 0x0A, 0x02, 0x00, 0x0136 }, + { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C }, + { GF_BG_LYR_MAIN_1, 0x10, 0x11, 0x06, 0x02, 0x00, 0x015E }, + { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A }, + { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A }, + { GF_BG_LYR_MAIN_1, 0x16, 0x11, 0x0A, 0x02, 0x00, 0x016A }, + { GF_BG_LYR_MAIN_1, 0x16, 0x01, 0x09, 0x02, 0x00, 0x007C }, + { GF_BG_LYR_MAIN_1, 0x11, 0x05, 0x05, 0x02, 0x00, 0x008E }, + { GF_BG_LYR_MAIN_1, 0x17, 0x05, 0x08, 0x02, 0x00, 0x009A }, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, + { GF_BG_LYR_MAIN_1, 0x16, 0x08, 0x09, 0x02, 0x00, 0x00E4 }, + { GF_BG_LYR_MAIN_1, 0x11, 0x0B, 0x05, 0x02, 0x00, 0x00F6 }, + { GF_BG_LYR_MAIN_1, 0x17, 0x0B, 0x08, 0x02, 0x00, 0x0102 }, + { GF_BG_LYR_MAIN_1, 0x18, 0x0A, 0x06, 0x01, 0x06, 0x0112 }, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, + { GF_BG_LYR_MAIN_1, 0x16, 0x0E, 0x09, 0x02, 0x00, 0x014C }, + { GF_BG_LYR_MAIN_1, 0x11, 0x11, 0x05, 0x02, 0x00, 0x015E }, + { GF_BG_LYR_MAIN_1, 0x17, 0x11, 0x08, 0x02, 0x00, 0x016A }, + { GF_BG_LYR_MAIN_1, 0x18, 0x10, 0x06, 0x01, 0x08, 0x017A }, + { GF_BG_LYR_MAIN_1, 0x18, 0x04, 0x06, 0x01, 0x04, 0x00AA }, + { GF_BG_LYR_SUB_2, 0x07, 0x18, 0x0A, 0x02, 0x02, 0x0001 }, + { GF_BG_LYR_SUB_2, 0x11, 0x18, 0x06, 0x02, 0x02, 0x0015 }, + { GF_BG_LYR_SUB_2, 0x11, 0x1A, 0x0C, 0x03, 0x02, 0x0021 }, }; static const WindowTemplate sAdditionalWindowTemplates[] = { - {GF_BG_LYR_MAIN_1, 0x1A, 0x15, 0x05, 0x02, 0x00, 0x0180}, - { GF_BG_LYR_MAIN_1, 0x19, 0x14, 0x07, 0x02, 0x00, 0x018A}, - { GF_BG_LYR_MAIN_0, 0x02, 0x15, 0x14, 0x02, 0x0D, 0x0198}, - { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x0D, 0x04, 0x0D, 0x01C0}, - { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x1B, 0x04, 0x0D, 0x01F4}, - { GF_BG_LYR_MAIN_0, 0x13, 0x11, 0x0C, 0x06, 0x00, 0x0260}, - { GF_BG_LYR_MAIN_0, 0x13, 0x0F, 0x0C, 0x08, 0x00, 0x0260}, + { GF_BG_LYR_MAIN_1, 0x1A, 0x15, 0x05, 0x02, 0x00, 0x0180 }, + { GF_BG_LYR_MAIN_1, 0x19, 0x14, 0x07, 0x02, 0x00, 0x018A }, + { GF_BG_LYR_MAIN_0, 0x02, 0x15, 0x14, 0x02, 0x0D, 0x0198 }, + { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x0D, 0x04, 0x0D, 0x01C0 }, + { GF_BG_LYR_MAIN_0, 0x02, 0x13, 0x1B, 0x04, 0x0D, 0x01F4 }, + { GF_BG_LYR_MAIN_0, 0x13, 0x11, 0x0C, 0x06, 0x00, 0x0260 }, + { GF_BG_LYR_MAIN_0, 0x13, 0x0F, 0x0C, 0x08, 0x00, 0x0260 }, }; static const WindowTemplate sButtonWindowTemplates[] = { - {GF_BG_LYR_MAIN_0, 0x11, 0x04, 0x0E, 0x02, 0x02, 0x0260}, - { GF_BG_LYR_MAIN_0, 0x11, 0x08, 0x0E, 0x02, 0x02, 0x027C}, - { GF_BG_LYR_MAIN_0, 0x11, 0x0C, 0x0E, 0x02, 0x02, 0x0298}, - { GF_BG_LYR_MAIN_0, 0x01, 0x03, 0x0E, 0x02, 0x02, 0x02B4}, - { GF_BG_LYR_MAIN_0, 0x01, 0x07, 0x0E, 0x02, 0x02, 0x02D0}, - { GF_BG_LYR_MAIN_0, 0x01, 0x0B, 0x0E, 0x02, 0x02, 0x02EC}, - { GF_BG_LYR_MAIN_0, 0x01, 0x0F, 0x0E, 0x02, 0x02, 0x0308}, - { GF_BG_LYR_MAIN_0, 0x1A, 0x14, 0x05, 0x03, 0x02, 0x0324}, - { GF_BG_LYR_MAIN_0, 0x11, 0x03, 0x0E, 0x02, 0x02, 0x0260}, - { GF_BG_LYR_MAIN_0, 0x11, 0x07, 0x0E, 0x02, 0x02, 0x027C}, - { GF_BG_LYR_MAIN_0, 0x11, 0x0B, 0x0E, 0x02, 0x02, 0x0298}, - { GF_BG_LYR_MAIN_0, 0x11, 0x0F, 0x0E, 0x02, 0x02, 0x02B4}, + { GF_BG_LYR_MAIN_0, 0x11, 0x04, 0x0E, 0x02, 0x02, 0x0260 }, + { GF_BG_LYR_MAIN_0, 0x11, 0x08, 0x0E, 0x02, 0x02, 0x027C }, + { GF_BG_LYR_MAIN_0, 0x11, 0x0C, 0x0E, 0x02, 0x02, 0x0298 }, + { GF_BG_LYR_MAIN_0, 0x01, 0x03, 0x0E, 0x02, 0x02, 0x02B4 }, + { GF_BG_LYR_MAIN_0, 0x01, 0x07, 0x0E, 0x02, 0x02, 0x02D0 }, + { GF_BG_LYR_MAIN_0, 0x01, 0x0B, 0x0E, 0x02, 0x02, 0x02EC }, + { GF_BG_LYR_MAIN_0, 0x01, 0x0F, 0x0E, 0x02, 0x02, 0x0308 }, + { GF_BG_LYR_MAIN_0, 0x1A, 0x14, 0x05, 0x03, 0x02, 0x0324 }, + { GF_BG_LYR_MAIN_0, 0x11, 0x03, 0x0E, 0x02, 0x02, 0x0260 }, + { GF_BG_LYR_MAIN_0, 0x11, 0x07, 0x0E, 0x02, 0x02, 0x027C }, + { GF_BG_LYR_MAIN_0, 0x11, 0x0B, 0x0E, 0x02, 0x02, 0x0298 }, + { GF_BG_LYR_MAIN_0, 0x11, 0x0F, 0x0E, 0x02, 0x02, 0x02B4 }, }; static const u8 sButtonRects[][4] = { - // x, y, width, height - {0x10, 0x03, 0x10, 0x04}, - { 0x10, 0x07, 0x10, 0x04}, - { 0x10, 0x0B, 0x10, 0x04}, - { 0x00, 0x02, 0x10, 0x04}, - { 0x00, 0x06, 0x10, 0x04}, - { 0x00, 0x0A, 0x10, 0x04}, - { 0x00, 0x0E, 0x10, 0x04}, - { 0x19, 0x13, 0x07, 0x05}, - { 0x10, 0x02, 0x10, 0x04}, - { 0x10, 0x06, 0x10, 0x04}, - { 0x10, 0x0A, 0x10, 0x04}, - { 0x10, 0x0E, 0x10, 0x04}, + // x, y, width, height + { 0x10, 0x03, 0x10, 0x04 }, + { 0x10, 0x07, 0x10, 0x04 }, + { 0x10, 0x0B, 0x10, 0x04 }, + { 0x00, 0x02, 0x10, 0x04 }, + { 0x00, 0x06, 0x10, 0x04 }, + { 0x00, 0x0A, 0x10, 0x04 }, + { 0x00, 0x0E, 0x10, 0x04 }, + { 0x19, 0x13, 0x07, 0x05 }, + { 0x10, 0x02, 0x10, 0x04 }, + { 0x10, 0x06, 0x10, 0x04 }, + { 0x10, 0x0A, 0x10, 0x04 }, + { 0x10, 0x0E, 0x10, 0x04 }, }; static const s8 sButtonWindowIDs[][2][8] = { @@ -175,12 +175,12 @@ static const u16 sButtonFrameTileOffsets[] = { // which derives from BufferMonNickname. // they could've just gotten MON_DATA_NICKNAME_STRING static const u16 sMonNicknameMsgIds[][4] = { - {msg_0300_00008, msg_0300_00002, msg_0300_00020, msg_0300_00014}, - { msg_0300_00009, msg_0300_00003, msg_0300_00021, msg_0300_00015}, - { msg_0300_00010, msg_0300_00004, msg_0300_00022, msg_0300_00016}, - { msg_0300_00011, msg_0300_00005, msg_0300_00023, msg_0300_00017}, - { msg_0300_00012, msg_0300_00006, msg_0300_00024, msg_0300_00018}, - { msg_0300_00013, msg_0300_00007, msg_0300_00025, msg_0300_00019}, + { msg_0300_00008, msg_0300_00002, msg_0300_00020, msg_0300_00014 }, + { msg_0300_00009, msg_0300_00003, msg_0300_00021, msg_0300_00015 }, + { msg_0300_00010, msg_0300_00004, msg_0300_00022, msg_0300_00016 }, + { msg_0300_00011, msg_0300_00005, msg_0300_00023, msg_0300_00017 }, + { msg_0300_00012, msg_0300_00006, msg_0300_00024, msg_0300_00018 }, + { msg_0300_00013, msg_0300_00007, msg_0300_00025, msg_0300_00019 }, }; static int sDpadNavParam_ContextMenu[][5][2] = { diff --git a/src/party_menu.c b/src/party_menu.c index 88e91aec87..7e4e9771ba 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -158,47 +158,47 @@ static const UnkStruct_0207A22C _0210150C[2][6] = { }; static const UnkStruct_02020654 _0210140C[8] = { - {0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01}, - { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02}, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x07, 0x03, 0x05}, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x07, 0x04, 0x07}, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0x05, 0x00}, + { 0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01 }, + { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02 }, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x07, 0x03, 0x05 }, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x07, 0x04, 0x07 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0x05, 0x00 }, }; static const UnkStruct_02020654 _0210144C[8] = { - {0x40, 0x19, 0x00, 0x00, 0x04, 0x02, 0x01, 0x01}, - { 0xC0, 0x19, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00}, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x03, 0x03}, - { 0xC0, 0x49, 0x00, 0x00, 0x01, 0x05, 0x02, 0x02}, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x05, 0x05}, - { 0xC0, 0x79, 0x00, 0x00, 0x03, 0x07, 0x04, 0x04}, - { 0xE0, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0xFF, 0xFF}, + { 0x40, 0x19, 0x00, 0x00, 0x04, 0x02, 0x01, 0x01 }, + { 0xC0, 0x19, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00 }, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x03, 0x03 }, + { 0xC0, 0x49, 0x00, 0x00, 0x01, 0x05, 0x02, 0x02 }, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x05, 0x05 }, + { 0xC0, 0x79, 0x00, 0x00, 0x03, 0x07, 0x04, 0x04 }, + { 0xE0, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x01, 0xFF, 0xFF }, }; static const UnkStruct_02020654 _0210148C[8] = { - {0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01}, - { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02}, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x06, 0x03, 0x05}, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x06, 0x04, 0x06}, - { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x07, 0x05, 0x07}, - { 0xE0, 0xB8, 0x00, 0x00, 0x06, 0x01, 0x06, 0x00}, + { 0x40, 0x19, 0x00, 0x00, 0x07, 0x02, 0x07, 0x01 }, + { 0xC0, 0x21, 0x00, 0x00, 0x07, 0x03, 0x00, 0x02 }, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x06, 0x03, 0x05 }, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x06, 0x04, 0x06 }, + { 0xE0, 0xA8, 0x00, 0x00, 0x05, 0x07, 0x05, 0x07 }, + { 0xE0, 0xB8, 0x00, 0x00, 0x06, 0x01, 0x06, 0x00 }, }; static const UnkStruct_02020654 _021014CC[8] = { - {0x40, 0x19, 0x00, 0x00, 0x05, 0x02, 0x05, 0x01}, - { 0xC0, 0x21, 0x00, 0x00, 0x05, 0x03, 0x00, 0x02}, - { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03}, - { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04}, - { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x03, 0x05}, - { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00}, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + { 0x40, 0x19, 0x00, 0x00, 0x05, 0x02, 0x05, 0x01 }, + { 0xC0, 0x21, 0x00, 0x00, 0x05, 0x03, 0x00, 0x02 }, + { 0x40, 0x49, 0x00, 0x00, 0x00, 0x04, 0x01, 0x03 }, + { 0xC0, 0x51, 0x00, 0x00, 0x01, 0x05, 0x02, 0x04 }, + { 0x40, 0x79, 0x00, 0x00, 0x02, 0x00, 0x03, 0x05 }, + { 0xC0, 0x81, 0x00, 0x00, 0x03, 0x00, 0x04, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, }; static const u16 sFieldMoves[PARTY_MON_CONTEXT_MENU_FIELD_MOVES_COUNT] = { @@ -1298,10 +1298,10 @@ static void sub_0207A89C(PartyMenu *partyMenu) { } static const u8 _021012CC[][6] = { - {0, 2, 4, 1, 3, 5}, - { 1, 3, 5, 0, 2, 4}, - { 4, 2, 0, 5, 3, 1}, - { 5, 3, 1, 4, 2, 0}, + { 0, 2, 4, 1, 3, 5 }, + { 1, 3, 5, 0, 2, 4 }, + { 4, 2, 0, 5, 3, 1 }, + { 5, 3, 1, 4, 2, 0 }, }; static u8 sub_0207A8FC(PartyMenu *partyMenu) { @@ -2134,12 +2134,12 @@ static u8 sub_0207BB88(PartyMenu *partyMenu) { } static const u8 _021012B0[][2] = { - {1, 3 }, - { 26, 3 }, - { 1, 10}, - { 26, 10}, - { 1, 17}, - { 26, 17}, + { 1, 3 }, + { 26, 3 }, + { 1, 10 }, + { 26, 10 }, + { 1, 17 }, + { 26, 17 }, }; static void sub_0207BBFC(u8 a0, s16 *px, s16 *py) { diff --git a/src/pokemon.c b/src/pokemon.c index 230fc84124..69c4de0f3b 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -70,31 +70,31 @@ void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u #define CALC_UNOWN_LETTER(pid) ((u32)((((pid) & 0x3000000) >> 18) | (((pid) & 0x30000) >> 12) | (((pid) & 0x300) >> 6) | (((pid) & 0x3) >> 0)) % 28u) static const s8 sFlavorPreferencesByNature[NATURE_NUM][FLAVOR_MAX] = { - {0, 0, 0, 0, 0 }, - { 1, 0, 0, 0, -1}, - { 1, 0, -1, 0, 0 }, - { 1, -1, 0, 0, 0 }, - { 1, 0, 0, -1, 0 }, - { -1, 0, 0, 0, 1 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, -1, 0, 1 }, - { 0, -1, 0, 0, 1 }, - { 0, 0, 0, -1, 1 }, - { -1, 0, 1, 0, 0 }, - { 0, 0, 1, 0, -1}, - { 0, 0, 0, 0, 0 }, - { 0, -1, 1, 0, 0 }, - { 0, 0, 1, -1, 0 }, - { -1, 1, 0, 0, 0 }, - { 0, 1, 0, 0, -1}, - { 0, 1, -1, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 1, 0, -1, 0 }, - { -1, 0, 0, 1, 0 }, - { 0, 0, 0, 1, -1}, - { 0, 0, -1, 1, 0 }, - { 0, -1, 0, 1, 0 }, - { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 1, 0, 0, 0, -1 }, + { 1, 0, -1, 0, 0 }, + { 1, -1, 0, 0, 0 }, + { 1, 0, 0, -1, 0 }, + { -1, 0, 0, 0, 1 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, -1, 0, 1 }, + { 0, -1, 0, 0, 1 }, + { 0, 0, 0, -1, 1 }, + { -1, 0, 1, 0, 0 }, + { 0, 0, 1, 0, -1 }, + { 0, 0, 0, 0, 0 }, + { 0, -1, 1, 0, 0 }, + { 0, 0, 1, -1, 0 }, + { -1, 1, 0, 0, 0 }, + { 0, 1, 0, 0, -1 }, + { 0, 1, -1, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 1, 0, -1, 0 }, + { -1, 0, 0, 1, 0 }, + { 0, 0, 0, 1, -1 }, + { 0, 0, -1, 1, 0 }, + { 0, -1, 0, 1, 0 }, + { 0, 0, 0, 0, 0 }, }; void ZeroMonData(Pokemon *mon) { @@ -1960,31 +1960,31 @@ u8 GetNatureFromPersonality(u32 pid) { } const s8 gNatureStatMods[NATURE_NUM][NUM_EV_STATS] = { - {0, 0, 0, 0, 0 }, - { 1, -1, 0, 0, 0 }, - { 1, 0, -1, 0, 0 }, - { 1, 0, 0, -1, 0 }, - { 1, 0, 0, 0, -1}, - { -1, 1, 0, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 1, -1, 0, 0 }, - { 0, 1, 0, -1, 0 }, - { 0, 1, 0, 0, -1}, - { -1, 0, 1, 0, 0 }, - { 0, -1, 1, 0, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, 1, -1, 0 }, - { 0, 0, 1, 0, -1}, - { -1, 0, 0, 1, 0 }, - { 0, -1, 0, 1, 0 }, - { 0, 0, -1, 1, 0 }, - { 0, 0, 0, 0, 0 }, - { 0, 0, 0, 1, -1}, - { -1, 0, 0, 0, 1 }, - { 0, -1, 0, 0, 1 }, - { 0, 0, -1, 0, 1 }, - { 0, 0, 0, -1, 1 }, - { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 1, -1, 0, 0, 0 }, + { 1, 0, -1, 0, 0 }, + { 1, 0, 0, -1, 0 }, + { 1, 0, 0, 0, -1 }, + { -1, 1, 0, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 1, -1, 0, 0 }, + { 0, 1, 0, -1, 0 }, + { 0, 1, 0, 0, -1 }, + { -1, 0, 1, 0, 0 }, + { 0, -1, 1, 0, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 1, -1, 0 }, + { 0, 0, 1, 0, -1 }, + { -1, 0, 0, 1, 0 }, + { 0, -1, 0, 1, 0 }, + { 0, 0, -1, 1, 0 }, + { 0, 0, 0, 0, 0 }, + { 0, 0, 0, 1, -1 }, + { -1, 0, 0, 0, 1 }, + { 0, -1, 0, 0, 1 }, + { 0, 0, -1, 0, 1 }, + { 0, 0, 0, -1, 1 }, + { 0, 0, 0, 0, 0 }, }; u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { @@ -2014,16 +2014,16 @@ u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex) { } static const s8 sFriendshipModTable[FRIENDSHIP_EVENT_NUM][FRIENDSHIP_TIER_NUM] = { - {5, 3, 2 }, // FRIENDSHIP_EVENT_GROW_LEVEL - { 5, 3, 2 }, // FRIENDSHIP_EVENT_VITAMIN - { 1, 1, 0 }, // FRIENDSHIP_EVENT_BATTLE_ITEM - { 3, 2, 1 }, // FRIENDSHIP_EVENT_LEAGUE_BATTLE - { 1, 1, 0 }, // FRIENDSHIP_EVENT_LEARN_TMHM - { 1, 1, 1 }, // FRIENDSHIP_EVENT_WALKING - { -1, -1, -1 }, // FRIENDSHIP_EVENT_FAINT_SMALL - { -5, -5, -10}, // FRIENDSHIP_EVENT_HEAL_FIELD_PSN - { -5, -5, -10}, // FRIENDSHIP_EVENT_FAINT_LARGE - { 3, 2, 1 }, // FRIENDHSIP_EVENT_CONTEST_WIN + { 5, 3, 2 }, // FRIENDSHIP_EVENT_GROW_LEVEL + { 5, 3, 2 }, // FRIENDSHIP_EVENT_VITAMIN + { 1, 1, 0 }, // FRIENDSHIP_EVENT_BATTLE_ITEM + { 3, 2, 1 }, // FRIENDSHIP_EVENT_LEAGUE_BATTLE + { 1, 1, 0 }, // FRIENDSHIP_EVENT_LEARN_TMHM + { 1, 1, 1 }, // FRIENDSHIP_EVENT_WALKING + { -1, -1, -1 }, // FRIENDSHIP_EVENT_FAINT_SMALL + { -5, -5, -10 }, // FRIENDSHIP_EVENT_HEAL_FIELD_PSN + { -5, -5, -10 }, // FRIENDSHIP_EVENT_FAINT_LARGE + { 3, 2, 1 }, // FRIENDHSIP_EVENT_CONTEST_WIN }; void MonApplyFriendshipMod(Pokemon *mon, u8 kind, u16 location) { @@ -2675,7 +2675,7 @@ u8 GetMonPicHeightBySpeciesGenderForm_PBR(u16 species, u8 gender, u8 whichFacing } static const struct UnkTemplate_0200D748 _020FF588 = { - 0, 0, 0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, {0x4E2F, 0x4E2A, 0x4E27, 0x4E27, -1u, -1u}, + 0, 0, 0, 0, 0, 0, NNS_G2D_VRAM_TYPE_2DMAIN, { 0x4E2F, 0x4E2A, 0x4E27, 0x4E27, -1u, -1u }, 2, 1 }; @@ -3733,8 +3733,8 @@ void sub_02072190(BoxPokemon *boxMon, PlayerProfile *a1, u32 pokeball, u32 a3, u } static const u16 sItemOdds[2][2] = { - {45, 95}, - { 20, 80}, + { 45, 95 }, + { 20, 80 }, }; void WildMonSetRandomHeldItem(Pokemon *mon, u32 a1, u32 a2) { @@ -3949,38 +3949,38 @@ u32 CalcMonChecksum(void *_data, u32 size) { PokemonDataBlock *GetSubstruct(BoxPokemon *boxMon, u32 pid, u8 which) { static const u8 offsets[32][4] = { - {0x00, 0x20, 0x40, 0x60}, - { 0x00, 0x20, 0x60, 0x40}, - { 0x00, 0x40, 0x20, 0x60}, - { 0x00, 0x60, 0x20, 0x40}, - { 0x00, 0x40, 0x60, 0x20}, - { 0x00, 0x60, 0x40, 0x20}, - { 0x20, 0x00, 0x40, 0x60}, - { 0x20, 0x00, 0x60, 0x40}, - { 0x40, 0x00, 0x20, 0x60}, - { 0x60, 0x00, 0x20, 0x40}, - { 0x40, 0x00, 0x60, 0x20}, - { 0x60, 0x00, 0x40, 0x20}, - { 0x20, 0x40, 0x00, 0x60}, - { 0x20, 0x60, 0x00, 0x40}, - { 0x40, 0x20, 0x00, 0x60}, - { 0x60, 0x20, 0x00, 0x40}, - { 0x40, 0x60, 0x00, 0x20}, - { 0x60, 0x40, 0x00, 0x20}, - { 0x20, 0x40, 0x60, 0x00}, - { 0x20, 0x60, 0x40, 0x00}, - { 0x40, 0x20, 0x60, 0x00}, - { 0x60, 0x20, 0x40, 0x00}, - { 0x40, 0x60, 0x20, 0x00}, - { 0x60, 0x40, 0x20, 0x00}, - { 0x00, 0x20, 0x40, 0x60}, - { 0x00, 0x20, 0x60, 0x40}, - { 0x00, 0x40, 0x20, 0x60}, - { 0x00, 0x60, 0x20, 0x40}, - { 0x00, 0x40, 0x60, 0x20}, - { 0x00, 0x60, 0x40, 0x20}, - { 0x20, 0x00, 0x40, 0x60}, - { 0x20, 0x00, 0x60, 0x40}, + { 0x00, 0x20, 0x40, 0x60 }, + { 0x00, 0x20, 0x60, 0x40 }, + { 0x00, 0x40, 0x20, 0x60 }, + { 0x00, 0x60, 0x20, 0x40 }, + { 0x00, 0x40, 0x60, 0x20 }, + { 0x00, 0x60, 0x40, 0x20 }, + { 0x20, 0x00, 0x40, 0x60 }, + { 0x20, 0x00, 0x60, 0x40 }, + { 0x40, 0x00, 0x20, 0x60 }, + { 0x60, 0x00, 0x20, 0x40 }, + { 0x40, 0x00, 0x60, 0x20 }, + { 0x60, 0x00, 0x40, 0x20 }, + { 0x20, 0x40, 0x00, 0x60 }, + { 0x20, 0x60, 0x00, 0x40 }, + { 0x40, 0x20, 0x00, 0x60 }, + { 0x60, 0x20, 0x00, 0x40 }, + { 0x40, 0x60, 0x00, 0x20 }, + { 0x60, 0x40, 0x00, 0x20 }, + { 0x20, 0x40, 0x60, 0x00 }, + { 0x20, 0x60, 0x40, 0x00 }, + { 0x40, 0x20, 0x60, 0x00 }, + { 0x60, 0x20, 0x40, 0x00 }, + { 0x40, 0x60, 0x20, 0x00 }, + { 0x60, 0x40, 0x20, 0x00 }, + { 0x00, 0x20, 0x40, 0x60 }, + { 0x00, 0x20, 0x60, 0x40 }, + { 0x00, 0x40, 0x20, 0x60 }, + { 0x00, 0x60, 0x20, 0x40 }, + { 0x00, 0x40, 0x60, 0x20 }, + { 0x00, 0x60, 0x40, 0x20 }, + { 0x20, 0x00, 0x40, 0x60 }, + { 0x20, 0x00, 0x60, 0x40 }, }; pid = ((pid & 0x3E000) >> 13); @@ -4938,31 +4938,31 @@ static const u16 sPokeathlonPerformanceArcIdxs[] = { }; static const s8 sPokeathlonPerformanceNatureMods[NATURE_NUM][5] = { - {10, 0, 0, 0, -10}, - { 35, -35, 0, 0, 0 }, - { 35, 0, 0, 0, -35}, - { 35, 0, 0, -35, 0 }, - { 35, 0, -35, 0, 0 }, - { -35, 35, 0, 0, 0 }, - { 0, 10, 0, -10, 0 }, - { 0, 35, 0, 0, -35}, - { 0, 35, 0, -35, 0 }, - { 0, 35, -35, 0, 0 }, - { -35, 0, 0, 0, 35 }, - { 0, -35, 0, 0, 35 }, - { 0, 0, -10, 0, 10 }, - { 0, 0, 0, -35, 35 }, - { 0, 0, -35, 0, 35 }, - { -35, 0, 0, 35, 0 }, - { 0, -35, 0, 35, 0 }, - { 0, 0, 0, 35, -35}, - { -10, 0, 0, 10, 0 }, - { 0, 0, -35, 35, 0 }, - { -35, 0, 35, 0, 0 }, - { 0, -35, 35, 0, 0 }, - { 0, 0, 35, 0, -35}, - { 0, 0, 35, -35, 0 }, - { 0, -10, 10, 0, 0 }, + { 10, 0, 0, 0, -10 }, + { 35, -35, 0, 0, 0 }, + { 35, 0, 0, 0, -35 }, + { 35, 0, 0, -35, 0 }, + { 35, 0, -35, 0, 0 }, + { -35, 35, 0, 0, 0 }, + { 0, 10, 0, -10, 0 }, + { 0, 35, 0, 0, -35 }, + { 0, 35, 0, -35, 0 }, + { 0, 35, -35, 0, 0 }, + { -35, 0, 0, 0, 35 }, + { 0, -35, 0, 0, 35 }, + { 0, 0, -10, 0, 10 }, + { 0, 0, 0, -35, 35 }, + { 0, 0, -35, 0, 35 }, + { -35, 0, 0, 35, 0 }, + { 0, -35, 0, 35, 0 }, + { 0, 0, 0, 35, -35 }, + { -10, 0, 0, 10, 0 }, + { 0, 0, -35, 35, 0 }, + { -35, 0, 35, 0, 0 }, + { 0, -35, 35, 0, 0 }, + { 0, 0, 35, 0, -35 }, + { 0, 0, 35, -35, 0 }, + { 0, -10, 10, 0, 0 }, }; void CalcBoxMonPokeathlonPerformance(BoxPokemon *boxMon, struct PokeathlonTodayPerformance *dest) { diff --git a/src/pokepic.c b/src/pokepic.c index f026eb5cfc..79e5c6853f 100644 --- a/src/pokepic.c +++ b/src/pokepic.c @@ -20,248 +20,248 @@ static void UnscanPokepic_PtHGSS(u8 *pRawCharData); static void UnscanPokepic_DP(u8 *pRawCharData); static const u8 sSpindaSpot1Coords[][2] = { - {0x1B, 0x0F}, - { 0x1C, 0x0F}, - { 0x1D, 0x0F}, - { 0x1E, 0x0F}, - { 0x1A, 0x10}, - { 0x1B, 0x10}, - { 0x1C, 0x10}, - { 0x1D, 0x10}, - { 0x1E, 0x10}, - { 0x1F, 0x10}, - { 0x19, 0x11}, - { 0x1A, 0x11}, - { 0x1B, 0x11}, - { 0x1C, 0x11}, - { 0x1D, 0x11}, - { 0x1E, 0x11}, - { 0x1F, 0x11}, - { 0x20, 0x11}, - { 0x19, 0x12}, - { 0x1A, 0x12}, - { 0x1B, 0x12}, - { 0x1C, 0x12}, - { 0x1D, 0x12}, - { 0x1E, 0x12}, - { 0x1F, 0x12}, - { 0x20, 0x12}, - { 0x19, 0x13}, - { 0x1A, 0x13}, - { 0x1B, 0x13}, - { 0x1C, 0x13}, - { 0x1D, 0x13}, - { 0x1E, 0x13}, - { 0x1F, 0x13}, - { 0x20, 0x13}, - { 0x19, 0x14}, - { 0x1A, 0x14}, - { 0x1B, 0x14}, - { 0x1C, 0x14}, - { 0x1D, 0x14}, - { 0x1E, 0x14}, - { 0x1F, 0x14}, - { 0x20, 0x14}, - { 0x1A, 0x15}, - { 0x1B, 0x15}, - { 0x1C, 0x15}, - { 0x1D, 0x15}, - { 0x1E, 0x15}, - { 0x1F, 0x15}, - { 0x1B, 0x16}, - { 0x1C, 0x16}, - { 0x1D, 0x16}, - { 0x1E, 0x16}, - { 0xFF, 0xFF}, + { 0x1B, 0x0F }, + { 0x1C, 0x0F }, + { 0x1D, 0x0F }, + { 0x1E, 0x0F }, + { 0x1A, 0x10 }, + { 0x1B, 0x10 }, + { 0x1C, 0x10 }, + { 0x1D, 0x10 }, + { 0x1E, 0x10 }, + { 0x1F, 0x10 }, + { 0x19, 0x11 }, + { 0x1A, 0x11 }, + { 0x1B, 0x11 }, + { 0x1C, 0x11 }, + { 0x1D, 0x11 }, + { 0x1E, 0x11 }, + { 0x1F, 0x11 }, + { 0x20, 0x11 }, + { 0x19, 0x12 }, + { 0x1A, 0x12 }, + { 0x1B, 0x12 }, + { 0x1C, 0x12 }, + { 0x1D, 0x12 }, + { 0x1E, 0x12 }, + { 0x1F, 0x12 }, + { 0x20, 0x12 }, + { 0x19, 0x13 }, + { 0x1A, 0x13 }, + { 0x1B, 0x13 }, + { 0x1C, 0x13 }, + { 0x1D, 0x13 }, + { 0x1E, 0x13 }, + { 0x1F, 0x13 }, + { 0x20, 0x13 }, + { 0x19, 0x14 }, + { 0x1A, 0x14 }, + { 0x1B, 0x14 }, + { 0x1C, 0x14 }, + { 0x1D, 0x14 }, + { 0x1E, 0x14 }, + { 0x1F, 0x14 }, + { 0x20, 0x14 }, + { 0x1A, 0x15 }, + { 0x1B, 0x15 }, + { 0x1C, 0x15 }, + { 0x1D, 0x15 }, + { 0x1E, 0x15 }, + { 0x1F, 0x15 }, + { 0x1B, 0x16 }, + { 0x1C, 0x16 }, + { 0x1D, 0x16 }, + { 0x1E, 0x16 }, + { 0xFF, 0xFF }, }; static const u8 sSpindaSpot2Coords[][2] = { - {0x33, 0x11}, - { 0x34, 0x11}, - { 0x35, 0x11}, - { 0x36, 0x11}, - { 0x32, 0x12}, - { 0x33, 0x12}, - { 0x34, 0x12}, - { 0x35, 0x12}, - { 0x36, 0x12}, - { 0x37, 0x12}, - { 0x31, 0x13}, - { 0x32, 0x13}, - { 0x33, 0x13}, - { 0x34, 0x13}, - { 0x35, 0x13}, - { 0x36, 0x13}, - { 0x37, 0x13}, - { 0x38, 0x13}, - { 0x31, 0x14}, - { 0x32, 0x14}, - { 0x33, 0x14}, - { 0x34, 0x14}, - { 0x35, 0x14}, - { 0x36, 0x14}, - { 0x37, 0x14}, - { 0x38, 0x14}, - { 0x31, 0x15}, - { 0x32, 0x15}, - { 0x33, 0x15}, - { 0x34, 0x15}, - { 0x35, 0x15}, - { 0x36, 0x15}, - { 0x37, 0x15}, - { 0x38, 0x15}, - { 0x31, 0x16}, - { 0x32, 0x16}, - { 0x33, 0x16}, - { 0x34, 0x16}, - { 0x35, 0x16}, - { 0x36, 0x16}, - { 0x37, 0x16}, - { 0x38, 0x16}, - { 0x32, 0x17}, - { 0x33, 0x17}, - { 0x34, 0x17}, - { 0x35, 0x17}, - { 0x36, 0x17}, - { 0x37, 0x17}, - { 0x33, 0x18}, - { 0x34, 0x18}, - { 0x35, 0x18}, - { 0x36, 0x18}, - { 0xFF, 0xFF}, + { 0x33, 0x11 }, + { 0x34, 0x11 }, + { 0x35, 0x11 }, + { 0x36, 0x11 }, + { 0x32, 0x12 }, + { 0x33, 0x12 }, + { 0x34, 0x12 }, + { 0x35, 0x12 }, + { 0x36, 0x12 }, + { 0x37, 0x12 }, + { 0x31, 0x13 }, + { 0x32, 0x13 }, + { 0x33, 0x13 }, + { 0x34, 0x13 }, + { 0x35, 0x13 }, + { 0x36, 0x13 }, + { 0x37, 0x13 }, + { 0x38, 0x13 }, + { 0x31, 0x14 }, + { 0x32, 0x14 }, + { 0x33, 0x14 }, + { 0x34, 0x14 }, + { 0x35, 0x14 }, + { 0x36, 0x14 }, + { 0x37, 0x14 }, + { 0x38, 0x14 }, + { 0x31, 0x15 }, + { 0x32, 0x15 }, + { 0x33, 0x15 }, + { 0x34, 0x15 }, + { 0x35, 0x15 }, + { 0x36, 0x15 }, + { 0x37, 0x15 }, + { 0x38, 0x15 }, + { 0x31, 0x16 }, + { 0x32, 0x16 }, + { 0x33, 0x16 }, + { 0x34, 0x16 }, + { 0x35, 0x16 }, + { 0x36, 0x16 }, + { 0x37, 0x16 }, + { 0x38, 0x16 }, + { 0x32, 0x17 }, + { 0x33, 0x17 }, + { 0x34, 0x17 }, + { 0x35, 0x17 }, + { 0x36, 0x17 }, + { 0x37, 0x17 }, + { 0x33, 0x18 }, + { 0x34, 0x18 }, + { 0x35, 0x18 }, + { 0x36, 0x18 }, + { 0xFF, 0xFF }, }; static const u8 sSpindaSpot3Coords[][2] = { - {0x1E, 0x21}, - { 0x1F, 0x21}, - { 0x20, 0x21}, - { 0x1D, 0x22}, - { 0x1E, 0x22}, - { 0x1F, 0x22}, - { 0x20, 0x22}, - { 0x21, 0x22}, - { 0x1C, 0x23}, - { 0x1D, 0x23}, - { 0x1E, 0x23}, - { 0x1F, 0x23}, - { 0x20, 0x23}, - { 0x21, 0x23}, - { 0x22, 0x23}, - { 0x1C, 0x24}, - { 0x1D, 0x24}, - { 0x1E, 0x24}, - { 0x1F, 0x24}, - { 0x20, 0x24}, - { 0x21, 0x24}, - { 0x22, 0x24}, - { 0x1C, 0x25}, - { 0x1D, 0x25}, - { 0x1E, 0x25}, - { 0x1F, 0x25}, - { 0x20, 0x25}, - { 0x21, 0x25}, - { 0x22, 0x25}, - { 0x1C, 0x26}, - { 0x1D, 0x26}, - { 0x1E, 0x26}, - { 0x1F, 0x26}, - { 0x20, 0x26}, - { 0x21, 0x26}, - { 0x22, 0x26}, - { 0x1C, 0x27}, - { 0x1D, 0x27}, - { 0x1E, 0x27}, - { 0x1F, 0x27}, - { 0x20, 0x27}, - { 0x21, 0x27}, - { 0x22, 0x27}, - { 0x1D, 0x28}, - { 0x1E, 0x28}, - { 0x1F, 0x28}, - { 0x20, 0x28}, - { 0x21, 0x28}, - { 0x1E, 0x29}, - { 0x1F, 0x29}, - { 0x20, 0x29}, - { 0xFF, 0xFF}, + { 0x1E, 0x21 }, + { 0x1F, 0x21 }, + { 0x20, 0x21 }, + { 0x1D, 0x22 }, + { 0x1E, 0x22 }, + { 0x1F, 0x22 }, + { 0x20, 0x22 }, + { 0x21, 0x22 }, + { 0x1C, 0x23 }, + { 0x1D, 0x23 }, + { 0x1E, 0x23 }, + { 0x1F, 0x23 }, + { 0x20, 0x23 }, + { 0x21, 0x23 }, + { 0x22, 0x23 }, + { 0x1C, 0x24 }, + { 0x1D, 0x24 }, + { 0x1E, 0x24 }, + { 0x1F, 0x24 }, + { 0x20, 0x24 }, + { 0x21, 0x24 }, + { 0x22, 0x24 }, + { 0x1C, 0x25 }, + { 0x1D, 0x25 }, + { 0x1E, 0x25 }, + { 0x1F, 0x25 }, + { 0x20, 0x25 }, + { 0x21, 0x25 }, + { 0x22, 0x25 }, + { 0x1C, 0x26 }, + { 0x1D, 0x26 }, + { 0x1E, 0x26 }, + { 0x1F, 0x26 }, + { 0x20, 0x26 }, + { 0x21, 0x26 }, + { 0x22, 0x26 }, + { 0x1C, 0x27 }, + { 0x1D, 0x27 }, + { 0x1E, 0x27 }, + { 0x1F, 0x27 }, + { 0x20, 0x27 }, + { 0x21, 0x27 }, + { 0x22, 0x27 }, + { 0x1D, 0x28 }, + { 0x1E, 0x28 }, + { 0x1F, 0x28 }, + { 0x20, 0x28 }, + { 0x21, 0x28 }, + { 0x1E, 0x29 }, + { 0x1F, 0x29 }, + { 0x20, 0x29 }, + { 0xFF, 0xFF }, }; static const u8 sSpindaSpot4Coords[][2] = { - {0x2B, 0x21}, - { 0x2C, 0x21}, - { 0x2D, 0x21}, - { 0x29, 0x22}, - { 0x2A, 0x22}, - { 0x2B, 0x22}, - { 0x2C, 0x22}, - { 0x2D, 0x22}, - { 0x2E, 0x22}, - { 0x2F, 0x22}, - { 0x28, 0x23}, - { 0x29, 0x23}, - { 0x2A, 0x23}, - { 0x2B, 0x23}, - { 0x2C, 0x23}, - { 0x2D, 0x23}, - { 0x2E, 0x23}, - { 0x2F, 0x23}, - { 0x30, 0x23}, - { 0x28, 0x24}, - { 0x29, 0x24}, - { 0x2A, 0x24}, - { 0x2B, 0x24}, - { 0x2C, 0x24}, - { 0x2D, 0x24}, - { 0x2E, 0x24}, - { 0x2F, 0x24}, - { 0x30, 0x24}, - { 0x28, 0x25}, - { 0x29, 0x25}, - { 0x2A, 0x25}, - { 0x2B, 0x25}, - { 0x2C, 0x25}, - { 0x2D, 0x25}, - { 0x2E, 0x25}, - { 0x2F, 0x25}, - { 0x30, 0x25}, - { 0x28, 0x26}, - { 0x29, 0x26}, - { 0x2A, 0x26}, - { 0x2B, 0x26}, - { 0x2C, 0x26}, - { 0x2D, 0x26}, - { 0x2E, 0x26}, - { 0x2F, 0x26}, - { 0x30, 0x26}, - { 0x28, 0x27}, - { 0x29, 0x27}, - { 0x2A, 0x27}, - { 0x2B, 0x27}, - { 0x2C, 0x27}, - { 0x2D, 0x27}, - { 0x2E, 0x27}, - { 0x2F, 0x27}, - { 0x30, 0x27}, - { 0x28, 0x28}, - { 0x29, 0x28}, - { 0x2A, 0x28}, - { 0x2B, 0x28}, - { 0x2C, 0x28}, - { 0x2D, 0x28}, - { 0x2E, 0x28}, - { 0x2F, 0x28}, - { 0x30, 0x28}, - { 0x29, 0x29}, - { 0x2A, 0x29}, - { 0x2B, 0x29}, - { 0x2C, 0x29}, - { 0x2D, 0x29}, - { 0x2E, 0x29}, - { 0x2F, 0x29}, - { 0x2B, 0x2A}, - { 0x2C, 0x2A}, - { 0x2D, 0x2A}, - { 0xFF, 0xFF}, + { 0x2B, 0x21 }, + { 0x2C, 0x21 }, + { 0x2D, 0x21 }, + { 0x29, 0x22 }, + { 0x2A, 0x22 }, + { 0x2B, 0x22 }, + { 0x2C, 0x22 }, + { 0x2D, 0x22 }, + { 0x2E, 0x22 }, + { 0x2F, 0x22 }, + { 0x28, 0x23 }, + { 0x29, 0x23 }, + { 0x2A, 0x23 }, + { 0x2B, 0x23 }, + { 0x2C, 0x23 }, + { 0x2D, 0x23 }, + { 0x2E, 0x23 }, + { 0x2F, 0x23 }, + { 0x30, 0x23 }, + { 0x28, 0x24 }, + { 0x29, 0x24 }, + { 0x2A, 0x24 }, + { 0x2B, 0x24 }, + { 0x2C, 0x24 }, + { 0x2D, 0x24 }, + { 0x2E, 0x24 }, + { 0x2F, 0x24 }, + { 0x30, 0x24 }, + { 0x28, 0x25 }, + { 0x29, 0x25 }, + { 0x2A, 0x25 }, + { 0x2B, 0x25 }, + { 0x2C, 0x25 }, + { 0x2D, 0x25 }, + { 0x2E, 0x25 }, + { 0x2F, 0x25 }, + { 0x30, 0x25 }, + { 0x28, 0x26 }, + { 0x29, 0x26 }, + { 0x2A, 0x26 }, + { 0x2B, 0x26 }, + { 0x2C, 0x26 }, + { 0x2D, 0x26 }, + { 0x2E, 0x26 }, + { 0x2F, 0x26 }, + { 0x30, 0x26 }, + { 0x28, 0x27 }, + { 0x29, 0x27 }, + { 0x2A, 0x27 }, + { 0x2B, 0x27 }, + { 0x2C, 0x27 }, + { 0x2D, 0x27 }, + { 0x2E, 0x27 }, + { 0x2F, 0x27 }, + { 0x30, 0x27 }, + { 0x28, 0x28 }, + { 0x29, 0x28 }, + { 0x2A, 0x28 }, + { 0x2B, 0x28 }, + { 0x2C, 0x28 }, + { 0x2D, 0x28 }, + { 0x2E, 0x28 }, + { 0x2F, 0x28 }, + { 0x30, 0x28 }, + { 0x29, 0x29 }, + { 0x2A, 0x29 }, + { 0x2B, 0x29 }, + { 0x2C, 0x29 }, + { 0x2D, 0x29 }, + { 0x2E, 0x29 }, + { 0x2F, 0x29 }, + { 0x2B, 0x2A }, + { 0x2C, 0x2A }, + { 0x2D, 0x2A }, + { 0xFF, 0xFF }, }; static const u8 (*sSpindaSpotsCoordsPtrs[4])[2] = { @@ -291,10 +291,10 @@ static const int sPokepicUVParams[4][2][4] = { }; static const int sPokepicShadowUVParams[4][4] = { - {0xA0, 0xA0, 0xE0, 0xB0}, - { 0xA0, 0xA0, 0xE0, 0xB0}, - { 0xA0, 0xB0, 0xE0, 0xC0}, - { 0xA0, 0xC0, 0xE0, 0xD0}, + { 0xA0, 0xA0, 0xE0, 0xB0 }, + { 0xA0, 0xA0, 0xE0, 0xB0 }, + { 0xA0, 0xB0, 0xE0, 0xC0 }, + { 0xA0, 0xC0, 0xE0, 0xD0 }, }; PokepicManager *PokepicManager_Create(HeapID heapId) { diff --git a/src/register_hall_of_fame.c b/src/register_hall_of_fame.c index 2b4f9efa30..2abf73f323 100644 --- a/src/register_hall_of_fame.c +++ b/src/register_hall_of_fame.c @@ -766,33 +766,33 @@ static const WindowTemplate sIndivMonsSceneWindowTemplates[7] = { }; static const RegHOFSpritePosScaleAnimParam sPicPosScaleAnimParams[27] = { - {168, -40, 96, 120, 1.0f, 1.0f }, - { -92, 88, 160, 120, 1.0f, 1.0f }, - { 348, 88, 56, 104, 1.0f, 1.0f }, - { 88, -40, 200, 104, 1.0f, 1.0f }, - { 336, 0, 40, 80, 1.0f, 1.0f }, - { -80, 0, 216, 80, 1.0f, 1.0f }, - { 93, 110, 99, 110, 1.0f, 1.0f }, - { 157, 110, 163, 110, 1.0f, 1.0f }, - { 53, 96, 59, 96, 1.0f, 1.0f }, - { 197, 96, 203, 96, 1.0f, 1.0f }, - { 37, 72, 43, 72, 1.0f, 1.0f }, - { 213, 72, 219, 72, 1.0f, 1.0f }, - { 125, 120, 131, 120, 1.0f, 1.0f }, - { 96, 120, 108, 100, 1.0f, 0.8f }, - { 160, 120, 148, 100, 1.0f, 0.8f }, - { 56, 104, 84, 90, 1.0f, 0.75f}, - { 200, 104, 170, 90, 1.0f, 0.75f}, - { 40, 80, 64, 75, 1.0f, 0.7f }, - { 216, 80, 190, 75, 1.0f, 0.7f }, - { 128, 128, 128, 120, 1.0f, 0.7f }, - { 96, 90, 108, 100, 1.0f, 0.9f }, - { 160, 90, 148, 100, 1.0f, 0.9f }, - { 56, 80, 84, 90, 1.0f, 0.8f }, - { 200, 80, 170, 90, 1.0f, 0.8f }, - { 40, 60, 64, 75, 1.0f, 0.75f}, - { 216, 60, 190, 75, 1.0f, 0.75f}, - { 128, 100, 128, 120, 1.0f, 0.8f }, + { 168, -40, 96, 120, 1.0f, 1.0f }, + { -92, 88, 160, 120, 1.0f, 1.0f }, + { 348, 88, 56, 104, 1.0f, 1.0f }, + { 88, -40, 200, 104, 1.0f, 1.0f }, + { 336, 0, 40, 80, 1.0f, 1.0f }, + { -80, 0, 216, 80, 1.0f, 1.0f }, + { 93, 110, 99, 110, 1.0f, 1.0f }, + { 157, 110, 163, 110, 1.0f, 1.0f }, + { 53, 96, 59, 96, 1.0f, 1.0f }, + { 197, 96, 203, 96, 1.0f, 1.0f }, + { 37, 72, 43, 72, 1.0f, 1.0f }, + { 213, 72, 219, 72, 1.0f, 1.0f }, + { 125, 120, 131, 120, 1.0f, 1.0f }, + { 96, 120, 108, 100, 1.0f, 0.8f }, + { 160, 120, 148, 100, 1.0f, 0.8f }, + { 56, 104, 84, 90, 1.0f, 0.75f }, + { 200, 104, 170, 90, 1.0f, 0.75f }, + { 40, 80, 64, 75, 1.0f, 0.7f }, + { 216, 80, 190, 75, 1.0f, 0.7f }, + { 128, 128, 128, 120, 1.0f, 0.7f }, + { 96, 90, 108, 100, 1.0f, 0.9f }, + { 160, 90, 148, 100, 1.0f, 0.9f }, + { 56, 80, 84, 90, 1.0f, 0.8f }, + { 200, 80, 170, 90, 1.0f, 0.8f }, + { 40, 60, 64, 75, 1.0f, 0.75f }, + { 216, 60, 190, 75, 1.0f, 0.75f }, + { 128, 100, 128, 120, 1.0f, 0.8f }, }; static const UnkTemplate_0200D748 sPicTemplates[21] = { @@ -812,27 +812,27 @@ static const UnkTemplate_0200D748 sPicTemplates[21] = { [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, - .vramTransfer = 0 }, - [1] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 1, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [2] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 2, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [3] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 3, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [4] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 4, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55518, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [5] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 5, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55519, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [6] = { .x = 168, .y = -40, .z = 0, .animation = 0, .spritePriority = 20, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55512, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [7] = { .x = -92, .y = 88, .z = 0, .animation = 0, .spritePriority = 21, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [8] = { .x = 348, .y = 88, .z = 0, .animation = 0, .spritePriority = 22, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [9] = { .x = 88, .y = -40, .z = 0, .animation = 0, .spritePriority = 23, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [10] = { .x = 336, .y = 0, .z = 0, .animation = 0, .spritePriority = 24, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55516, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [11] = { .x = -80, .y = 0, .z = 0, .animation = 0, .spritePriority = 25, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55517, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [12] = { .x = 93, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [13] = { .x = 157, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [14] = { .x = 53, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [15] = { .x = 197, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [16] = { .x = 37, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [17] = { .x = 213, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [18] = { .x = 128, .y = 128, .z = 0, .animation = 0, .spritePriority = 10, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55520, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0}, - [19] = { .x = 125, .y = 120, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0}, - [20] = { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55520, [GF_GFX_RES_TYPE_PLTT] = 55522, [GF_GFX_RES_TYPE_CELL] = 55515, [GF_GFX_RES_TYPE_ANIM] = 55515, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0} + .vramTransfer = 0 }, + [1] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 1, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [2] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 2, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [3] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 3, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55513, [GF_GFX_RES_TYPE_ANIM] = 55513, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [4] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 4, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55518, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [5] = { .x = 512, .y = 480, .z = 0, .animation = 0, .spritePriority = 5, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55518, [GF_GFX_RES_TYPE_PLTT] = 55519, [GF_GFX_RES_TYPE_CELL] = 55514, [GF_GFX_RES_TYPE_ANIM] = 55514, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [6] = { .x = 168, .y = -40, .z = 0, .animation = 0, .spritePriority = 20, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55512, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [7] = { .x = -92, .y = 88, .z = 0, .animation = 0, .spritePriority = 21, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55513, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [8] = { .x = 348, .y = 88, .z = 0, .animation = 0, .spritePriority = 22, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55514, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [9] = { .x = 88, .y = -40, .z = 0, .animation = 0, .spritePriority = 23, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55515, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [10] = { .x = 336, .y = 0, .z = 0, .animation = 0, .spritePriority = 24, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55516, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [11] = { .x = -80, .y = 0, .z = 0, .animation = 0, .spritePriority = 25, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55517, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [12] = { .x = 93, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55512, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [13] = { .x = 157, .y = 110, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55513, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [14] = { .x = 53, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55514, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [15] = { .x = 197, .y = 96, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55515, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [16] = { .x = 37, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55516, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [17] = { .x = 213, .y = 72, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55517, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [18] = { .x = 128, .y = 128, .z = 0, .animation = 0, .spritePriority = 10, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55520, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 }, + [19] = { .x = 125, .y = 120, .z = 0, .animation = 0, .spritePriority = 40, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55519, [GF_GFX_RES_TYPE_PLTT] = 55521, [GF_GFX_RES_TYPE_CELL] = 55512, [GF_GFX_RES_TYPE_ANIM] = 55512, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 3, .vramTransfer = 0 }, + [20] = { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { [GF_GFX_RES_TYPE_CHAR] = 55520, [GF_GFX_RES_TYPE_PLTT] = 55522, [GF_GFX_RES_TYPE_CELL] = 55515, [GF_GFX_RES_TYPE_ANIM] = 55515, [GF_GFX_RES_TYPE_MCEL] = -1, [GF_GFX_RES_TYPE_MANM] = -1 }, .bgPriority = 2, .vramTransfer = 0 } }; BOOL RegisterHallOfFame_Init(OVY_MANAGER *man, int *state) { diff --git a/src/ribbon.c b/src/ribbon.c index 2cd9d19bf6..c4c084643f 100644 --- a/src/ribbon.c +++ b/src/ribbon.c @@ -27,86 +27,86 @@ struct RibbonData { }; static const struct RibbonData sRibbonInfo[] = { - {MON_DATA_HOENN_CHAMPION_RIBBON, 72, 0, msg_0424_00000, RIBBON_DESC(FALSE, msg_0424_00080)}, - { MON_DATA_HOENN_COOL_RIBBON, 73, 0, msg_0424_00001, RIBBON_DESC(FALSE, msg_0424_00081)}, - { MON_DATA_HOENN_COOL_RIBBON_SUPER, 74, 0, msg_0424_00002, RIBBON_DESC(FALSE, msg_0424_00082)}, - { MON_DATA_HOENN_COOL_RIBBON_HYPER, 75, 0, msg_0424_00003, RIBBON_DESC(FALSE, msg_0424_00083)}, - { MON_DATA_HOENN_COOL_RIBBON_MASTER, 76, 0, msg_0424_00004, RIBBON_DESC(FALSE, msg_0424_00084)}, - { MON_DATA_HOENN_BEAUTY_RIBBON, 73, 1, msg_0424_00005, RIBBON_DESC(FALSE, msg_0424_00085)}, - { MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, 74, 1, msg_0424_00006, RIBBON_DESC(FALSE, msg_0424_00086)}, - { MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, 75, 1, msg_0424_00007, RIBBON_DESC(FALSE, msg_0424_00087)}, - { MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, 76, 1, msg_0424_00008, RIBBON_DESC(FALSE, msg_0424_00088)}, - { MON_DATA_HOENN_CUTE_RIBBON, 73, 2, msg_0424_00009, RIBBON_DESC(FALSE, msg_0424_00089)}, - { MON_DATA_HOENN_CUTE_RIBBON_SUPER, 74, 2, msg_0424_00010, RIBBON_DESC(FALSE, msg_0424_00090)}, - { MON_DATA_HOENN_CUTE_RIBBON_HYPER, 75, 2, msg_0424_00011, RIBBON_DESC(FALSE, msg_0424_00091)}, - { MON_DATA_HOENN_CUTE_RIBBON_MASTER, 76, 2, msg_0424_00012, RIBBON_DESC(FALSE, msg_0424_00092)}, - { MON_DATA_HOENN_SMART_RIBBON, 73, 3, msg_0424_00013, RIBBON_DESC(FALSE, msg_0424_00093)}, - { MON_DATA_HOENN_SMART_RIBBON_SUPER, 74, 3, msg_0424_00014, RIBBON_DESC(FALSE, msg_0424_00094)}, - { MON_DATA_HOENN_SMART_RIBBON_HYPER, 75, 3, msg_0424_00015, RIBBON_DESC(FALSE, msg_0424_00095)}, - { MON_DATA_HOENN_SMART_RIBBON_MASTER, 76, 3, msg_0424_00016, RIBBON_DESC(FALSE, msg_0424_00096)}, - { MON_DATA_HOENN_TOUGH_RIBBON, 73, 4, msg_0424_00017, RIBBON_DESC(FALSE, msg_0424_00097)}, - { MON_DATA_HOENN_TOUGH_RIBBON_SUPER, 74, 4, msg_0424_00018, RIBBON_DESC(FALSE, msg_0424_00098)}, - { MON_DATA_HOENN_TOUGH_RIBBON_HYPER, 75, 4, msg_0424_00019, RIBBON_DESC(FALSE, msg_0424_00099)}, - { MON_DATA_HOENN_TOUGH_RIBBON_MASTER, 76, 4, msg_0424_00020, RIBBON_DESC(FALSE, msg_0424_00100)}, - { MON_DATA_HOENN_WINNING_RIBBON, 78, 0, msg_0424_00021, RIBBON_DESC(FALSE, msg_0424_00101)}, - { MON_DATA_HOENN_VICTORY_RIBBON, 77, 0, msg_0424_00022, RIBBON_DESC(FALSE, msg_0424_00102)}, - { MON_DATA_HOENN_ARTIST_RIBBON, 79, 1, msg_0424_00023, RIBBON_DESC(FALSE, msg_0424_00103)}, - { MON_DATA_HOENN_EFFORT_RIBBON, 80, 2, msg_0424_00024, RIBBON_DESC(FALSE, msg_0424_00104)}, - { MON_DATA_HOENN_MARINE_RIBBON, 81, 1, msg_0424_00025, RIBBON_DESC(TRUE, 0) }, - { MON_DATA_HOENN_LAND_RIBBON, 81, 3, msg_0424_00026, RIBBON_DESC(TRUE, 1) }, - { MON_DATA_HOENN_SKY_RIBBON, 81, 4, msg_0424_00027, RIBBON_DESC(TRUE, 2) }, - { MON_DATA_HOENN_COUNTRY_RIBBON, 82, 3, msg_0424_00028, RIBBON_DESC(FALSE, msg_0424_00178)}, - { MON_DATA_HOENN_NATIONAL_RIBBON, 82, 4, msg_0424_00029, RIBBON_DESC(FALSE, msg_0424_00190)}, - { MON_DATA_HOENN_EARTH_RIBBON, 83, 0, msg_0424_00030, RIBBON_DESC(FALSE, msg_0424_00191)}, - { MON_DATA_HOENN_WORLD_RIBBON, 83, 1, msg_0424_00031, RIBBON_DESC(FALSE, msg_0424_00178)}, - { MON_DATA_SINNOH_CHAMP_RIBBON, 88, 0, msg_0424_00032, RIBBON_DESC(FALSE, msg_0424_00105)}, - { MON_DATA_COOL_RIBBON, 89, 0, msg_0424_00033, RIBBON_DESC(FALSE, msg_0424_00106)}, - { MON_DATA_COOL_RIBBON_GREAT, 90, 0, msg_0424_00034, RIBBON_DESC(FALSE, msg_0424_00107)}, - { MON_DATA_COOL_RIBBON_ULTRA, 91, 0, msg_0424_00035, RIBBON_DESC(FALSE, msg_0424_00108)}, - { MON_DATA_COOL_RIBBON_MASTER, 92, 0, msg_0424_00036, RIBBON_DESC(FALSE, msg_0424_00109)}, - { MON_DATA_BEAUTY_RIBBON, 89, 1, msg_0424_00037, RIBBON_DESC(FALSE, msg_0424_00110)}, - { MON_DATA_BEAUTY_RIBBON_GREAT, 90, 1, msg_0424_00038, RIBBON_DESC(FALSE, msg_0424_00111)}, - { MON_DATA_BEAUTY_RIBBON_ULTRA, 91, 1, msg_0424_00039, RIBBON_DESC(FALSE, msg_0424_00112)}, - { MON_DATA_BEAUTY_RIBBON_MASTER, 92, 1, msg_0424_00040, RIBBON_DESC(FALSE, msg_0424_00113)}, - { MON_DATA_CUTE_RIBBON, 89, 2, msg_0424_00041, RIBBON_DESC(FALSE, msg_0424_00114)}, - { MON_DATA_CUTE_RIBBON_GREAT, 90, 2, msg_0424_00042, RIBBON_DESC(FALSE, msg_0424_00115)}, - { MON_DATA_CUTE_RIBBON_ULTRA, 91, 2, msg_0424_00043, RIBBON_DESC(FALSE, msg_0424_00116)}, - { MON_DATA_CUTE_RIBBON_MASTER, 92, 2, msg_0424_00044, RIBBON_DESC(FALSE, msg_0424_00117)}, - { MON_DATA_SMART_RIBBON, 89, 3, msg_0424_00045, RIBBON_DESC(FALSE, msg_0424_00118)}, - { MON_DATA_SMART_RIBBON_GREAT, 90, 3, msg_0424_00046, RIBBON_DESC(FALSE, msg_0424_00119)}, - { MON_DATA_SMART_RIBBON_ULTRA, 91, 3, msg_0424_00047, RIBBON_DESC(FALSE, msg_0424_00120)}, - { MON_DATA_SMART_RIBBON_MASTER, 92, 3, msg_0424_00048, RIBBON_DESC(FALSE, msg_0424_00121)}, - { MON_DATA_TOUGH_RIBBON, 89, 4, msg_0424_00049, RIBBON_DESC(FALSE, msg_0424_00122)}, - { MON_DATA_TOUGH_RIBBON_GREAT, 90, 4, msg_0424_00050, RIBBON_DESC(FALSE, msg_0424_00123)}, - { MON_DATA_TOUGH_RIBBON_ULTRA, 91, 4, msg_0424_00051, RIBBON_DESC(FALSE, msg_0424_00124)}, - { MON_DATA_TOUGH_RIBBON_MASTER, 92, 4, msg_0424_00052, RIBBON_DESC(FALSE, msg_0424_00125)}, - { MON_DATA_ABILITY_RIBBON, 93, 0, msg_0424_00053, RIBBON_DESC(FALSE, msg_0424_00126)}, - { MON_DATA_GREAT_ABILITY_RIBBON, 94, 0, msg_0424_00054, RIBBON_DESC(FALSE, msg_0424_00127)}, - { MON_DATA_DOUBLE_ABILITY_RIBBON, 95, 0, msg_0424_00055, RIBBON_DESC(FALSE, msg_0424_00128)}, - { MON_DATA_MULTI_ABILITY_RIBBON, 96, 0, msg_0424_00056, RIBBON_DESC(FALSE, msg_0424_00129)}, - { MON_DATA_PAIR_ABILITY_RIBBON, 97, 0, msg_0424_00057, RIBBON_DESC(FALSE, msg_0424_00130)}, - { MON_DATA_WORLD_ABILITY_RIBBON, 98, 0, msg_0424_00058, RIBBON_DESC(FALSE, msg_0424_00131)}, - { MON_DATA_ALERT_RIBBON, 99, 2, msg_0424_00059, RIBBON_DESC(FALSE, msg_0424_00132)}, - { MON_DATA_SHOCK_RIBBON, 100, 0, msg_0424_00060, RIBBON_DESC(FALSE, msg_0424_00133)}, - { MON_DATA_DOWNCAST_RIBBON, 101, 1, msg_0424_00061, RIBBON_DESC(FALSE, msg_0424_00134)}, - { MON_DATA_CARELESS_RIBBON, 102, 2, msg_0424_00062, RIBBON_DESC(FALSE, msg_0424_00135)}, - { MON_DATA_RELAX_RIBBON, 103, 3, msg_0424_00063, RIBBON_DESC(FALSE, msg_0424_00136)}, - { MON_DATA_SNOOZE_RIBBON, 104, 0, msg_0424_00064, RIBBON_DESC(FALSE, msg_0424_00137)}, - { MON_DATA_SMILE_RIBBON, 105, 2, msg_0424_00065, RIBBON_DESC(FALSE, msg_0424_00138)}, - { MON_DATA_GORGEOUS_RIBBON, 106, 1, msg_0424_00066, RIBBON_DESC(FALSE, msg_0424_00139)}, - { MON_DATA_ROYAL_RIBBON, 107, 3, msg_0424_00067, RIBBON_DESC(FALSE, msg_0424_00140)}, - { MON_DATA_GORGEOUS_ROYAL_RIBBON, 108, 0, msg_0424_00068, RIBBON_DESC(FALSE, msg_0424_00141)}, - { MON_DATA_FOOTPRINT_RIBBON, 109, 0, msg_0424_00069, RIBBON_DESC(FALSE, msg_0424_00142)}, - { MON_DATA_RECORD_RIBBON, 110, 1, msg_0424_00070, RIBBON_DESC(FALSE, msg_0424_00143)}, - { MON_DATA_HISTORY_RIBBON, 111, 3, msg_0424_00071, RIBBON_DESC(FALSE, msg_0424_00144)}, - { MON_DATA_LEGEND_RIBBON, 112, 0, msg_0424_00072, RIBBON_DESC(FALSE, msg_0424_00145)}, - { MON_DATA_RED_RIBBON, 113, 0, msg_0424_00073, RIBBON_DESC(TRUE, 7) }, - { MON_DATA_GREEN_RIBBON, 114, 3, msg_0424_00074, RIBBON_DESC(TRUE, 8) }, - { MON_DATA_BLUE_RIBBON, 115, 1, msg_0424_00075, RIBBON_DESC(TRUE, 9) }, - { MON_DATA_FESTIVAL_RIBBON, 116, 1, msg_0424_00076, RIBBON_DESC(TRUE, 10) }, - { MON_DATA_CARNIVAL_RIBBON, 117, 0, msg_0424_00077, RIBBON_DESC(TRUE, 11) }, - { MON_DATA_CLASSIC_RIBBON, 118, 1, msg_0424_00078, RIBBON_DESC(TRUE, 12) }, - { MON_DATA_PREMIER_RIBBON, 119, 0, msg_0424_00079, RIBBON_DESC(TRUE, 13) }, + { MON_DATA_HOENN_CHAMPION_RIBBON, 72, 0, msg_0424_00000, RIBBON_DESC(FALSE, msg_0424_00080) }, + { MON_DATA_HOENN_COOL_RIBBON, 73, 0, msg_0424_00001, RIBBON_DESC(FALSE, msg_0424_00081) }, + { MON_DATA_HOENN_COOL_RIBBON_SUPER, 74, 0, msg_0424_00002, RIBBON_DESC(FALSE, msg_0424_00082) }, + { MON_DATA_HOENN_COOL_RIBBON_HYPER, 75, 0, msg_0424_00003, RIBBON_DESC(FALSE, msg_0424_00083) }, + { MON_DATA_HOENN_COOL_RIBBON_MASTER, 76, 0, msg_0424_00004, RIBBON_DESC(FALSE, msg_0424_00084) }, + { MON_DATA_HOENN_BEAUTY_RIBBON, 73, 1, msg_0424_00005, RIBBON_DESC(FALSE, msg_0424_00085) }, + { MON_DATA_HOENN_BEAUTY_RIBBON_SUPER, 74, 1, msg_0424_00006, RIBBON_DESC(FALSE, msg_0424_00086) }, + { MON_DATA_HOENN_BEAUTY_RIBBON_HYPER, 75, 1, msg_0424_00007, RIBBON_DESC(FALSE, msg_0424_00087) }, + { MON_DATA_HOENN_BEAUTY_RIBBON_MASTER, 76, 1, msg_0424_00008, RIBBON_DESC(FALSE, msg_0424_00088) }, + { MON_DATA_HOENN_CUTE_RIBBON, 73, 2, msg_0424_00009, RIBBON_DESC(FALSE, msg_0424_00089) }, + { MON_DATA_HOENN_CUTE_RIBBON_SUPER, 74, 2, msg_0424_00010, RIBBON_DESC(FALSE, msg_0424_00090) }, + { MON_DATA_HOENN_CUTE_RIBBON_HYPER, 75, 2, msg_0424_00011, RIBBON_DESC(FALSE, msg_0424_00091) }, + { MON_DATA_HOENN_CUTE_RIBBON_MASTER, 76, 2, msg_0424_00012, RIBBON_DESC(FALSE, msg_0424_00092) }, + { MON_DATA_HOENN_SMART_RIBBON, 73, 3, msg_0424_00013, RIBBON_DESC(FALSE, msg_0424_00093) }, + { MON_DATA_HOENN_SMART_RIBBON_SUPER, 74, 3, msg_0424_00014, RIBBON_DESC(FALSE, msg_0424_00094) }, + { MON_DATA_HOENN_SMART_RIBBON_HYPER, 75, 3, msg_0424_00015, RIBBON_DESC(FALSE, msg_0424_00095) }, + { MON_DATA_HOENN_SMART_RIBBON_MASTER, 76, 3, msg_0424_00016, RIBBON_DESC(FALSE, msg_0424_00096) }, + { MON_DATA_HOENN_TOUGH_RIBBON, 73, 4, msg_0424_00017, RIBBON_DESC(FALSE, msg_0424_00097) }, + { MON_DATA_HOENN_TOUGH_RIBBON_SUPER, 74, 4, msg_0424_00018, RIBBON_DESC(FALSE, msg_0424_00098) }, + { MON_DATA_HOENN_TOUGH_RIBBON_HYPER, 75, 4, msg_0424_00019, RIBBON_DESC(FALSE, msg_0424_00099) }, + { MON_DATA_HOENN_TOUGH_RIBBON_MASTER, 76, 4, msg_0424_00020, RIBBON_DESC(FALSE, msg_0424_00100) }, + { MON_DATA_HOENN_WINNING_RIBBON, 78, 0, msg_0424_00021, RIBBON_DESC(FALSE, msg_0424_00101) }, + { MON_DATA_HOENN_VICTORY_RIBBON, 77, 0, msg_0424_00022, RIBBON_DESC(FALSE, msg_0424_00102) }, + { MON_DATA_HOENN_ARTIST_RIBBON, 79, 1, msg_0424_00023, RIBBON_DESC(FALSE, msg_0424_00103) }, + { MON_DATA_HOENN_EFFORT_RIBBON, 80, 2, msg_0424_00024, RIBBON_DESC(FALSE, msg_0424_00104) }, + { MON_DATA_HOENN_MARINE_RIBBON, 81, 1, msg_0424_00025, RIBBON_DESC(TRUE, 0) }, + { MON_DATA_HOENN_LAND_RIBBON, 81, 3, msg_0424_00026, RIBBON_DESC(TRUE, 1) }, + { MON_DATA_HOENN_SKY_RIBBON, 81, 4, msg_0424_00027, RIBBON_DESC(TRUE, 2) }, + { MON_DATA_HOENN_COUNTRY_RIBBON, 82, 3, msg_0424_00028, RIBBON_DESC(FALSE, msg_0424_00178) }, + { MON_DATA_HOENN_NATIONAL_RIBBON, 82, 4, msg_0424_00029, RIBBON_DESC(FALSE, msg_0424_00190) }, + { MON_DATA_HOENN_EARTH_RIBBON, 83, 0, msg_0424_00030, RIBBON_DESC(FALSE, msg_0424_00191) }, + { MON_DATA_HOENN_WORLD_RIBBON, 83, 1, msg_0424_00031, RIBBON_DESC(FALSE, msg_0424_00178) }, + { MON_DATA_SINNOH_CHAMP_RIBBON, 88, 0, msg_0424_00032, RIBBON_DESC(FALSE, msg_0424_00105) }, + { MON_DATA_COOL_RIBBON, 89, 0, msg_0424_00033, RIBBON_DESC(FALSE, msg_0424_00106) }, + { MON_DATA_COOL_RIBBON_GREAT, 90, 0, msg_0424_00034, RIBBON_DESC(FALSE, msg_0424_00107) }, + { MON_DATA_COOL_RIBBON_ULTRA, 91, 0, msg_0424_00035, RIBBON_DESC(FALSE, msg_0424_00108) }, + { MON_DATA_COOL_RIBBON_MASTER, 92, 0, msg_0424_00036, RIBBON_DESC(FALSE, msg_0424_00109) }, + { MON_DATA_BEAUTY_RIBBON, 89, 1, msg_0424_00037, RIBBON_DESC(FALSE, msg_0424_00110) }, + { MON_DATA_BEAUTY_RIBBON_GREAT, 90, 1, msg_0424_00038, RIBBON_DESC(FALSE, msg_0424_00111) }, + { MON_DATA_BEAUTY_RIBBON_ULTRA, 91, 1, msg_0424_00039, RIBBON_DESC(FALSE, msg_0424_00112) }, + { MON_DATA_BEAUTY_RIBBON_MASTER, 92, 1, msg_0424_00040, RIBBON_DESC(FALSE, msg_0424_00113) }, + { MON_DATA_CUTE_RIBBON, 89, 2, msg_0424_00041, RIBBON_DESC(FALSE, msg_0424_00114) }, + { MON_DATA_CUTE_RIBBON_GREAT, 90, 2, msg_0424_00042, RIBBON_DESC(FALSE, msg_0424_00115) }, + { MON_DATA_CUTE_RIBBON_ULTRA, 91, 2, msg_0424_00043, RIBBON_DESC(FALSE, msg_0424_00116) }, + { MON_DATA_CUTE_RIBBON_MASTER, 92, 2, msg_0424_00044, RIBBON_DESC(FALSE, msg_0424_00117) }, + { MON_DATA_SMART_RIBBON, 89, 3, msg_0424_00045, RIBBON_DESC(FALSE, msg_0424_00118) }, + { MON_DATA_SMART_RIBBON_GREAT, 90, 3, msg_0424_00046, RIBBON_DESC(FALSE, msg_0424_00119) }, + { MON_DATA_SMART_RIBBON_ULTRA, 91, 3, msg_0424_00047, RIBBON_DESC(FALSE, msg_0424_00120) }, + { MON_DATA_SMART_RIBBON_MASTER, 92, 3, msg_0424_00048, RIBBON_DESC(FALSE, msg_0424_00121) }, + { MON_DATA_TOUGH_RIBBON, 89, 4, msg_0424_00049, RIBBON_DESC(FALSE, msg_0424_00122) }, + { MON_DATA_TOUGH_RIBBON_GREAT, 90, 4, msg_0424_00050, RIBBON_DESC(FALSE, msg_0424_00123) }, + { MON_DATA_TOUGH_RIBBON_ULTRA, 91, 4, msg_0424_00051, RIBBON_DESC(FALSE, msg_0424_00124) }, + { MON_DATA_TOUGH_RIBBON_MASTER, 92, 4, msg_0424_00052, RIBBON_DESC(FALSE, msg_0424_00125) }, + { MON_DATA_ABILITY_RIBBON, 93, 0, msg_0424_00053, RIBBON_DESC(FALSE, msg_0424_00126) }, + { MON_DATA_GREAT_ABILITY_RIBBON, 94, 0, msg_0424_00054, RIBBON_DESC(FALSE, msg_0424_00127) }, + { MON_DATA_DOUBLE_ABILITY_RIBBON, 95, 0, msg_0424_00055, RIBBON_DESC(FALSE, msg_0424_00128) }, + { MON_DATA_MULTI_ABILITY_RIBBON, 96, 0, msg_0424_00056, RIBBON_DESC(FALSE, msg_0424_00129) }, + { MON_DATA_PAIR_ABILITY_RIBBON, 97, 0, msg_0424_00057, RIBBON_DESC(FALSE, msg_0424_00130) }, + { MON_DATA_WORLD_ABILITY_RIBBON, 98, 0, msg_0424_00058, RIBBON_DESC(FALSE, msg_0424_00131) }, + { MON_DATA_ALERT_RIBBON, 99, 2, msg_0424_00059, RIBBON_DESC(FALSE, msg_0424_00132) }, + { MON_DATA_SHOCK_RIBBON, 100, 0, msg_0424_00060, RIBBON_DESC(FALSE, msg_0424_00133) }, + { MON_DATA_DOWNCAST_RIBBON, 101, 1, msg_0424_00061, RIBBON_DESC(FALSE, msg_0424_00134) }, + { MON_DATA_CARELESS_RIBBON, 102, 2, msg_0424_00062, RIBBON_DESC(FALSE, msg_0424_00135) }, + { MON_DATA_RELAX_RIBBON, 103, 3, msg_0424_00063, RIBBON_DESC(FALSE, msg_0424_00136) }, + { MON_DATA_SNOOZE_RIBBON, 104, 0, msg_0424_00064, RIBBON_DESC(FALSE, msg_0424_00137) }, + { MON_DATA_SMILE_RIBBON, 105, 2, msg_0424_00065, RIBBON_DESC(FALSE, msg_0424_00138) }, + { MON_DATA_GORGEOUS_RIBBON, 106, 1, msg_0424_00066, RIBBON_DESC(FALSE, msg_0424_00139) }, + { MON_DATA_ROYAL_RIBBON, 107, 3, msg_0424_00067, RIBBON_DESC(FALSE, msg_0424_00140) }, + { MON_DATA_GORGEOUS_ROYAL_RIBBON, 108, 0, msg_0424_00068, RIBBON_DESC(FALSE, msg_0424_00141) }, + { MON_DATA_FOOTPRINT_RIBBON, 109, 0, msg_0424_00069, RIBBON_DESC(FALSE, msg_0424_00142) }, + { MON_DATA_RECORD_RIBBON, 110, 1, msg_0424_00070, RIBBON_DESC(FALSE, msg_0424_00143) }, + { MON_DATA_HISTORY_RIBBON, 111, 3, msg_0424_00071, RIBBON_DESC(FALSE, msg_0424_00144) }, + { MON_DATA_LEGEND_RIBBON, 112, 0, msg_0424_00072, RIBBON_DESC(FALSE, msg_0424_00145) }, + { MON_DATA_RED_RIBBON, 113, 0, msg_0424_00073, RIBBON_DESC(TRUE, 7) }, + { MON_DATA_GREEN_RIBBON, 114, 3, msg_0424_00074, RIBBON_DESC(TRUE, 8) }, + { MON_DATA_BLUE_RIBBON, 115, 1, msg_0424_00075, RIBBON_DESC(TRUE, 9) }, + { MON_DATA_FESTIVAL_RIBBON, 116, 1, msg_0424_00076, RIBBON_DESC(TRUE, 10) }, + { MON_DATA_CARNIVAL_RIBBON, 117, 0, msg_0424_00077, RIBBON_DESC(TRUE, 11) }, + { MON_DATA_CLASSIC_RIBBON, 118, 1, msg_0424_00078, RIBBON_DESC(TRUE, 12) }, + { MON_DATA_PREMIER_RIBBON, 119, 0, msg_0424_00079, RIBBON_DESC(TRUE, 13) }, }; u32 GetRibbonAttr(u8 ribbon, RibbonAttr attr) { diff --git a/src/safari_zone.c b/src/safari_zone.c index 9181d11256..79442fc960 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -9,16 +9,16 @@ #include "string_util.h" static const u8 sSafariZoneDefaultAreaSets[10][SAFARI_ZONE_MAX_AREAS_PER_SET] = { - {SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_FOREST }, - { SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SWAMP }, - { SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MARSHLAND}, - { SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND}, - { SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MOUNTAIN }, - { SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SAVANNAH }, - { SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_PLAINS }, - { SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MEADOW }, - { SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WETLAND }, - { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND}, + { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_FOREST }, + { SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SWAMP }, + { SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MARSHLAND }, + { SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND }, + { SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MOUNTAIN }, + { SAFARI_ZONE_AREA_MARSHLAND, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_SAVANNAH }, + { SAFARI_ZONE_AREA_WASTELAND, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_PLAINS }, + { SAFARI_ZONE_AREA_MOUNTAIN, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_MEADOW }, + { SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_FOREST, SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_MEADOW, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WETLAND }, + { SAFARI_ZONE_AREA_PLAINS, SAFARI_ZONE_AREA_SAVANNAH, SAFARI_ZONE_AREA_WETLAND, SAFARI_ZONE_AREA_SWAMP, SAFARI_ZONE_AREA_PEAK, SAFARI_ZONE_AREA_WASTELAND }, }; u32 Save_SafariZone_sizeof(void) { diff --git a/src/save_misc.c b/src/save_misc.c index e1b02b9371..9230c95ce1 100644 --- a/src/save_misc.c +++ b/src/save_misc.c @@ -107,9 +107,9 @@ void SaveMisc_GetFavoriteMon(SAVE_MISC_DATA *saveMiscData, int *species, int *fo } static const u8 _020F677C[3][2] = { - {0, 4}, - { 4, 2}, - { 6, 2}, + { 0, 4 }, + { 4, 2 }, + { 6, 2 }, }; BOOL sub_0202AA44(SAVE_MISC_DATA *saveMiscData, int a1, int a2) { diff --git a/src/save_rankings.c b/src/save_rankings.c index 0a9d5cbb0e..1fab48e0b4 100644 --- a/src/save_rankings.c +++ b/src/save_rankings.c @@ -43,9 +43,9 @@ static void SaveRankings_GetSorted(SaveRankings *saveRankings, SaveRankingsSortB static void SaveRankings_GetSortedScoped(SaveRankings *saveRankings, int groupId, u8 statIdx, SaveRankingsEntry **filteredEntries, u8 filteredEntriesCnt, HeapID heapId); static const u8 sPageOffsets[][2] = { - {RANKINGS_RECORD_BATTLE_TOWER_COUNT, RANKINGS_RECORD_BATTLE_TOWER_BEGIN}, - { RANKINGS_RECORD_POKEMON_COUNT, RANKINGS_RECORD_POKEMON_BEGIN }, - { RANKINGS_RECORD_CONTEST_COUNT, RANKINGS_RECORD_CONTEST_BEGIN }, + { RANKINGS_RECORD_BATTLE_TOWER_COUNT, RANKINGS_RECORD_BATTLE_TOWER_BEGIN }, + { RANKINGS_RECORD_POKEMON_COUNT, RANKINGS_RECORD_POKEMON_BEGIN }, + { RANKINGS_RECORD_CONTEST_COUNT, RANKINGS_RECORD_CONTEST_BEGIN }, }; static const int sStatIDs[] = { diff --git a/src/save_wifi_history.c b/src/save_wifi_history.c index 80c3e1fb20..fab72dfe9f 100644 --- a/src/save_wifi_history.c +++ b/src/save_wifi_history.c @@ -12,7 +12,7 @@ struct SaveWiFiHistory { u8 country; u8 region; u8 seenLocations[SAVE_WIFI_HISTORY_COUNTRY_MAX * SAVE_WIFI_HISTORY_REGION_WIDTH]; // does not match as a 2d array -}; // size: 0xFF8 +}; // size: 0xFF8 u32 Save_WiFiHistory_sizeof(void) { return sizeof(SaveWiFiHistory); diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index 8dd5962003..c5ed7f3374 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -51,53 +51,53 @@ typedef struct WinStreakBP { } WinStreakBP; static const WinStreakBP battleHallWinStreakBP[] = { - {10, 1 }, - { 30, 3 }, - { 50, 5 }, - { 100, 5 }, - { 150, 5 }, - { 200, 5 }, - { 250, 5 }, - { 300, 5 }, - { 350, 5 }, - { 400, 5 }, - { 450, 5 }, - { 500, 10 }, - { 600, 10 }, - { 700, 10 }, - { 800, 10 }, - { 900, 10 }, - { 1000, 10 }, - { 1200, 30 }, - { 1400, 30 }, - { 1600, 30 }, - { 1800, 30 }, - { 2000, 50 }, - { 2500, 50 }, - { 3000, 50 }, - { 3500, 50 }, - { 4000, 50 }, - { 4500, 50 }, - { 5000, 50 }, - { 5500, 50 }, - { 6000, 50 }, - { 6500, 50 }, - { 7000, 50 }, - { 7500, 50 }, - { 8000, 50 }, - { 8500, 50 }, - { 9000, 50 }, - { 9500, 50 }, - { 10000, 100 }, - { 20000, 200 }, - { 30000, 300 }, - { 40000, 400 }, - { 50000, 500 }, - { 60000, 600 }, - { 70000, 700 }, - { 80000, 800 }, - { 90000, 900 }, - { 100000, 1000}, + { 10, 1 }, + { 30, 3 }, + { 50, 5 }, + { 100, 5 }, + { 150, 5 }, + { 200, 5 }, + { 250, 5 }, + { 300, 5 }, + { 350, 5 }, + { 400, 5 }, + { 450, 5 }, + { 500, 10 }, + { 600, 10 }, + { 700, 10 }, + { 800, 10 }, + { 900, 10 }, + { 1000, 10 }, + { 1200, 30 }, + { 1400, 30 }, + { 1600, 30 }, + { 1800, 30 }, + { 2000, 50 }, + { 2500, 50 }, + { 3000, 50 }, + { 3500, 50 }, + { 4000, 50 }, + { 4500, 50 }, + { 5000, 50 }, + { 5500, 50 }, + { 6000, 50 }, + { 6500, 50 }, + { 7000, 50 }, + { 7500, 50 }, + { 8000, 50 }, + { 8500, 50 }, + { 9000, 50 }, + { 9500, 50 }, + { 10000, 100 }, + { 20000, 200 }, + { 30000, 300 }, + { 40000, 400 }, + { 50000, 500 }, + { 60000, 600 }, + { 70000, 700 }, + { 80000, 800 }, + { 90000, 900 }, + { 100000, 1000 }, }; static BOOL BattleHall_DoesPartyContainEligibleMons(s32, SaveData *); diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index fad548ae2c..266a0b4b8a 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -132,13 +132,13 @@ static const WindowTemplate _020FAC94 = { }; static const u8 sConditionTable[6][3] = { - //< = > - {1, 0, 0}, // lt - { 0, 1, 0}, // eq - { 0, 0, 1}, // gt - { 1, 1, 0}, // le - { 0, 1, 1}, // ge - { 1, 0, 1}, // ne + //< = > + { 1, 0, 0 }, // lt + { 0, 1, 0 }, // eq + { 0, 0, 1 }, // gt + { 1, 1, 0 }, // le + { 0, 1, 1 }, // ge + { 1, 0, 1 }, // ne }; static u8 _021D415C; @@ -4755,9 +4755,9 @@ BOOL ScrCmd_OpenPhotoAlbum(ScriptContext *ctx) { BOOL ScrCmd_PlaceStarterBallsInElmsLab(ScriptContext *ctx) { FieldSystem *fieldSystem = ctx->fieldSystem; const VecFx32 ballCoords[3] = { - {FX32_CONST(131), 0, FX32_CONST(65)}, - { FX32_CONST(141), 0, FX32_CONST(65)}, - { FX32_CONST(136), 0, FX32_CONST(72)}, + { FX32_CONST(131), 0, FX32_CONST(65) }, + { FX32_CONST(141), 0, FX32_CONST(65) }, + { FX32_CONST(136), 0, FX32_CONST(72) }, }; int n, i; diff --git a/src/scrcmd_dppl_prizes.c b/src/scrcmd_dppl_prizes.c index 73384c8760..48d1e9690d 100644 --- a/src/scrcmd_dppl_prizes.c +++ b/src/scrcmd_dppl_prizes.c @@ -1,25 +1,25 @@ #include "scrcmd.h" static const u16 sDPPlGameCornerPrizeMap[][2] = { - {ITEM_SILK_SCARF, 1000 }, - { ITEM_WIDE_LENS, 1000 }, - { ITEM_ZOOM_LENS, 1000 }, - { ITEM_METRONOME, 1000 }, - { ITEM_TM90, 2000 }, - { ITEM_TM58, 2000 }, - { ITEM_TM75, 4000 }, - { ITEM_TM32, 4000 }, - { ITEM_TM44, 6000 }, - { ITEM_TM89, 6000 }, - { ITEM_TM10, 6000 }, - { ITEM_TM27, 8000 }, - { ITEM_TM21, 8000 }, - { ITEM_TM35, 10000}, - { ITEM_TM24, 10000}, - { ITEM_TM13, 10000}, - { ITEM_TM29, 10000}, - { ITEM_TM74, 15000}, - { ITEM_TM68, 20000}, + { ITEM_SILK_SCARF, 1000 }, + { ITEM_WIDE_LENS, 1000 }, + { ITEM_ZOOM_LENS, 1000 }, + { ITEM_METRONOME, 1000 }, + { ITEM_TM90, 2000 }, + { ITEM_TM58, 2000 }, + { ITEM_TM75, 4000 }, + { ITEM_TM32, 4000 }, + { ITEM_TM44, 6000 }, + { ITEM_TM89, 6000 }, + { ITEM_TM10, 6000 }, + { ITEM_TM27, 8000 }, + { ITEM_TM21, 8000 }, + { ITEM_TM35, 10000 }, + { ITEM_TM24, 10000 }, + { ITEM_TM13, 10000 }, + { ITEM_TM29, 10000 }, + { ITEM_TM74, 15000 }, + { ITEM_TM68, 20000 }, }; BOOL ScrCmd_GetDPPlPrizeItemIdAndCost(ScriptContext *ctx) { diff --git a/src/scrcmd_fossils.c b/src/scrcmd_fossils.c index 837fdd7c8c..cbf0b914aa 100644 --- a/src/scrcmd_fossils.c +++ b/src/scrcmd_fossils.c @@ -6,13 +6,13 @@ #include "scrcmd.h" static const u16 sFossilPokemonMap[7][2] = { - {ITEM_OLD_AMBER, SPECIES_AERODACTYL}, - { ITEM_HELIX_FOSSIL, SPECIES_OMANYTE }, - { ITEM_DOME_FOSSIL, SPECIES_KABUTO }, - { ITEM_ROOT_FOSSIL, SPECIES_LILEEP }, - { ITEM_CLAW_FOSSIL, SPECIES_ANORITH }, - { ITEM_ARMOR_FOSSIL, SPECIES_SHIELDON }, - { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, + { ITEM_OLD_AMBER, SPECIES_AERODACTYL }, + { ITEM_HELIX_FOSSIL, SPECIES_OMANYTE }, + { ITEM_DOME_FOSSIL, SPECIES_KABUTO }, + { ITEM_ROOT_FOSSIL, SPECIES_LILEEP }, + { ITEM_CLAW_FOSSIL, SPECIES_ANORITH }, + { ITEM_ARMOR_FOSSIL, SPECIES_SHIELDON }, + { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, }; BOOL ScrCmd_CountFossils(ScriptContext *ctx) { diff --git a/src/scrcmd_mart.c b/src/scrcmd_mart.c index ad8ebb9aab..4b4c58c3bd 100644 --- a/src/scrcmd_mart.c +++ b/src/scrcmd_mart.c @@ -15,25 +15,25 @@ struct BadgeMartItems { }; const struct BadgeMartItems _020FBF22[] = { - {ITEM_POKE_BALL, 1}, - { ITEM_GREAT_BALL, 3}, - { ITEM_ULTRA_BALL, 4}, - { ITEM_POTION, 1}, - { ITEM_SUPER_POTION, 2}, - { ITEM_HYPER_POTION, 4}, - { ITEM_MAX_POTION, 5}, - { ITEM_FULL_RESTORE, 6}, - { ITEM_REVIVE, 3}, - { ITEM_ANTIDOTE, 1}, - { ITEM_PARLYZ_HEAL, 1}, - { ITEM_AWAKENING, 2}, - { ITEM_BURN_HEAL, 2}, - { ITEM_ICE_HEAL, 2}, - { ITEM_FULL_HEAL, 4}, - { ITEM_ESCAPE_ROPE, 2}, - { ITEM_REPEL, 2}, - { ITEM_SUPER_REPEL, 3}, - { ITEM_MAX_REPEL, 4}, + { ITEM_POKE_BALL, 1 }, + { ITEM_GREAT_BALL, 3 }, + { ITEM_ULTRA_BALL, 4 }, + { ITEM_POTION, 1 }, + { ITEM_SUPER_POTION, 2 }, + { ITEM_HYPER_POTION, 4 }, + { ITEM_MAX_POTION, 5 }, + { ITEM_FULL_RESTORE, 6 }, + { ITEM_REVIVE, 3 }, + { ITEM_ANTIDOTE, 1 }, + { ITEM_PARLYZ_HEAL, 1 }, + { ITEM_AWAKENING, 2 }, + { ITEM_BURN_HEAL, 2 }, + { ITEM_ICE_HEAL, 2 }, + { ITEM_FULL_HEAL, 4 }, + { ITEM_ESCAPE_ROPE, 2 }, + { ITEM_REPEL, 2 }, + { ITEM_SUPER_REPEL, 3 }, + { ITEM_MAX_REPEL, 4 }, }; BOOL ScrCmd_MartBuy(ScriptContext *ctx) { @@ -218,172 +218,172 @@ BOOL ScrCmd_SealMart(ScriptContext *ctx) { } const struct MartItem _020FBCD6[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_MOON_STONE, 3000}, - { ITEM_RARE_CANDY, 2000}, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_MOON_STONE, 3000 }, + { ITEM_RARE_CANDY, 2000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBCF2[] = { - {ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_FIRE_STONE, 2500}, - { ITEM_PP_UP, 1000}, - { 0xFFFF, 0 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_FIRE_STONE, 2500 }, + { ITEM_PP_UP, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD2A[] = { - {ITEM_BLU_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_WATER_STONE, 2500}, - { ITEM_HEART_SCALE, 1000}, - { 0xFFFF, 0 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_WATER_STONE, 2500 }, + { ITEM_HEART_SCALE, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD46[] = { - {ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_THUNDERSTONE, 2500}, - { ITEM_PP_UP, 1000}, - { 0xFFFF, 0 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_THUNDERSTONE, 2500 }, + { ITEM_PP_UP, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD62[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_YLW_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_METAL_COAT, 2500}, - { ITEM_NUGGET, 500 }, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_METAL_COAT, 2500 }, + { ITEM_NUGGET, 500 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD7E[] = { - {ITEM_GRN_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_LEAF_STONE, 2500}, - { ITEM_RARE_CANDY, 2000}, - { 0xFFFF, 0 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_LEAF_STONE, 2500 }, + { ITEM_RARE_CANDY, 2000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBC82[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_KINGS_ROCK, 3000}, - { ITEM_HEART_SCALE, 1000}, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_KINGS_ROCK, 3000 }, + { ITEM_HEART_SCALE, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBDB6[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_KINGS_ROCK, 3000}, - { ITEM_HEART_SCALE, 1000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_NUGGET, 500 }, - { ITEM_SUN_STONE, 3000}, - { ITEM_FIRE_STONE, 2500}, - { ITEM_SHINY_STONE, 3000}, - { ITEM_DAWN_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_KINGS_ROCK, 3000 }, + { ITEM_HEART_SCALE, 1000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_NUGGET, 500 }, + { ITEM_SUN_STONE, 3000 }, + { ITEM_FIRE_STONE, 2500 }, + { ITEM_SHINY_STONE, 3000 }, + { ITEM_DAWN_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBDEA[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_BLU_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_MOON_STONE, 3000}, - { ITEM_RARE_CANDY, 2000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_KINGS_ROCK, 3000}, - { ITEM_SUN_STONE, 3000}, - { ITEM_WATER_STONE, 2500}, - { ITEM_SHINY_STONE, 3000}, - { ITEM_DUSK_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_MOON_STONE, 3000 }, + { ITEM_RARE_CANDY, 2000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_KINGS_ROCK, 3000 }, + { ITEM_SUN_STONE, 3000 }, + { ITEM_WATER_STONE, 2500 }, + { ITEM_SHINY_STONE, 3000 }, + { ITEM_DUSK_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE1E[] = { - {ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_FIRE_STONE, 2500}, - { ITEM_PP_UP, 1000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_METAL_COAT, 2500}, - { ITEM_WATER_STONE, 2500}, - { ITEM_LEAF_STONE, 2500}, - { ITEM_DUSK_STONE, 3000}, - { ITEM_DAWN_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_FIRE_STONE, 2500 }, + { ITEM_PP_UP, 1000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_METAL_COAT, 2500 }, + { ITEM_WATER_STONE, 2500 }, + { ITEM_LEAF_STONE, 2500 }, + { ITEM_DUSK_STONE, 3000 }, + { ITEM_DAWN_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE52[] = { - {ITEM_BLU_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_WATER_STONE, 2500}, - { ITEM_HEART_SCALE, 1000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_DRAGON_SCALE, 2500}, - { ITEM_THUNDERSTONE, 2500}, - { ITEM_MOON_STONE, 3000}, - { ITEM_SHINY_STONE, 3000}, - { ITEM_DAWN_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_BLU_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_WATER_STONE, 2500 }, + { ITEM_HEART_SCALE, 1000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_DRAGON_SCALE, 2500 }, + { ITEM_THUNDERSTONE, 2500 }, + { ITEM_MOON_STONE, 3000 }, + { ITEM_SHINY_STONE, 3000 }, + { ITEM_DAWN_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBE86[] = { - {ITEM_YLW_APRICORN, 200 }, - { ITEM_PNK_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_THUNDERSTONE, 2500}, - { ITEM_PP_UP, 1000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_KINGS_ROCK, 3000}, - { ITEM_FIRE_STONE, 2500}, - { ITEM_LEAF_STONE, 2500}, - { ITEM_SHINY_STONE, 3000}, - { ITEM_DUSK_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_PNK_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_THUNDERSTONE, 2500 }, + { ITEM_PP_UP, 1000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_KINGS_ROCK, 3000 }, + { ITEM_FIRE_STONE, 2500 }, + { ITEM_LEAF_STONE, 2500 }, + { ITEM_SHINY_STONE, 3000 }, + { ITEM_DUSK_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBEBA[] = { - {ITEM_RED_APRICORN, 200 }, - { ITEM_YLW_APRICORN, 200 }, - { ITEM_GRN_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_METAL_COAT, 2500}, - { ITEM_NUGGET, 500 }, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_DRAGON_SCALE, 2500}, - { ITEM_WATER_STONE, 2500}, - { ITEM_SUN_STONE, 3000}, - { ITEM_DUSK_STONE, 3000}, - { ITEM_DAWN_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_RED_APRICORN, 200 }, + { ITEM_YLW_APRICORN, 200 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_METAL_COAT, 2500 }, + { ITEM_NUGGET, 500 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_DRAGON_SCALE, 2500 }, + { ITEM_WATER_STONE, 2500 }, + { ITEM_SUN_STONE, 3000 }, + { ITEM_DUSK_STONE, 3000 }, + { ITEM_DAWN_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBEEE[] = { - {ITEM_GRN_APRICORN, 200 }, - { ITEM_WHT_APRICORN, 200 }, - { ITEM_BLK_APRICORN, 200 }, - { ITEM_MOOMOO_MILK, 100 }, - { ITEM_LEAF_STONE, 2500}, - { ITEM_RARE_CANDY, 2000}, - { ITEM_FULL_RESTORE, 500 }, - { ITEM_METAL_COAT, 2500}, - { ITEM_THUNDERSTONE, 2500}, - { ITEM_SHINY_STONE, 3000}, - { ITEM_DUSK_STONE, 3000}, - { ITEM_DAWN_STONE, 3000}, - { 0xFFFF, 0 }, + { ITEM_GRN_APRICORN, 200 }, + { ITEM_WHT_APRICORN, 200 }, + { ITEM_BLK_APRICORN, 200 }, + { ITEM_MOOMOO_MILK, 100 }, + { ITEM_LEAF_STONE, 2500 }, + { ITEM_RARE_CANDY, 2000 }, + { ITEM_FULL_RESTORE, 500 }, + { ITEM_METAL_COAT, 2500 }, + { ITEM_THUNDERSTONE, 2500 }, + { ITEM_SHINY_STONE, 3000 }, + { ITEM_DUSK_STONE, 3000 }, + { ITEM_DAWN_STONE, 3000 }, + { 0xFFFF, 0 }, }; const struct MartItem *_0210FA04[] = { @@ -420,46 +420,46 @@ BOOL ScrCmd_771(ScriptContext *ctx) { } const struct MartItem _020FBCBA[] = { - {ITEM_DATA_CARD_01, 500 }, - { ITEM_DATA_CARD_02, 500 }, - { ITEM_DATA_CARD_03, 1000}, - { ITEM_DATA_CARD_04, 1000}, - { ITEM_DATA_CARD_05, 500 }, - { ITEM_DATA_CARD_06, 500 }, - { 0xFFFF, 0 }, + { ITEM_DATA_CARD_01, 500 }, + { ITEM_DATA_CARD_02, 500 }, + { ITEM_DATA_CARD_03, 1000 }, + { ITEM_DATA_CARD_04, 1000 }, + { ITEM_DATA_CARD_05, 500 }, + { ITEM_DATA_CARD_06, 500 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD0E[] = { - {ITEM_DATA_CARD_07, 1000}, - { ITEM_DATA_CARD_08, 1000}, - { ITEM_DATA_CARD_09, 1000}, - { ITEM_DATA_CARD_10, 1000}, - { ITEM_DATA_CARD_11, 1000}, - { ITEM_DATA_CARD_12, 1000}, - { 0xFFFF, 0 }, + { ITEM_DATA_CARD_07, 1000 }, + { ITEM_DATA_CARD_08, 1000 }, + { ITEM_DATA_CARD_09, 1000 }, + { ITEM_DATA_CARD_10, 1000 }, + { ITEM_DATA_CARD_11, 1000 }, + { ITEM_DATA_CARD_12, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBD9A[] = { - {ITEM_DATA_CARD_13, 1500}, - { ITEM_DATA_CARD_14, 1500}, - { ITEM_DATA_CARD_15, 1500}, - { ITEM_DATA_CARD_16, 1000}, - { ITEM_DATA_CARD_17, 1000}, - { ITEM_DATA_CARD_18, 1000}, - { 0xFFFF, 0 }, + { ITEM_DATA_CARD_13, 1500 }, + { ITEM_DATA_CARD_14, 1500 }, + { ITEM_DATA_CARD_15, 1500 }, + { ITEM_DATA_CARD_16, 1000 }, + { ITEM_DATA_CARD_17, 1000 }, + { ITEM_DATA_CARD_18, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBC9E[] = { - {ITEM_DATA_CARD_19, 500 }, - { ITEM_DATA_CARD_20, 500 }, - { ITEM_DATA_CARD_21, 2000}, - { ITEM_DATA_CARD_22, 2000}, - { ITEM_DATA_CARD_23, 1000}, - { ITEM_DATA_CARD_24, 1000}, - { 0xFFFF, 0 }, + { ITEM_DATA_CARD_19, 500 }, + { ITEM_DATA_CARD_20, 500 }, + { ITEM_DATA_CARD_21, 2000 }, + { ITEM_DATA_CARD_22, 2000 }, + { ITEM_DATA_CARD_23, 1000 }, + { ITEM_DATA_CARD_24, 1000 }, + { 0xFFFF, 0 }, }; const struct MartItem _020FBBA4[] = { - {ITEM_DATA_CARD_25, 2000}, - { ITEM_DATA_CARD_26, 3000}, - { ITEM_DATA_CARD_27, 9999}, - { 0xFFFF, 0 }, + { ITEM_DATA_CARD_25, 2000 }, + { ITEM_DATA_CARD_26, 3000 }, + { ITEM_DATA_CARD_27, 9999 }, + { 0xFFFF, 0 }, }; const struct MartItem *_0210F9D4[] = { diff --git a/src/scrcmd_move_tutor.c b/src/scrcmd_move_tutor.c index d5fed63591..99c62ff043 100644 --- a/src/scrcmd_move_tutor.c +++ b/src/scrcmd_move_tutor.c @@ -36,58 +36,58 @@ typedef struct MoveTutorLearnset { #define MAX_TUTOR_MOVES_PER_PAGE (6); static const TutorMove sTutorMoves[] = { - {MOVE_DIVE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_MUD_SLAP, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_FURY_CUTTER, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_ICY_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_ROLLOUT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_THUNDER_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_FIRE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SUPERPOWER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ICE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_IRON_HEAD, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_AQUA_TAIL, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_OMINOUS_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_GASTRO_ACID, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SNORE, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_SPITE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_AIR_CUTTER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HELPING_HAND, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_ENDEAVOR, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_OUTRAGE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ANCIENT_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SYNTHESIS, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_SIGNAL_BEAM, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_ZEN_HEADBUTT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_VACUUM_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_EARTH_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_GUNK_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_TWISTER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SEED_BOMB, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_IRON_DEFENSE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_MAGNET_RISE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_LAST_RESORT, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_BOUNCE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_TRICK, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HEAT_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_KNOCK_OFF, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SUCKER_PUNCH, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_SWIFT, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_UPROAR, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_SUPER_FANG, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_PAIN_SPLIT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_STRING_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_TAILWIND, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_GRAVITY, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_WORRY_SEED, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_MAGIC_COAT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_ROLE_PLAY, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_HEAL_BELL, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_LOW_KICK, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_SKY_ATTACK, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, - { MOVE_BLOCK, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT}, - { MOVE_BUG_BITE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, - { MOVE_HEADBUTT, 0, MOVE_TUTOR_NPC_HEADBUTT }, + { MOVE_DIVE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_MUD_SLAP, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_FURY_CUTTER, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_ICY_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_ROLLOUT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_THUNDER_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_FIRE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SUPERPOWER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ICE_PUNCH, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_IRON_HEAD, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_AQUA_TAIL, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_OMINOUS_WIND, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_GASTRO_ACID, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SNORE, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_SPITE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_AIR_CUTTER, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HELPING_HAND, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_ENDEAVOR, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_OUTRAGE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ANCIENT_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SYNTHESIS, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_SIGNAL_BEAM, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_ZEN_HEADBUTT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_VACUUM_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_EARTH_POWER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_GUNK_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_TWISTER, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SEED_BOMB, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_IRON_DEFENSE, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_MAGNET_RISE, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_LAST_RESORT, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_BOUNCE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_TRICK, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HEAT_WAVE, 48, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_KNOCK_OFF, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SUCKER_PUNCH, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_SWIFT, 40, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_UPROAR, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_SUPER_FANG, 40, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_PAIN_SPLIT, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_STRING_SHOT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_TAILWIND, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_GRAVITY, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_WORRY_SEED, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_MAGIC_COAT, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_ROLE_PLAY, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_HEAL_BELL, 48, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_LOW_KICK, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_SKY_ATTACK, 64, MOVE_TUTOR_NPC_FRONTIER_TOP_RIGHT }, + { MOVE_BLOCK, 32, MOVE_TUTOR_NPC_FRONTIER_BOTTOM_RIGHT }, + { MOVE_BUG_BITE, 32, MOVE_TUTOR_NPC_FRONTIER_TOP_LEFT }, + { MOVE_HEADBUTT, 0, MOVE_TUTOR_NPC_HEADBUTT }, }; static u16 GetMoveTutorLearnsetIndex(u16 species, u8 form); diff --git a/src/scrcmd_mystery_gift.c b/src/scrcmd_mystery_gift.c index b05897f660..b77e687f36 100644 --- a/src/scrcmd_mystery_gift.c +++ b/src/scrcmd_mystery_gift.c @@ -94,21 +94,21 @@ static void MGMessageSuccess_MemorialPhoto(struct GetMysteryGiftGmmState *gmmSta static void MGMessageFailure_MemorialPhoto(struct GetMysteryGiftGmmState *gmmState, u16 *pMsgBank, u16 *pMsgNum); static const struct ScriptMysteryGiftFuncs sScriptMysteryGiftActionTable[MG_TAG_MAX - 1] = { - {MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, - { MGCheck_PartySpace, MGGive_Egg, MGMessageSuccess_Egg, MGMessageFailure_GiveMon }, - { MGCheck_Item, MGGive_Item, MGMessageSuccess_Item, MGMessageFailure_Item }, - { MGCheck_BattleRules, MGGive_BattleRules, MGMessageSuccess_BattleRules, MGMessageFailure_BattleRules }, - { MGCheck_Decoration, MGGive_Decoration, MGMessageSuccess_Decoration, MGMessageFailure_Decoration }, - { MGCheck_MonDeco, MGGive_MonDeco, MGMessageSuccess_MonDeco, MGMessageFailure_MonDeco }, - { MGCheck_PartySpace, MGGive_ManaphyEgg, MGMessageSuccess_ManaphyEgg, MGMessageFailure_GiveMon }, - { MGCheck_MemberCard, MGGive_MemberCard, MGMessageSuccess_MemberCard, MGMessageFailure_MemberCard }, - { MGCheck_OaksLetter, MGGive_OaksLetter, MGMessageSuccess_OaksLetter, MGMessageFailure_OaksLetter }, - { MGCheck_AzureFlute, MGGive_AzureFlute, MGMessageSuccess_AzureFlute, MGMessageFailure_AzureFlute }, - { MGCheck_PoketchApp, MGGive_PoketchApp, MGMessageSuccess_PoketchApp, MGMessageFailure_PoketchApp }, - { MGCheck_SecretKey, MGGive_SecretKey, MGMessageSuccess_SecretKey, MGMessageFailure_SecretKey }, - { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, - { MGCheck_PokewalkerCourse, MGGive_PokewalkerCourse, MGMessageSuccess_PokewalkerCourse, MGMessageFailure_PokewalkerCourse}, - { MGCheck_MemorialPhoto, MGGive_MemorialPhoto, MGMessageSuccess_MemorialPhoto, MGMessageFailure_MemorialPhoto }, + { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, + { MGCheck_PartySpace, MGGive_Egg, MGMessageSuccess_Egg, MGMessageFailure_GiveMon }, + { MGCheck_Item, MGGive_Item, MGMessageSuccess_Item, MGMessageFailure_Item }, + { MGCheck_BattleRules, MGGive_BattleRules, MGMessageSuccess_BattleRules, MGMessageFailure_BattleRules }, + { MGCheck_Decoration, MGGive_Decoration, MGMessageSuccess_Decoration, MGMessageFailure_Decoration }, + { MGCheck_MonDeco, MGGive_MonDeco, MGMessageSuccess_MonDeco, MGMessageFailure_MonDeco }, + { MGCheck_PartySpace, MGGive_ManaphyEgg, MGMessageSuccess_ManaphyEgg, MGMessageFailure_GiveMon }, + { MGCheck_MemberCard, MGGive_MemberCard, MGMessageSuccess_MemberCard, MGMessageFailure_MemberCard }, + { MGCheck_OaksLetter, MGGive_OaksLetter, MGMessageSuccess_OaksLetter, MGMessageFailure_OaksLetter }, + { MGCheck_AzureFlute, MGGive_AzureFlute, MGMessageSuccess_AzureFlute, MGMessageFailure_AzureFlute }, + { MGCheck_PoketchApp, MGGive_PoketchApp, MGMessageSuccess_PoketchApp, MGMessageFailure_PoketchApp }, + { MGCheck_SecretKey, MGGive_SecretKey, MGMessageSuccess_SecretKey, MGMessageFailure_SecretKey }, + { MGCheck_PartySpace, MGGive_Mon, MGMessageSuccess_GiveMon, MGMessageFailure_GiveMon }, + { MGCheck_PokewalkerCourse, MGGive_PokewalkerCourse, MGMessageSuccess_PokewalkerCourse, MGMessageFailure_PokewalkerCourse }, + { MGCheck_MemorialPhoto, MGGive_MemorialPhoto, MGMessageSuccess_MemorialPhoto, MGMessageFailure_MemorialPhoto }, }; static void FieldSystem_InitGetMysteryGiftGmmState(struct GetMysteryGiftGmmState *state, FieldSystem *fieldSys, MessageFormat *msgFormat, MysteryGiftData *mgData) { diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index fa65bdc19c..a5566e443f 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -8,22 +8,22 @@ #include "script_state_misc.h" static const u16 sBigMonSizeTable[][3] = { - {290, 1, 0 }, - { 300, 1, 10 }, - { 400, 2, 110 }, - { 500, 4, 310 }, - { 600, 20, 710 }, - { 700, 50, 2710 }, - { 800, 100, 7710 }, - { 900, 150, 17710}, - { 1000, 150, 32710}, - { 1100, 100, 47710}, - { 1200, 50, 57710}, - { 1300, 20, 62710}, - { 1400, 5, 64710}, - { 1500, 2, 65210}, - { 1600, 1, 65410}, - { 1700, 1, 65510}, + { 290, 1, 0 }, + { 300, 1, 10 }, + { 400, 2, 110 }, + { 500, 4, 310 }, + { 600, 20, 710 }, + { 700, 50, 2710 }, + { 800, 100, 7710 }, + { 900, 150, 17710 }, + { 1000, 150, 32710 }, + { 1100, 100, 47710 }, + { 1200, 50, 57710 }, + { 1300, 20, 62710 }, + { 1400, 5, 64710 }, + { 1500, 2, 65210 }, + { 1600, 1, 65410 }, + { 1700, 1, 65510 }, }; static u32 GetMonSizeHash(Pokemon *mon) { diff --git a/src/start_menu.c b/src/start_menu.c index 2d08bfea50..2e027181a6 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -117,8 +117,8 @@ typedef struct StartMenuAfterEvoPartySlotBak { int partySlot; } StartMenuAfterEvoPartySlotBak; -#define STARTMENUTASKFUNC_CANCEL ((TaskFunc)-2) -#define STARTMENUTASKFUNC_NONE ((TaskFunc)-1) +#define STARTMENUTASKFUNC_CANCEL ((TaskFunc) - 2) +#define STARTMENUTASKFUNC_NONE ((TaskFunc) - 1) static StartMenuTaskData *StartMenu_Create(void); static u32 FieldSystem_GetStartMenuButtonInhibitFlags_Normal(FieldSystem *fieldSystem); @@ -194,19 +194,19 @@ static const int sActionToIconIndex[] = { }; static const StartMenuActionFunc sStartMenuActions[] = { - [START_MENU_ACTION_POKEDEX] = {.ident = msg_0196_00000, .func = Task_StartMenu_HandleSelection_Pokedex }, - [START_MENU_ACTION_POKEMON] = { .ident = msg_0196_00001, .func = Task_StartMenu_HandleSelection_Pokemon }, - [START_MENU_ACTION_BAG] = { .ident = msg_0196_00002, .func = Task_StartMenu_HandleSelection_Bag }, - [START_MENU_ACTION_TRAINER_CARD] = { .ident = msg_0196_00003, .func = Task_StartMenu_HandleSelection_TrainerCard }, - [START_MENU_ACTION_SAVE] = { .ident = msg_0196_00004, .func = Task_StartMenu_HandleSelection_Save }, - [START_MENU_ACTION_OPTIONS] = { .ident = msg_0196_00005, .func = Task_StartMenu_HandleSelection_Options }, - [START_MENU_ACTION_RUNNING_SHOES] = { .ident = msg_0196_00006, .func = STARTMENUTASKFUNC_CANCEL }, - [START_MENU_ACTION_7] = { .ident = msg_0196_00007, .func = Task_StartMenu_HandleSelection_RemovedEasyChatThing}, - [START_MENU_ACTION_RETIRE] = { .ident = msg_0196_00008, .func = Task_StartMenu_HandleSelection_Retire }, - [START_MENU_ACTION_9] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_10] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_POKEGEAR] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, - [START_MENU_ACTION_12] = { .ident = msg_0196_00014, .func = sub_0203D2CC }, + [START_MENU_ACTION_POKEDEX] = { .ident = msg_0196_00000, .func = Task_StartMenu_HandleSelection_Pokedex }, + [START_MENU_ACTION_POKEMON] = { .ident = msg_0196_00001, .func = Task_StartMenu_HandleSelection_Pokemon }, + [START_MENU_ACTION_BAG] = { .ident = msg_0196_00002, .func = Task_StartMenu_HandleSelection_Bag }, + [START_MENU_ACTION_TRAINER_CARD] = { .ident = msg_0196_00003, .func = Task_StartMenu_HandleSelection_TrainerCard }, + [START_MENU_ACTION_SAVE] = { .ident = msg_0196_00004, .func = Task_StartMenu_HandleSelection_Save }, + [START_MENU_ACTION_OPTIONS] = { .ident = msg_0196_00005, .func = Task_StartMenu_HandleSelection_Options }, + [START_MENU_ACTION_RUNNING_SHOES] = { .ident = msg_0196_00006, .func = STARTMENUTASKFUNC_CANCEL }, + [START_MENU_ACTION_7] = { .ident = msg_0196_00007, .func = Task_StartMenu_HandleSelection_RemovedEasyChatThing }, + [START_MENU_ACTION_RETIRE] = { .ident = msg_0196_00008, .func = Task_StartMenu_HandleSelection_Retire }, + [START_MENU_ACTION_9] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_10] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_POKEGEAR] = { .ident = msg_0196_00014, .func = Task_StartMenu_HandleSelection_Pokegear }, + [START_MENU_ACTION_12] = { .ident = msg_0196_00014, .func = sub_0203D2CC }, }; static const u8 _020FA0AC[] = { diff --git a/src/sys_flags.c b/src/sys_flags.c index 9734f06cab..342a9f8c6a 100644 --- a/src/sys_flags.c +++ b/src/sys_flags.c @@ -13,19 +13,19 @@ struct MusicOverride { }; static const struct MusicOverride sMusicOverrideMap[] = { - {MAP_D22R0101, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE_D5}, - { MAP_R35R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, - { MAP_R36R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, - { MAP_T04GYM0101, FLAG_UNK_994, SEQ_GS_EYE_ROCKET }, - { MAP_R24, FLAG_UNK_995, SEQ_GS_EYE_ROCKET }, - { MAP_D10R0101, FLAG_UNK_999, SEQ_GS_SAFARI_FIELD}, - { MAP_D23R0101, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0102, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0103, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0104, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0105, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0106, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, - { MAP_D23R0107, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D22R0101, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE_D5 }, + { MAP_R35R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, + { MAP_R36R0201, FLAG_BUG_CONTEST_ACTIVE, SEQ_GS_TAIKAIMAE }, + { MAP_T04GYM0101, FLAG_UNK_994, SEQ_GS_EYE_ROCKET }, + { MAP_R24, FLAG_UNK_995, SEQ_GS_EYE_ROCKET }, + { MAP_D10R0101, FLAG_UNK_999, SEQ_GS_SAFARI_FIELD }, + { MAP_D23R0101, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0102, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0103, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0104, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0105, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0106, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, + { MAP_D23R0107, FLAG_ROCKET_TAKEOVER_ACTIVE, SEQ_GS_SENKYO }, }; void SetScriptFlag(SaveVarsFlags *state, u16 flag_id) { diff --git a/src/system.c b/src/system.c index eb022ecba9..8c4f55751d 100644 --- a/src/system.c +++ b/src/system.c @@ -84,10 +84,10 @@ void HBlankIntrRegsToggle(BOOL enable) { } static const struct HeapParam sDefaultHeapSpec[] = { - {0xD200, OS_ARENA_MAIN}, - { 0x23600, OS_ARENA_MAIN}, - { 0x10, OS_ARENA_MAIN}, - { 0x11D000, OS_ARENA_MAIN}, + { 0xD200, OS_ARENA_MAIN }, + { 0x23600, OS_ARENA_MAIN }, + { 0x10, OS_ARENA_MAIN }, + { 0x11D000, OS_ARENA_MAIN }, }; void sub_0201A1B4(void) { diff --git a/src/trainer_memo.c b/src/trainer_memo.c index b1a7d26bb6..34c86b9273 100644 --- a/src/trainer_memo.c +++ b/src/trainer_memo.c @@ -53,12 +53,12 @@ static const u16 sFlavorMsgs[6] = { }; static const u16 sCharactersticMsgs[6][5] = { - {msg_0302_00071, msg_0302_00072, msg_0302_00073, msg_0302_00074, msg_0302_00075}, - { msg_0302_00076, msg_0302_00077, msg_0302_00078, msg_0302_00079, msg_0302_00080}, - { msg_0302_00081, msg_0302_00082, msg_0302_00083, msg_0302_00084, msg_0302_00085}, - { msg_0302_00086, msg_0302_00087, msg_0302_00088, msg_0302_00089, msg_0302_00090}, - { msg_0302_00091, msg_0302_00092, msg_0302_00093, msg_0302_00094, msg_0302_00095}, - { msg_0302_00096, msg_0302_00097, msg_0302_00098, msg_0302_00099, msg_0302_00100}, + { msg_0302_00071, msg_0302_00072, msg_0302_00073, msg_0302_00074, msg_0302_00075 }, + { msg_0302_00076, msg_0302_00077, msg_0302_00078, msg_0302_00079, msg_0302_00080 }, + { msg_0302_00081, msg_0302_00082, msg_0302_00083, msg_0302_00084, msg_0302_00085 }, + { msg_0302_00086, msg_0302_00087, msg_0302_00088, msg_0302_00089, msg_0302_00090 }, + { msg_0302_00091, msg_0302_00092, msg_0302_00093, msg_0302_00094, msg_0302_00095 }, + { msg_0302_00096, msg_0302_00097, msg_0302_00098, msg_0302_00099, msg_0302_00100 }, }; static MetCondition MonMetCondition(Pokemon *mon, BOOL isMine); diff --git a/src/unk_02013FDC.c b/src/unk_02013FDC.c index ed3187c76a..9b65f04150 100644 --- a/src/unk_02013FDC.c +++ b/src/unk_02013FDC.c @@ -157,12 +157,12 @@ static void sub_02014350(int srcWidth, int srcHeight, const UnkStruct_02014E30 * static void sub_02014374(NarcId narcId, s32 fileId, HeapID heapId, int x, int y, int width, int height, void *dest) { UnkStruct_02014E30 sp1C[6] = { - {0, 0, 8, 8}, - { 8, 0, 2, 4}, - { 8, 4, 2, 4}, - { 0, 8, 4, 2}, - { 4, 8, 4, 2}, - { 8, 8, 2, 2}, + { 0, 0, 8, 8 }, + { 8, 0, 2, 4 }, + { 8, 4, 2, 4 }, + { 0, 8, 4, 2 }, + { 4, 8, 4, 2 }, + { 8, 8, 2, 2 }, }; int sp18 = 0; @@ -200,12 +200,12 @@ void *sub_02014450(NarcId narcId, s32 fileId, HeapID heapId) { void sub_02014494(NarcId narcId, s32 fileId, HeapID heapId, int x, int y, int width, int height, void *dest, u32 pid, BOOL isAnimated, int whichFacing, int species) { UnkStruct_02014E30 sp2C[6] = { - {0, 0, 8, 8}, - { 8, 0, 2, 4}, - { 8, 4, 2, 4}, - { 0, 8, 4, 2}, - { 4, 8, 4, 2}, - { 8, 8, 2, 2}, + { 0, 0, 8, 8 }, + { 8, 0, 2, 4 }, + { 8, 4, 2, 4 }, + { 0, 8, 4, 2 }, + { 4, 8, 4, 2 }, + { 8, 8, 2, 2 }, }; int sp28 = 0; diff --git a/src/unk_0204B538.c b/src/unk_0204B538.c index 8171aa8413..f612227383 100644 --- a/src/unk_0204B538.c +++ b/src/unk_0204B538.c @@ -37,89 +37,89 @@ static void GetFrontierMon(FrontierMon *mon, u32 frontierMonIndex); static const u16 _020FBFA4[] = { ITEM_BRIGHTPOWDER, ITEM_LUM_BERRY, ITEM_LEFTOVERS, ITEM_QUICK_CLAW }; static const u16 _020FBFAC[][2] = { - {0, 99 }, - { 80, 119}, - { 100, 139}, - { 120, 159}, - { 140, 179}, - { 160, 199}, - { 180, 219}, - { 200, 299}, + { 0, 99 }, + { 80, 119 }, + { 100, 139 }, + { 120, 159 }, + { 140, 179 }, + { 160, 199 }, + { 180, 219 }, + { 200, 299 }, }; static const u16 _020FBFEC[][2] = { - {90, 141}, - { 91, 142}, - { 92, 143}, - { 93, 144}, - { 94, 145}, - { 2, 4 }, - { 3, 6 }, - { 60, 3 }, - { 61, 8 }, - { 32, 62 }, - { 33, 63 }, - { 4, 52 }, - { 5, 53 }, - { 44, 1 }, - { 45, 2 }, - { 20, 15 }, - { 21, 16 }, - { 81, 59 }, - { 26, 60 }, - { 16, 9 }, - { 17, 12 }, - { 83, 23 }, - { 84, 22 }, - { 71, 41 }, - { 18, 42 }, - { 12, 38 }, - { 13, 39 }, - { 14, 51 }, - { 10, 7 }, - { 27, 17 }, - { 35, 37 }, - { 49, 70 }, - { 50, 70 }, - { 39, 11 }, - { 40, 14 }, - { 24, 11 }, - { 25, 14 }, - { 53, 68 }, - { 54, 69 }, - { 29, 11 }, - { 6, 5 }, - { 28, 1 }, - { 19, 45 }, - { 11, 54 }, - { 46, 56 }, - { 9, 20 }, - { 48, 50 }, - { 52, 10 }, - { 37, 19 }, - { 57, 31 }, - { 78, 29 }, - { 34, 36 }, - { 59, 40 }, - { 58, 43 }, - { 38, 34 }, - { 51, 62 }, - { 69, 14 }, - { 80, 55 }, - { 36, 13 }, - { 7, 12 }, - { 85, 35 }, - { 15, 44 }, - { 22, 71 }, + { 90, 141 }, + { 91, 142 }, + { 92, 143 }, + { 93, 144 }, + { 94, 145 }, + { 2, 4 }, + { 3, 6 }, + { 60, 3 }, + { 61, 8 }, + { 32, 62 }, + { 33, 63 }, + { 4, 52 }, + { 5, 53 }, + { 44, 1 }, + { 45, 2 }, + { 20, 15 }, + { 21, 16 }, + { 81, 59 }, + { 26, 60 }, + { 16, 9 }, + { 17, 12 }, + { 83, 23 }, + { 84, 22 }, + { 71, 41 }, + { 18, 42 }, + { 12, 38 }, + { 13, 39 }, + { 14, 51 }, + { 10, 7 }, + { 27, 17 }, + { 35, 37 }, + { 49, 70 }, + { 50, 70 }, + { 39, 11 }, + { 40, 14 }, + { 24, 11 }, + { 25, 14 }, + { 53, 68 }, + { 54, 69 }, + { 29, 11 }, + { 6, 5 }, + { 28, 1 }, + { 19, 45 }, + { 11, 54 }, + { 46, 56 }, + { 9, 20 }, + { 48, 50 }, + { 52, 10 }, + { 37, 19 }, + { 57, 31 }, + { 78, 29 }, + { 34, 36 }, + { 59, 40 }, + { 58, 43 }, + { 38, 34 }, + { 51, 62 }, + { 69, 14 }, + { 80, 55 }, + { 36, 13 }, + { 7, 12 }, + { 85, 35 }, + { 15, 44 }, + { 22, 71 }, }; static const u16 _020FBFCC[][2] = { - {100, 119}, - { 120, 139}, - { 140, 159}, - { 160, 179}, - { 180, 199}, - { 200, 219}, - { 220, 239}, - { 200, 299}, + { 100, 119 }, + { 120, 139 }, + { 140, 159 }, + { 160, 179 }, + { 180, 199 }, + { 200, 219 }, + { 220, 239 }, + { 200, 299 }, }; MessageFormat *sub_0204B538(SaveData *saveData, u16 numEligiblePokemon, u16 a2, u8 a3, u8 *numLegendaryPokemonSeen) { diff --git a/src/unk_0205B3DC.c b/src/unk_0205B3DC.c index 5e9ce4de88..e50225b041 100644 --- a/src/unk_0205B3DC.c +++ b/src/unk_0205B3DC.c @@ -12,38 +12,38 @@ // you'll be offered a different set of 4 choices // for avatar and trainer class. static const u8 sPlayerAvatarIndexChoices[][4] = { - {0, 1, 2, 3}, - { 1, 6, 7, 0}, - { 2, 3, 4, 5}, - { 3, 0, 5, 6}, - { 4, 1, 2, 7}, - { 5, 2, 7, 0}, - { 6, 3, 4, 1}, - { 7, 4, 5, 6}, + { 0, 1, 2, 3 }, + { 1, 6, 7, 0 }, + { 2, 3, 4, 5 }, + { 3, 0, 5, 6 }, + { 4, 1, 2, 7 }, + { 5, 2, 7, 0 }, + { 6, 3, 4, 1 }, + { 7, 4, 5, 6 }, }; // The above array indexes into this table // which defines the sprite, trainer class, // and... the same trainer class again? static const u8 sPlayerAvatarAttributes[][3] = { - // Male - {SPRITE_BOY1, TRAINERCLASS_SCHOOL_KID_M, TRAINERCLASS_SCHOOL_KID_M }, - { SPRITE_BOY3, TRAINERCLASS_BUG_CATCHER, TRAINERCLASS_BUG_CATCHER }, - { SPRITE_MAN3, TRAINERCLASS_ACE_TRAINER_M, TRAINERCLASS_ACE_TRAINER_M}, - { SPRITE_BADMAN, TRAINERCLASS_ROUGHNECK, TRAINERCLASS_ROUGHNECK }, - { SPRITE_EXPLORE, TRAINERCLASS_RUIN_MANIAC, TRAINERCLASS_RUIN_MANIAC }, - { SPRITE_FIGHTER, TRAINERCLASS_BLACK_BELT, TRAINERCLASS_BLACK_BELT }, - { SPRITE_GORGGEOUSM, TRAINERCLASS_RICH_BOY, TRAINERCLASS_RICH_BOY }, - { SPRITE_MYSTERY, TRAINERCLASS_PSYCHIC_M, TRAINERCLASS_PSYCHIC_M }, - // Female - { SPRITE_GIRL1, TRAINERCLASS_LASS, TRAINERCLASS_LASS }, - { SPRITE_GIRL2, TRAINERCLASS_BATTLE_GIRL, TRAINERCLASS_BATTLE_GIRL }, - { SPRITE_WOMAN2, TRAINERCLASS_BEAUTY, TRAINERCLASS_BEAUTY }, - { SPRITE_WOMAN3, TRAINERCLASS_ACE_TRAINER_F, TRAINERCLASS_ACE_TRAINER_F}, - { SPRITE_IDOL, TRAINERCLASS_IDOL, TRAINERCLASS_IDOL }, - { SPRITE_LADY, TRAINERCLASS_SOCIALITE, TRAINERCLASS_SOCIALITE }, - { SPRITE_COWGIRL, TRAINERCLASS_COWGIRL, TRAINERCLASS_COWGIRL }, - { SPRITE_GORGGEOUSW, TRAINERCLASS_LADY, TRAINERCLASS_LADY }, + // Male + { SPRITE_BOY1, TRAINERCLASS_SCHOOL_KID_M, TRAINERCLASS_SCHOOL_KID_M }, + { SPRITE_BOY3, TRAINERCLASS_BUG_CATCHER, TRAINERCLASS_BUG_CATCHER }, + { SPRITE_MAN3, TRAINERCLASS_ACE_TRAINER_M, TRAINERCLASS_ACE_TRAINER_M }, + { SPRITE_BADMAN, TRAINERCLASS_ROUGHNECK, TRAINERCLASS_ROUGHNECK }, + { SPRITE_EXPLORE, TRAINERCLASS_RUIN_MANIAC, TRAINERCLASS_RUIN_MANIAC }, + { SPRITE_FIGHTER, TRAINERCLASS_BLACK_BELT, TRAINERCLASS_BLACK_BELT }, + { SPRITE_GORGGEOUSM, TRAINERCLASS_RICH_BOY, TRAINERCLASS_RICH_BOY }, + { SPRITE_MYSTERY, TRAINERCLASS_PSYCHIC_M, TRAINERCLASS_PSYCHIC_M }, + // Female + { SPRITE_GIRL1, TRAINERCLASS_LASS, TRAINERCLASS_LASS }, + { SPRITE_GIRL2, TRAINERCLASS_BATTLE_GIRL, TRAINERCLASS_BATTLE_GIRL }, + { SPRITE_WOMAN2, TRAINERCLASS_BEAUTY, TRAINERCLASS_BEAUTY }, + { SPRITE_WOMAN3, TRAINERCLASS_ACE_TRAINER_F, TRAINERCLASS_ACE_TRAINER_F }, + { SPRITE_IDOL, TRAINERCLASS_IDOL, TRAINERCLASS_IDOL }, + { SPRITE_LADY, TRAINERCLASS_SOCIALITE, TRAINERCLASS_SOCIALITE }, + { SPRITE_COWGIRL, TRAINERCLASS_COWGIRL, TRAINERCLASS_COWGIRL }, + { SPRITE_GORGGEOUSW, TRAINERCLASS_LADY, TRAINERCLASS_LADY }, }; void BufferUnionRoomAvatarChoicesNames(u32 trainerId, u32 playerGender, MessageFormat *msgFmt) { diff --git a/src/unk_02091054.c b/src/unk_02091054.c index 7e686172ed..7dca5f2f7e 100644 --- a/src/unk_02091054.c +++ b/src/unk_02091054.c @@ -11,87 +11,87 @@ typedef struct { } Unk02091054; static const Unk02091054 _02105F04[81] = { - {0x27, 0x00, 0x35, 0x01, 0x00}, - { 0x28, 0x01, 0x35, 0x01, 0x00}, - { 0x29, 0x02, 0x36, 0x01, 0x01}, - { 0x2a, 0x03, 0x37, 0x01, 0x02}, - { 0x2b, 0x04, 0x38, 0x01, 0x03}, - { 0x2c, 0x05, 0x39, 0x02, 0x04}, - { 0x2d, 0x06, 0x3a, 0x02, 0x05}, - { 0x2f, 0x07, 0x3b, 0x01, 0x06}, - { 0x2e, 0x08, 0x3c, 0x01, 0x07}, - { 0x31, 0x09, 0x3d, 0x01, 0x08}, - { 0x30, 0x0a, 0x3e, 0x01, 0x09}, - { 0x33, 0x0b, 0x3f, 0x02, 0x0a}, - { 0x32, 0x0c, 0x40, 0x02, 0x0b}, - { 0x34, 0x0d, 0x41, 0x02, 0x0c}, - { 0x35, 0x0e, 0x42, 0x02, 0x0d}, - { 0x36, 0x0f, 0x43, 0x02, 0x0e}, - { 0x37, 0x10, 0x44, 0x02, 0x0f}, - { 0x38, 0x11, 0x49, 0x02, 0x10}, - { 0x39, 0x12, 0x4a, 0x02, 0x11}, - { 0x3a, 0x13, 0x4b, 0x02, 0x12}, - { 0x3b, 0x14, 0x4c, 0x02, 0x13}, - { 0x3c, 0x15, 0x45, 0x02, 0x14}, - { 0x3d, 0x16, 0x46, 0x02, 0x15}, - { 0x3e, 0x17, 0x47, 0x02, 0x16}, - { 0x3f, 0x18, 0x48, 0x02, 0x17}, - { 0x40, 0x19, 0x4d, 0x01, 0x18}, - { 0x41, 0x1a, 0x4e, 0x01, 0x19}, - { 0x42, 0x1b, 0x4f, 0x01, 0x1a}, - { 0x43, 0x1c, 0x50, 0x01, 0x1b}, - { 0x44, 0x1d, 0x51, 0x01, 0x1c}, - { 0x45, 0x1e, 0x52, 0x01, 0x1d}, - { 0x46, 0x1f, 0x53, 0x01, 0x1e}, - { 0x47, 0x20, 0x54, 0x01, 0x1f}, - { 0x48, 0x21, 0x55, 0x01, 0x20}, - { 0x49, 0x22, 0x56, 0x01, 0x21}, - { 0x4a, 0x23, 0x57, 0x02, 0x22}, - { 0x4b, 0x24, 0x58, 0x02, 0x23}, - { 0x4c, 0x25, 0x59, 0x01, 0x24}, - { 0x4d, 0x26, 0x5a, 0x01, 0x25}, - { 0x4e, 0x27, 0x5b, 0x01, 0x26}, - { 0x4f, 0x28, 0x5c, 0x01, 0x27}, - { 0x50, 0x29, 0x5d, 0x01, 0x28}, - { 0x51, 0x2a, 0x5e, 0x01, 0x29}, - { 0x52, 0x2b, 0x5f, 0x01, 0x2a}, - { 0x53, 0x2c, 0x60, 0x01, 0x2b}, - { 0x54, 0x2d, 0x61, 0x01, 0x2c}, - { 0x55, 0x2e, 0x62, 0x01, 0x2d}, - { 0x56, 0x2f, 0x63, 0x01, 0x2e}, - { 0x57, 0x30, 0x64, 0x01, 0x2f}, - { 0x58, 0x31, 0x65, 0x01, 0x30}, - { 0x59, 0x32, 0x66, 0x00, 0x00}, - { 0x5a, 0x33, 0x67, 0x00, 0x00}, - { 0x5b, 0x34, 0x68, 0x00, 0x00}, - { 0x5c, 0x35, 0x69, 0x00, 0x00}, - { 0x5d, 0x36, 0x6a, 0x00, 0x00}, - { 0x5e, 0x37, 0x6b, 0x00, 0x00}, - { 0x5f, 0x38, 0x6c, 0x00, 0x00}, - { 0x60, 0x39, 0x6d, 0x00, 0x00}, - { 0x61, 0x3a, 0x6e, 0x00, 0x00}, - { 0x62, 0x3b, 0x6f, 0x00, 0x00}, - { 0x63, 0x3c, 0x70, 0x00, 0x00}, - { 0x64, 0x3d, 0x71, 0x00, 0x00}, - { 0x65, 0x3e, 0x72, 0x00, 0x00}, - { 0x66, 0x3f, 0x73, 0x00, 0x00}, - { 0x67, 0x40, 0x74, 0x00, 0x00}, - { 0x68, 0x41, 0x75, 0x00, 0x00}, - { 0x69, 0x42, 0x76, 0x00, 0x00}, - { 0x6a, 0x43, 0x77, 0x00, 0x00}, - { 0x6b, 0x44, 0x78, 0x00, 0x00}, - { 0x6c, 0x45, 0x79, 0x00, 0x00}, - { 0x6d, 0x46, 0x7a, 0x00, 0x00}, - { 0x6e, 0x47, 0x7b, 0x00, 0x00}, - { 0x6f, 0x48, 0x7c, 0x00, 0x00}, - { 0x70, 0x49, 0x7d, 0x00, 0x00}, - { 0x71, 0x4a, 0x7e, 0x00, 0x00}, - { 0x72, 0x4b, 0x7f, 0x00, 0x00}, - { 0x73, 0x4c, 0x80, 0x00, 0x00}, - { 0x74, 0x4d, 0x81, 0x00, 0x00}, - { 0x75, 0x4e, 0x82, 0x00, 0x31}, - { 0x76, 0x4f, 0x83, 0x00, 0x32}, - { 0x77, 0x50, 0x84, 0x00, 0x33}, + { 0x27, 0x00, 0x35, 0x01, 0x00 }, + { 0x28, 0x01, 0x35, 0x01, 0x00 }, + { 0x29, 0x02, 0x36, 0x01, 0x01 }, + { 0x2a, 0x03, 0x37, 0x01, 0x02 }, + { 0x2b, 0x04, 0x38, 0x01, 0x03 }, + { 0x2c, 0x05, 0x39, 0x02, 0x04 }, + { 0x2d, 0x06, 0x3a, 0x02, 0x05 }, + { 0x2f, 0x07, 0x3b, 0x01, 0x06 }, + { 0x2e, 0x08, 0x3c, 0x01, 0x07 }, + { 0x31, 0x09, 0x3d, 0x01, 0x08 }, + { 0x30, 0x0a, 0x3e, 0x01, 0x09 }, + { 0x33, 0x0b, 0x3f, 0x02, 0x0a }, + { 0x32, 0x0c, 0x40, 0x02, 0x0b }, + { 0x34, 0x0d, 0x41, 0x02, 0x0c }, + { 0x35, 0x0e, 0x42, 0x02, 0x0d }, + { 0x36, 0x0f, 0x43, 0x02, 0x0e }, + { 0x37, 0x10, 0x44, 0x02, 0x0f }, + { 0x38, 0x11, 0x49, 0x02, 0x10 }, + { 0x39, 0x12, 0x4a, 0x02, 0x11 }, + { 0x3a, 0x13, 0x4b, 0x02, 0x12 }, + { 0x3b, 0x14, 0x4c, 0x02, 0x13 }, + { 0x3c, 0x15, 0x45, 0x02, 0x14 }, + { 0x3d, 0x16, 0x46, 0x02, 0x15 }, + { 0x3e, 0x17, 0x47, 0x02, 0x16 }, + { 0x3f, 0x18, 0x48, 0x02, 0x17 }, + { 0x40, 0x19, 0x4d, 0x01, 0x18 }, + { 0x41, 0x1a, 0x4e, 0x01, 0x19 }, + { 0x42, 0x1b, 0x4f, 0x01, 0x1a }, + { 0x43, 0x1c, 0x50, 0x01, 0x1b }, + { 0x44, 0x1d, 0x51, 0x01, 0x1c }, + { 0x45, 0x1e, 0x52, 0x01, 0x1d }, + { 0x46, 0x1f, 0x53, 0x01, 0x1e }, + { 0x47, 0x20, 0x54, 0x01, 0x1f }, + { 0x48, 0x21, 0x55, 0x01, 0x20 }, + { 0x49, 0x22, 0x56, 0x01, 0x21 }, + { 0x4a, 0x23, 0x57, 0x02, 0x22 }, + { 0x4b, 0x24, 0x58, 0x02, 0x23 }, + { 0x4c, 0x25, 0x59, 0x01, 0x24 }, + { 0x4d, 0x26, 0x5a, 0x01, 0x25 }, + { 0x4e, 0x27, 0x5b, 0x01, 0x26 }, + { 0x4f, 0x28, 0x5c, 0x01, 0x27 }, + { 0x50, 0x29, 0x5d, 0x01, 0x28 }, + { 0x51, 0x2a, 0x5e, 0x01, 0x29 }, + { 0x52, 0x2b, 0x5f, 0x01, 0x2a }, + { 0x53, 0x2c, 0x60, 0x01, 0x2b }, + { 0x54, 0x2d, 0x61, 0x01, 0x2c }, + { 0x55, 0x2e, 0x62, 0x01, 0x2d }, + { 0x56, 0x2f, 0x63, 0x01, 0x2e }, + { 0x57, 0x30, 0x64, 0x01, 0x2f }, + { 0x58, 0x31, 0x65, 0x01, 0x30 }, + { 0x59, 0x32, 0x66, 0x00, 0x00 }, + { 0x5a, 0x33, 0x67, 0x00, 0x00 }, + { 0x5b, 0x34, 0x68, 0x00, 0x00 }, + { 0x5c, 0x35, 0x69, 0x00, 0x00 }, + { 0x5d, 0x36, 0x6a, 0x00, 0x00 }, + { 0x5e, 0x37, 0x6b, 0x00, 0x00 }, + { 0x5f, 0x38, 0x6c, 0x00, 0x00 }, + { 0x60, 0x39, 0x6d, 0x00, 0x00 }, + { 0x61, 0x3a, 0x6e, 0x00, 0x00 }, + { 0x62, 0x3b, 0x6f, 0x00, 0x00 }, + { 0x63, 0x3c, 0x70, 0x00, 0x00 }, + { 0x64, 0x3d, 0x71, 0x00, 0x00 }, + { 0x65, 0x3e, 0x72, 0x00, 0x00 }, + { 0x66, 0x3f, 0x73, 0x00, 0x00 }, + { 0x67, 0x40, 0x74, 0x00, 0x00 }, + { 0x68, 0x41, 0x75, 0x00, 0x00 }, + { 0x69, 0x42, 0x76, 0x00, 0x00 }, + { 0x6a, 0x43, 0x77, 0x00, 0x00 }, + { 0x6b, 0x44, 0x78, 0x00, 0x00 }, + { 0x6c, 0x45, 0x79, 0x00, 0x00 }, + { 0x6d, 0x46, 0x7a, 0x00, 0x00 }, + { 0x6e, 0x47, 0x7b, 0x00, 0x00 }, + { 0x6f, 0x48, 0x7c, 0x00, 0x00 }, + { 0x70, 0x49, 0x7d, 0x00, 0x00 }, + { 0x71, 0x4a, 0x7e, 0x00, 0x00 }, + { 0x72, 0x4b, 0x7f, 0x00, 0x00 }, + { 0x73, 0x4c, 0x80, 0x00, 0x00 }, + { 0x74, 0x4d, 0x81, 0x00, 0x00 }, + { 0x75, 0x4e, 0x82, 0x00, 0x31 }, + { 0x76, 0x4f, 0x83, 0x00, 0x32 }, + { 0x77, 0x50, 0x84, 0x00, 0x33 }, }; // Has something to do with seals... diff --git a/src/unk_02097F6C.c b/src/unk_02097F6C.c index 96dbd63050..75d205c592 100644 --- a/src/unk_02097F6C.c +++ b/src/unk_02097F6C.c @@ -13,26 +13,26 @@ #define SWARM_MAP_COUNT 20 static const u16 sSwarmMapLUT[SWARM_MAP_COUNT][2] = { - {MAP_R01, 0}, - { MAP_R03, 0}, - { MAP_R09, 0}, - { MAP_R12, 2}, - { MAP_R13, 0}, - { MAP_W19, 1}, - { MAP_R32, 2}, - { MAP_R25, 0}, - { MAP_R27, 1}, - { MAP_R34, 0}, - { MAP_R35, 0}, - { MAP_R38, 0}, - { MAP_R44, 2}, - { MAP_R45, 0}, - { MAP_R47, 0}, - { MAP_D38R0101, 0}, - { MAP_D42R0102, 0}, - { MAP_D46R0101, 0}, - { MAP_T06, 1}, - { MAP_T22, 2}, + { MAP_R01, 0 }, + { MAP_R03, 0 }, + { MAP_R09, 0 }, + { MAP_R12, 2 }, + { MAP_R13, 0 }, + { MAP_W19, 1 }, + { MAP_R32, 2 }, + { MAP_R25, 0 }, + { MAP_R27, 1 }, + { MAP_R34, 0 }, + { MAP_R35, 0 }, + { MAP_R38, 0 }, + { MAP_R44, 2 }, + { MAP_R45, 0 }, + { MAP_R47, 0 }, + { MAP_D38R0101, 0 }, + { MAP_D42R0102, 0 }, + { MAP_D46R0101, 0 }, + { MAP_T06, 1 }, + { MAP_T22, 2 }, }; BOOL sub_02097F6C(u32 rand, u16 mapno, u16 swarmValue) { diff --git a/src/voltorb_flip/voltorb_flip_data2.c b/src/voltorb_flip/voltorb_flip_data2.c index 52b0289446..994bb52dc2 100644 --- a/src/voltorb_flip/voltorb_flip_data2.c +++ b/src/voltorb_flip/voltorb_flip_data2.c @@ -25,15 +25,15 @@ const struct GraphicsModes sVoltorbFlipBgModeSet = { }; const MsgNoList sMenuMsgNos[] = { - {sMainMenuMsgNos, 3}, - { sGameInfoMsgNos, 4}, + { sMainMenuMsgNos, 3 }, + { sGameInfoMsgNos, 4 }, }; const u8 ov122_021E92B0[4][4] = { - {0x0C, 0x08, 0x05, 0x01}, - { 0x0F, 0x0B, 0x06, 0x02}, - { 0x0E, 0x0A, 0x07, 0x04}, - { 0x0D, 0x09, 0x08, 0x08}, + { 0x0C, 0x08, 0x05, 0x01 }, + { 0x0F, 0x0B, 0x06, 0x02 }, + { 0x0E, 0x0A, 0x07, 0x04 }, + { 0x0D, 0x09, 0x08, 0x08 }, }; const OamCharTransferParam ov122_021E92D0 = { @@ -62,10 +62,10 @@ const GraphicsBanks sVoltorbFlipGraphicsBanks = { }; const Ov122_021E6C2C ov122_021E9344[4] = { - {0x00, 0x00, 0x21}, - { 0x02, 0x00, 0x22}, - { 0x00, 0x02, 0x23}, - { 0x02, 0x02, 0x24}, + { 0x00, 0x00, 0x21 }, + { 0x02, 0x00, 0x22 }, + { 0x00, 0x02, 0x23 }, + { 0x02, 0x02, 0x24 }, }; const UnkTemplate_0200D748 ov122_021E93A8 = { diff --git a/src/voltorb_flip/voltorb_flip_data3.c b/src/voltorb_flip/voltorb_flip_data3.c index a304c98c44..392a8f5418 100644 --- a/src/voltorb_flip/voltorb_flip_data3.c +++ b/src/voltorb_flip/voltorb_flip_data3.c @@ -4,20 +4,20 @@ #include "voltorb_flip/voltorb_flip_workflow.h" const VoltorbFlipWorkflows sVoltorbFlipWorkflows = { - [WORKFLOW_UNK_0] = {NULL, ov122_021E5BA8, ov122_021E5BE4, NULL, NULL }, - [WORKFLOW_NEW_ROUND] = { NULL, GenerateBoardAndPrintNewLevel, PrintYouCanEarnEvenMoreCoins, NULL, ov122_021E5D24 }, - [WORKFLOW_SELECT_MAIN_MENU] = { PrintPlayNewRound, ov122_021E5DB4, AwaitMainMenuSelection, NULL, NULL }, - [WORKFLOW_SELECT_GAME_INFO] = { PrintWhichSetOfInfo, ov122_021E5E34, AwaitGameInfoSelection, NULL, NULL }, - [WORKFLOW_HOW_TO_PLAY] = { OpenHowToPlayScreen, NULL, PrintHowToPlayMsg, NULL, CloseTutorialScreen}, - [WORKFLOW_HINT] = { OpenHintScreen, NULL, PrintHintMsg, NULL, CloseTutorialScreen}, - [WORKFLOW_ABOUT_MEMO] = { OpenAboutMemoScreen, NULL, PrintAboutMemoMsg, NULL, CloseTutorialScreen}, - [WORKFLOW_RENDER_BOARD] = { NULL, NULL, RenderBoard, NULL, NULL }, - [WORKFLOW_AWAIT_BOARD_INTERACT] = { NULL, NULL, AwaitBoardInteraction, NULL, ov122_021E6008 }, - [WORKFLOW_FLIP_CARD] = { PlaySuspensefulFanfare, StartCardFlipEffect, AwaitCardFlipAndResult, ov122_021E6358, NULL }, - [WORKFLOW_UNK_10] = { NULL, NULL, PlayWinRoundFanfare, NULL, NULL }, - [WORKFLOW_AWARD_COINS] = { NULL, NULL, AwardCoins, NULL, NULL }, - [WORKFLOW_REVEAL_BOARD] = { NULL, NULL, ov122_021E64E8, ov122_021E6594, NULL }, - [WORKFLOW_UNK_13] = { ov122_021E65F4, NULL, ov122_021E65FC, NULL, ov122_021E67E0 }, - [WORKFLOW_UNK_14] = { ov122_021E66CC, ov122_021E66FC, ov122_021E6700, ov122_021E67DC, ov122_021E67E0 }, - [WORKFLOW_QUIT_ROUND] = { PrintAreYouSureYouWantToQuit, ov122_021E6900, AwaitQuitYesNoSelection, ov122_021E69DC, NULL }, + [WORKFLOW_UNK_0] = { NULL, ov122_021E5BA8, ov122_021E5BE4, NULL, NULL }, + [WORKFLOW_NEW_ROUND] = { NULL, GenerateBoardAndPrintNewLevel, PrintYouCanEarnEvenMoreCoins, NULL, ov122_021E5D24 }, + [WORKFLOW_SELECT_MAIN_MENU] = { PrintPlayNewRound, ov122_021E5DB4, AwaitMainMenuSelection, NULL, NULL }, + [WORKFLOW_SELECT_GAME_INFO] = { PrintWhichSetOfInfo, ov122_021E5E34, AwaitGameInfoSelection, NULL, NULL }, + [WORKFLOW_HOW_TO_PLAY] = { OpenHowToPlayScreen, NULL, PrintHowToPlayMsg, NULL, CloseTutorialScreen }, + [WORKFLOW_HINT] = { OpenHintScreen, NULL, PrintHintMsg, NULL, CloseTutorialScreen }, + [WORKFLOW_ABOUT_MEMO] = { OpenAboutMemoScreen, NULL, PrintAboutMemoMsg, NULL, CloseTutorialScreen }, + [WORKFLOW_RENDER_BOARD] = { NULL, NULL, RenderBoard, NULL, NULL }, + [WORKFLOW_AWAIT_BOARD_INTERACT] = { NULL, NULL, AwaitBoardInteraction, NULL, ov122_021E6008 }, + [WORKFLOW_FLIP_CARD] = { PlaySuspensefulFanfare, StartCardFlipEffect, AwaitCardFlipAndResult, ov122_021E6358, NULL }, + [WORKFLOW_UNK_10] = { NULL, NULL, PlayWinRoundFanfare, NULL, NULL }, + [WORKFLOW_AWARD_COINS] = { NULL, NULL, AwardCoins, NULL, NULL }, + [WORKFLOW_REVEAL_BOARD] = { NULL, NULL, ov122_021E64E8, ov122_021E6594, NULL }, + [WORKFLOW_UNK_13] = { ov122_021E65F4, NULL, ov122_021E65FC, NULL, ov122_021E67E0 }, + [WORKFLOW_UNK_14] = { ov122_021E66CC, ov122_021E66FC, ov122_021E6700, ov122_021E67DC, ov122_021E67E0 }, + [WORKFLOW_QUIT_ROUND] = { PrintAreYouSureYouWantToQuit, ov122_021E6900, AwaitQuitYesNoSelection, ov122_021E69DC, NULL }, }; diff --git a/src/voltorb_flip/voltorb_flip_data4.c b/src/voltorb_flip/voltorb_flip_data4.c index 3be1aebc6f..fe2580b8ec 100644 --- a/src/voltorb_flip/voltorb_flip_data4.c +++ b/src/voltorb_flip/voltorb_flip_data4.c @@ -110,108 +110,108 @@ const u8 sBoardIdDistribution[8][80] = { // of multipliers. In this case, your board could give you all but 1 of the // multipliers for free. const BoardConfig sBoardConfigs[80] = { - // Lv. 1 - // Voltorbs Twos Threes MaxFreePerRowCol MaxFreeTotal Payout - {6, 3, 1, 3, 3}, // 24 - { 6, 0, 3, 2, 2}, // 27 - { 6, 5, 0, 3, 4}, // 32 - { 6, 2, 2, 3, 3}, // 36 - { 6, 4, 1, 3, 4}, // 48 - - { 6, 3, 1, 3, 3}, // 24 - { 6, 0, 3, 2, 2}, // 27 - { 6, 5, 0, 3, 4}, // 32 - { 6, 2, 2, 3, 3}, // 36 - { 6, 4, 1, 3, 4}, // 48 - - // Lv. 2 - { 7, 1, 3, 2, 3}, // 54 - { 7, 6, 0, 3, 4}, // 64 - { 7, 3, 2, 2, 3}, // 72 - { 7, 0, 4, 2, 3}, // 81 - { 7, 5, 1, 3, 4}, // 96 - - { 7, 1, 3, 2, 2}, // 54 - { 7, 6, 0, 3, 3}, // 64 - { 7, 3, 2, 2, 2}, // 72 - { 7, 0, 4, 2, 2}, // 81 - { 7, 5, 1, 3, 3}, // 96 - - // Lv. 3 - { 8, 2, 3, 2, 3}, // 108 - { 8, 7, 0, 3, 4}, // 128 - { 8, 4, 2, 3, 4}, // 144 - { 8, 1, 4, 2, 3}, // 162 - { 8, 6, 1, 4, 3}, // 192 - - { 8, 2, 3, 2, 2}, // 108 - { 8, 7, 0, 3, 3}, // 128 - { 8, 4, 2, 3, 3}, // 144 - { 8, 1, 4, 2, 2}, // 162 - { 8, 6, 1, 3, 3}, // 192 - - // Lv. 4 - { 8, 3, 3, 4, 3}, // 216 - { 8, 0, 5, 2, 3}, // 243 - { 10, 8, 0, 4, 5}, // 256 - { 10, 5, 2, 3, 4}, // 288 - { 10, 2, 4, 3, 4}, // 324 - - { 8, 3, 3, 3, 3}, // 216 - { 8, 0, 5, 2, 2}, // 243 - { 10, 8, 0, 4, 4}, // 256 - { 10, 5, 2, 3, 3}, // 288 - { 10, 2, 4, 3, 3}, // 324 - - // Lv. 5 - { 10, 7, 1, 4, 5}, // 384 - { 10, 4, 3, 3, 4}, // 432 - { 10, 1, 5, 3, 4}, // 486 - { 10, 9, 0, 4, 5}, // 512 - { 10, 6, 2, 4, 5}, // 576 - - { 10, 7, 1, 4, 4}, // 384 - { 10, 4, 3, 3, 3}, // 432 - { 10, 1, 5, 3, 3}, // 486 - { 10, 9, 0, 4, 4}, // 512 - { 10, 6, 2, 4, 4}, // 576 - - // Lv. 6 - { 10, 3, 4, 3, 4}, // 648 - { 10, 0, 6, 3, 4}, // 729 - { 10, 8, 1, 4, 5}, // 768 - { 10, 5, 3, 4, 5}, // 864 - { 10, 2, 5, 3, 4}, // 972 - - { 10, 3, 4, 3, 3}, // 648 - { 10, 0, 6, 3, 3}, // 729 - { 10, 8, 1, 4, 4}, // 768 - { 10, 5, 3, 4, 4}, // 864 - { 10, 2, 5, 3, 3}, // 972 - - // Lv. 7 - { 10, 7, 2, 4, 5}, // 1152 - { 10, 4, 4, 4, 5}, // 1296 - { 13, 1, 6, 3, 4}, // 1458 - { 13, 9, 1, 5, 6}, // 1536 - { 10, 6, 3, 4, 5}, // 1728 - - { 10, 7, 2, 4, 4}, // 1152 - { 10, 4, 4, 4, 4}, // 1296 - { 13, 1, 6, 3, 3}, // 1458 - { 13, 9, 1, 5, 5}, // 1536 - { 10, 6, 3, 4, 4}, // 1728 - - // Lv. 8 - { 10, 0, 7, 3, 4}, // 2187 - { 10, 8, 2, 5, 6}, // 2304 - { 10, 5, 4, 4, 5}, // 2592 - { 10, 2, 6, 4, 5}, // 2916 - { 10, 7, 3, 5, 6}, // 3456 - - { 10, 0, 7, 3, 3}, // 2187 - { 10, 8, 2, 5, 5}, // 2304 - { 10, 5, 4, 4, 4}, // 2592 - { 10, 2, 6, 4, 4}, // 2916 - { 10, 7, 3, 5, 5}, // 3456 + // Lv. 1 + // Voltorbs Twos Threes MaxFreePerRowCol MaxFreeTotal Payout + { 6, 3, 1, 3, 3 }, // 24 + { 6, 0, 3, 2, 2 }, // 27 + { 6, 5, 0, 3, 4 }, // 32 + { 6, 2, 2, 3, 3 }, // 36 + { 6, 4, 1, 3, 4 }, // 48 + + { 6, 3, 1, 3, 3 }, // 24 + { 6, 0, 3, 2, 2 }, // 27 + { 6, 5, 0, 3, 4 }, // 32 + { 6, 2, 2, 3, 3 }, // 36 + { 6, 4, 1, 3, 4 }, // 48 + + // Lv. 2 + { 7, 1, 3, 2, 3 }, // 54 + { 7, 6, 0, 3, 4 }, // 64 + { 7, 3, 2, 2, 3 }, // 72 + { 7, 0, 4, 2, 3 }, // 81 + { 7, 5, 1, 3, 4 }, // 96 + + { 7, 1, 3, 2, 2 }, // 54 + { 7, 6, 0, 3, 3 }, // 64 + { 7, 3, 2, 2, 2 }, // 72 + { 7, 0, 4, 2, 2 }, // 81 + { 7, 5, 1, 3, 3 }, // 96 + + // Lv. 3 + { 8, 2, 3, 2, 3 }, // 108 + { 8, 7, 0, 3, 4 }, // 128 + { 8, 4, 2, 3, 4 }, // 144 + { 8, 1, 4, 2, 3 }, // 162 + { 8, 6, 1, 4, 3 }, // 192 + + { 8, 2, 3, 2, 2 }, // 108 + { 8, 7, 0, 3, 3 }, // 128 + { 8, 4, 2, 3, 3 }, // 144 + { 8, 1, 4, 2, 2 }, // 162 + { 8, 6, 1, 3, 3 }, // 192 + + // Lv. 4 + { 8, 3, 3, 4, 3 }, // 216 + { 8, 0, 5, 2, 3 }, // 243 + { 10, 8, 0, 4, 5 }, // 256 + { 10, 5, 2, 3, 4 }, // 288 + { 10, 2, 4, 3, 4 }, // 324 + + { 8, 3, 3, 3, 3 }, // 216 + { 8, 0, 5, 2, 2 }, // 243 + { 10, 8, 0, 4, 4 }, // 256 + { 10, 5, 2, 3, 3 }, // 288 + { 10, 2, 4, 3, 3 }, // 324 + + // Lv. 5 + { 10, 7, 1, 4, 5 }, // 384 + { 10, 4, 3, 3, 4 }, // 432 + { 10, 1, 5, 3, 4 }, // 486 + { 10, 9, 0, 4, 5 }, // 512 + { 10, 6, 2, 4, 5 }, // 576 + + { 10, 7, 1, 4, 4 }, // 384 + { 10, 4, 3, 3, 3 }, // 432 + { 10, 1, 5, 3, 3 }, // 486 + { 10, 9, 0, 4, 4 }, // 512 + { 10, 6, 2, 4, 4 }, // 576 + + // Lv. 6 + { 10, 3, 4, 3, 4 }, // 648 + { 10, 0, 6, 3, 4 }, // 729 + { 10, 8, 1, 4, 5 }, // 768 + { 10, 5, 3, 4, 5 }, // 864 + { 10, 2, 5, 3, 4 }, // 972 + + { 10, 3, 4, 3, 3 }, // 648 + { 10, 0, 6, 3, 3 }, // 729 + { 10, 8, 1, 4, 4 }, // 768 + { 10, 5, 3, 4, 4 }, // 864 + { 10, 2, 5, 3, 3 }, // 972 + + // Lv. 7 + { 10, 7, 2, 4, 5 }, // 1152 + { 10, 4, 4, 4, 5 }, // 1296 + { 13, 1, 6, 3, 4 }, // 1458 + { 13, 9, 1, 5, 6 }, // 1536 + { 10, 6, 3, 4, 5 }, // 1728 + + { 10, 7, 2, 4, 4 }, // 1152 + { 10, 4, 4, 4, 4 }, // 1296 + { 13, 1, 6, 3, 3 }, // 1458 + { 13, 9, 1, 5, 5 }, // 1536 + { 10, 6, 3, 4, 4 }, // 1728 + + // Lv. 8 + { 10, 0, 7, 3, 4 }, // 2187 + { 10, 8, 2, 5, 6 }, // 2304 + { 10, 5, 4, 4, 5 }, // 2592 + { 10, 2, 6, 4, 5 }, // 2916 + { 10, 7, 3, 5, 6 }, // 3456 + + { 10, 0, 7, 3, 3 }, // 2187 + { 10, 8, 2, 5, 5 }, // 2304 + { 10, 5, 4, 4, 4 }, // 2592 + { 10, 2, 6, 4, 4 }, // 2916 + { 10, 7, 3, 5, 5 }, // 3456 }; diff --git a/src/voltorb_flip/voltorb_flip_data5.c b/src/voltorb_flip/voltorb_flip_data5.c index 6deaa6c6c8..6c431084e1 100644 --- a/src/voltorb_flip/voltorb_flip_data5.c +++ b/src/voltorb_flip/voltorb_flip_data5.c @@ -381,9 +381,9 @@ const u8 ov122_021E9AAC[] = { }; u8 ov122_021E9BA0[5][2] = { - {0xC8, 0x50}, - { 0xE0, 0x50}, - { 0xC8, 0x68}, - { 0xE0, 0x68}, - { 0xE0, 0x80}, + { 0xC8, 0x50 }, + { 0xE0, 0x50 }, + { 0xC8, 0x68 }, + { 0xE0, 0x68 }, + { 0xE0, 0x80 }, }; diff --git a/src/yes_no_prompt.c b/src/yes_no_prompt.c index 49b15e2663..4bd2bb1924 100644 --- a/src/yes_no_prompt.c +++ b/src/yes_no_prompt.c @@ -74,8 +74,8 @@ void YesNoPrompt_Destroy(YesNoPrompt *yesno) { static void YesNoPrompt_InitFromTemplate_Internal(YesNoPrompt *yesno, const YesNoPromptTemplate *template) { static const u8 dimensions[2][2] = { - {6, 4}, - { 16, 6}, + { 6, 4 }, + { 16, 6 }, }; yesno->bgConfig = template->bgConfig; From 8c5cfdecd2d6943f573ae04c8ccc893b1d72428f Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:34:42 -0400 Subject: [PATCH 10/15] Add instruction to install clang-format-18 in CONTRIBUTING.md --- CONTRIBUTING.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79ae2dc11e..8c7d3bb11d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -47,3 +47,23 @@ asm void func() { // clang-format on #endif // NONMATCHING ``` + +### Ubuntu (WSL) Installation + +On older versions of Ubuntu, clang-format will default to earlier versions. +To install clang-format-18 on Ubuntu (WSL), run the following: +```sh +wget https://apt.llvm.org/llvm.sh +chmod +x llvm.sh +sudo ./llvm.sh 18 +sudo apt install clang-format-18 +``` +And then create a symbolic link: +```sh +ln -s /usr/bin/clang-format-18 /usr/bin/clang-format +``` + +If you're using the pre-commit hook, you also want to set up a symlink for git: +```sh +git config alias.clang-format clang-format-18 +``` From fea5b3a69b189f36ff1d0e781a05d359671af240 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:38:27 -0400 Subject: [PATCH 11/15] Revert rejected workflow changes idek how they got here man --- .githooks/pre-commit | 2 +- .github/workflows/build.yml | 67 ++++++++++++++++++++++--------------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 7eb20ecf41..3a45d407a5 100644 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -6,4 +6,4 @@ exec 1>&2 if ! git clang-format --extensions c,cpp,h,hpp ; then echo "linting made changes to source files; aborting commit" exit 1 -fi +fi \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9f13f958e..6b9de8053a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,9 +13,10 @@ env: CALCROM_DISCORD_WEBHOOK_AVATAR_URL: "https://i.imgur.com/38BQHdd.png" CALCROM_DISCORD_WEBHOOK_USERNAME: OK CALCROM_WEBHOOK_URL: ${{ secrets.WEBHOOKURL }} + COMPARE: 1 jobs: - build-heartgold: + build: runs-on: ubuntu-22.04 steps: @@ -33,42 +34,37 @@ jobs: sudo apt update sudo apt -y --allow-downgrades install --install-recommends winehq-stable - steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Build ROM - env: - GAME_VERSION: SOULSILVER - GAME_LANGUAGE: ENGLISH - GAME_REVISION: 0 - NONMATCHING: 0 - COMPARE: 1 - BUILD_OUT: build/soulsilver.us/ - uses: ./.github/workflows/build-rom - - build-nonmatching-heartgold: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout Repo - uses: actions/checkout@v4 + - name: Setup Repo + run: | + mkdir -p ~/download + cd ~/download + wget https://github.com/pret/pokeheartgold/raw/workflows/assets/mwccarm.zip + wget https://github.com/pret/pokeheartgold/raw/workflows/assets/NitroSDK-3_2-060901.7z + unzip mwccarm.zip + mv mwccarm $GITHUB_WORKSPACE/tools + 7z x NitroSDK-3_2-060901.7z + mv NitroSDK-3_2-060901/tools/bin $GITHUB_WORKSPACE/tools + mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template $GITHUB_WORKSPACE/sub/ + mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template $GITHUB_WORKSPACE/ + mv NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template $GITHUB_WORKSPACE/ + working-directory: ~ + + - name: Set Swap Space + uses: pierotofy/set-swap-space@master + with: + swap-size-gb: 19 - - name: Build ROM + - name: Build HeartGold env: GAME_VERSION: HEARTGOLD GAME_LANGUAGE: ENGLISH GAME_REVISION: 0 run: make -j4 - build-nonmatching-soulsilver: - runs-on: ubuntu-22.04 - - steps: - - name: Checkout Repo - uses: actions/checkout@v4 - - - name: Build ROM + - name: Build SoulSilver env: GAME_VERSION: SOULSILVER GAME_LANGUAGE: ENGLISH @@ -76,18 +72,34 @@ jobs: run: make -j4 - name: Webhook + if: ${{ github.event_name == 'push' }} run: | sudo chmod 755 $GITHUB_WORKSPACE/.github/calcrom/webhook.sh $GITHUB_WORKSPACE/.github/calcrom/webhook.sh pokeheartgold "$CALCROM_WEBHOOK_URL" continue-on-error: true + - name: Post error archive + if: failure() + continue-on-error: true + run: find . -maxdepth 2 -type d \( -name build -or -name files \) -exec tar -czvhf failure.tar.gz {} + + + - name: Post error upload + if: failure() + uses: actions/upload-artifact@v4 + with: + name: pokeheartgold-failure-${{ github.run_id }} + path: failure.tar.gz + retention-days: 1 + - name: Checkout xMAP + if: ${{ github.event_name == 'push' }} uses: actions/checkout@v4 with: path: 'xmap' ref: 'xmap' - name: Move xMAP + if: ${{ github.event_name == 'push' }} run: | mkdir -p xmap cp build/heartgold.us/*.xMAP xmap/heartgoldus.xMAP @@ -95,6 +107,7 @@ jobs: echo "XMAP_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV - name: Update xMAP + if: ${{ github.event_name == 'push' }} uses: EndBug/add-and-commit@v9 with: cwd: "./xmap" From f0ebb479318ae1f7165f51a1f1a283001c4d9df1 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:42:56 -0400 Subject: [PATCH 12/15] Requested changes + remove artefacts --- .githooks/pre-commit | 2 +- .github/workflows/build-rom/action.yml | 61 ----- config.mk | 4 - src/overlay_mic_test.c | 293 +++++++++++++++++++------ 4 files changed, 225 insertions(+), 135 deletions(-) delete mode 100644 .github/workflows/build-rom/action.yml diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 3a45d407a5..7eb20ecf41 100644 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -6,4 +6,4 @@ exec 1>&2 if ! git clang-format --extensions c,cpp,h,hpp ; then echo "linting made changes to source files; aborting commit" exit 1 -fi \ No newline at end of file +fi diff --git a/.github/workflows/build-rom/action.yml b/.github/workflows/build-rom/action.yml deleted file mode 100644 index cef277b20a..0000000000 --- a/.github/workflows/build-rom/action.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: 'Build ROM' - -description: 'Builds the ROM image' - -runs: - using: "composite" - steps: - - name: Update and Install Software - shell: bash - run: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt update - sudo ACCEPT_EULA=Y apt -y --fix-missing --allow-downgrades upgrade - sudo apt -y --allow-downgrades install g++-10-multilib linux-libc-dev binutils-arm-none-eabi p7zip-full pkg-config libpugixml-dev ppa-purge - sudo ppa-purge -y ppa:ubuntu-toolchain-r/test || true - sudo dpkg --add-architecture i386 - sudo mkdir -pm755 /etc/apt/keyrings - sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key - sudo add-apt-repository ppa:cybermax-dexter/sdl2-backport - sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -cs)/winehq-$(lsb_release -cs).sources - sudo apt update - sudo apt -y --allow-downgrades install --install-recommends winehq-stable - - - name: Setup Repo - shell: bash - run: | - mkdir -p ~/download - cd ~/download - wget https://github.com/pret/pokeheartgold/raw/workflows/assets/mwccarm.zip - wget https://github.com/pret/pokeheartgold/raw/workflows/assets/NitroSDK-3_2-060901.7z - unzip mwccarm.zip - mv mwccarm $GITHUB_WORKSPACE/tools - 7z x NitroSDK-3_2-060901.7z - mv NitroSDK-3_2-060901/tools/bin $GITHUB_WORKSPACE/tools - mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM7-TS.lcf.template $GITHUB_WORKSPACE/sub/ - mv NitroSDK-3_2-060901/include/nitro/specfiles/ARM9-TS.lcf.template $GITHUB_WORKSPACE/ - mv NitroSDK-3_2-060901/include/nitro/specfiles/mwldarm.response.template $GITHUB_WORKSPACE/ - working-directory: ~ - - - name: Set Swap Space - uses: pierotofy/set-swap-space@master - with: - swap-size-gb: 19 - - - name: Build ROM - shell: bash - run: make -j${nproc} - - - name: Archive build artifacts - if: ${{ always() && env.NONMATCHING == 0 }} - shell: bash - run: | - find . -maxdepth 2 -type d \( -name build -or -name files \) -exec tar -czhf ${GAME_VERSION}_build.tar.gz {} + - - - name: Upload build artifacts - if: ${{ always() && env.NONMATCHING == 0 }} - uses: actions/upload-artifact@v4 - with: - name: ${{ env.GAME_VERSION }}-build - path: ${{ env.GAME_VERSION }}_build.tar.gz - retention-days: 1 diff --git a/config.mk b/config.mk index fe255555e6..2b5ff9e565 100644 --- a/config.mk +++ b/config.mk @@ -1,7 +1,6 @@ GAME_VERSION ?= HEARTGOLD GAME_REMASTER ?= 0 GAME_LANGUAGE ?= ENGLISH -NONMATCHING ?= 0 ifeq ($(GAME_VERSION),HEARTGOLD) buildname := heartgold @@ -37,9 +36,6 @@ GF_DEFINES := -D$(GAME_VERSION) -DGAME_REMASTER=$(GAME_REMASTER) -D$(GAME_LANGU ifeq ($(NO_GF_ASSERT),) GF_DEFINES += -DPM_KEEP_ASSERTS endif -ifneq ($(NONMATCHING),0) -GF_DEFINES += -DNONMATCHING -endif GLB_DEFINES := -DSDK_ARM9 -DSDK_CODE_ARM -DSDK_FINALROM # CLI_DEFINES="-DMY_DEFINE=1 -DMY_OTHER_DEFINE=2 ..." diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 6b9ef7747a..39a303bf52 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -1,5 +1,8 @@ #include "overlay_mic_test.h" +#include "msgdata/msg.naix" +#include "msgdata/msg/msg_0234.h" + #include "font.h" #include "gf_gfx_loader.h" #include "main.h" @@ -128,13 +131,15 @@ static const GraphicsBanks sMicTestGraphicsBanks = { .texpltt = GX_VRAM_TEXPLTT_NONE }; -static const struct { +typedef struct UnkStruct_021E6728 { BgTemplate bgTemplate; - u8 unk1C; + u8 bgId; u8 unk1D; u8 unk1E; u8 unk1F; -} ov62_021E6728[] = { +} UnkStruct_021E6728; + +static const UnkStruct_021E6728 ov62_021E6728[] = { { .bgTemplate = { .x = 0, @@ -149,48 +154,160 @@ static const struct { .priority = 0, .areaOver = 0, .dummy = 0, - .mosaic = 0 }, - .unk1C = 0, + .mosaic = 0, + }, + .bgId = 0, .unk1D = 0, .unk1E = 0, .unk1F = 0, }, { - .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1E, .charBase = 1, .bgExtPltt = 0, .priority = 1, .areaOver = 0, .dummy = 0, .mosaic = 0 }, - .unk1C = 1, - .unk1D = 0, - .unk1E = 0, - .unk1F = 0, + .bgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = 1, + .colorMode = 0, + .screenBase = 0x1E, + .charBase = 1, + .bgExtPltt = 0, + .priority = 1, + .areaOver = 0, + .dummy = 0, + .mosaic = 0, + }, + .bgId = 1, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, }, { - .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1D, .charBase = 2, .bgExtPltt = 0, .priority = 2, .areaOver = 0, .dummy = 0, .mosaic = 0 }, - .unk1C = 2, - .unk1D = 0, - .unk1E = 0, - .unk1F = 0, + .bgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = 1, + .colorMode = 0, + .screenBase = 0x1D, + .charBase = 2, + .bgExtPltt = 0, + .priority = 2, + .areaOver = 0, + .dummy = 0, + .mosaic = 0, + }, + .bgId = 2, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, }, { - .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1F, .charBase = 0, .bgExtPltt = 0, .priority = 0, .areaOver = 0, .dummy = 0, .mosaic = 0 }, - .unk1C = 4, - .unk1D = 0, - .unk1E = 0, - .unk1F = 0, + .bgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = 1, + .colorMode = 0, + .screenBase = 0x1F, + .charBase = 0, + .bgExtPltt = 0, + .priority = 0, + .areaOver = 0, + .dummy = 0, + .mosaic = 0, + }, + .bgId = 4, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, }, { - .bgTemplate = { .x = 0, .y = 0, .bufferSize = 0x800, .baseTile = 0, .size = 1, .colorMode = 0, .screenBase = 0x1E, .charBase = 1, .bgExtPltt = 0, .priority = 1, .areaOver = 0, .dummy = 0, .mosaic = 0 }, - .unk1C = 5, - .unk1D = 0, - .unk1E = 0, - .unk1F = 0, + .bgTemplate = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0, + .size = 1, + .colorMode = 0, + .screenBase = 0x1E, + .charBase = 1, + .bgExtPltt = 0, + .priority = 1, + .areaOver = 0, + .dummy = 0, + .mosaic = 0, + }, + .bgId = 5, + .unk1D = 0, + .unk1E = 0, + .unk1F = 0, }, }; static const UnkTemplate_0200D748 ov62_021E67C8[5] = { - { .x = 0x40, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, - { .x = 0xC0, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, - { .x = 0x80, .y = 0x60, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xB01, 0xB03, 0xB02, 0xB04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, - { .x = 0xD8, .y = 0xB0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DSUB, .resIdList = { 0xD01, 0xD03, 0xD02, 0xD04, 1, 0 }, .bgPriority = 0, .vramTransfer = 0 }, - { .x = 0, .y = 0, .z = 0, .animation = 0, .spritePriority = 0, .pal = 0, .vram = NNS_G2D_VRAM_TYPE_2DMAIN, .resIdList = { 0xC01, 0xC03, 0xC02, 0xC04, 0, 0 }, .bgPriority = 0, .vramTransfer = 0 }, + { + .x = 0x40, + .y = 0x60, + .z = 0, + .animation = 0, + .spritePriority = 0, + .pal = 0, + .vram = NNS_G2D_VRAM_TYPE_2DMAIN, + .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, + .bgPriority = 0, + .vramTransfer = 0, + }, + { + .x = 0xC0, + .y = 0x60, + .z = 0, + .animation = 0, + .spritePriority = 0, + .pal = 0, + .vram = NNS_G2D_VRAM_TYPE_2DMAIN, + .resIdList = { 0xA01, 0xA03, 0xA02, 0xA04, 0, 0 }, + .bgPriority = 0, + .vramTransfer = 0, + }, + { + .x = 0x80, + .y = 0x60, + .z = 0, + .animation = 0, + .spritePriority = 0, + .pal = 0, + .vram = NNS_G2D_VRAM_TYPE_2DMAIN, + .resIdList = { 0xB01, 0xB03, 0xB02, 0xB04, 0, 0 }, + .bgPriority = 0, + .vramTransfer = 0, + }, + { + .x = 0xD8, + .y = 0xB0, + .z = 0, + .animation = 0, + .spritePriority = 0, + .pal = 0, + .vram = NNS_G2D_VRAM_TYPE_2DSUB, + .resIdList = { 0xD01, 0xD03, 0xD02, 0xD04, 1, 0 }, + .bgPriority = 0, + .vramTransfer = 0, + }, + { + .x = 0, + .y = 0, + .z = 0, + .animation = 0, + .spritePriority = 0, + .pal = 0, + .vram = NNS_G2D_VRAM_TYPE_2DMAIN, + .resIdList = { 0xC01, 0xC03, 0xC02, 0xC04, 0, 0 }, + .bgPriority = 0, + .vramTransfer = 0, + }, }; static const u32 ov62_021E6694[7] = { 0, 1, 2, 3, 4, 4, 4 }; @@ -234,7 +351,7 @@ static const GraphicsModes sMicTestGraphicsMode = { ._2d3dMode = GX_BG0_AS_2D }; -static const struct { +typedef struct MicTestTextBox { u8 bgId; u8 x; u8 y; @@ -244,16 +361,42 @@ static const struct { u16 baseTile; u8 fontId; u32 color; -} ov62_021E66F8[3] = { - { .bgId = 0, .x = 1, .y = 1, .width = 9, .height = 3, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200 }, - { .bgId = 4, .x = 5, .y = 8, .width = 22, .height = 5, .palNum = 0, .baseTile = 1, .fontId = 0, .color = 0xF0200 }, - { .bgId = 4, .x = 24, .y = 21, .width = 6, .height = 2, .palNum = 0, .baseTile = 0x6F, .fontId = 4, .color = 0xE0F00 }, +} MicTestTextBox; + +static const MicTestTextBox sMicTestTextBoxes[3] = { + { .bgId = 0, + .x = 1, + .y = 1, + .width = 9, + .height = 3, + .palNum = 0, + .baseTile = 1, + .fontId = 0, + .color = MAKE_TEXT_COLOR(15, 2, 0) }, + { .bgId = 4, + .x = 5, + .y = 8, + .width = 22, + .height = 5, + .palNum = 0, + .baseTile = 1, + .fontId = 0, + .color = MAKE_TEXT_COLOR(15, 2, 0) }, + { .bgId = 4, + .x = 24, + .y = 21, + .width = 6, + .height = 2, + .palNum = 0, + .baseTile = 0x6F, + .fontId = 4, + .color = MAKE_TEXT_COLOR(14, 15, 0) }, }; const OVY_MGR_TEMPLATE gApplication_MicTest = { MicTest_Init, MicTest_Main, MicTest_Exit, FS_OVERLAY_ID_NONE }; static BOOL MicTest_Init(OVY_MANAGER *overlayMan, int *state) { - CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 3 << 0x10); + CreateHeap(HEAP_ID_3, HEAP_ID_MIC_TEST, 0x30000); MicTestData *micTest = OverlayManager_CreateAndGetData(overlayMan, sizeof(MicTestData), HEAP_ID_MIC_TEST); @@ -335,20 +478,26 @@ static void MicTestTaskMan_Finish(MicTestTaskManager *taskMan) { taskMan->isFinished = TRUE; } +enum { + MICTEST_FADE_IN_STATE_START, + MICTEST_FADE_IN_STATE_WAIT, + MICTEST_FADE_IN_STATE_END +}; + static void MicTestTask_FadeIn(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { - case 0: - BeginNormalPaletteFade(0, 1, 1, 0, 6, 1, micTest->heapId); - *state = 1; + case MICTEST_FADE_IN_STATE_START: + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 6, 1, micTest->heapId); + *state = MICTEST_FADE_IN_STATE_WAIT; break; - case 1: + case MICTEST_FADE_IN_STATE_WAIT: if (IsPaletteFadeFinished()) { - *state = 2; + *state = MICTEST_FADE_IN_STATE_END; } break; - case 2: + case MICTEST_FADE_IN_STATE_END: MicTest_SetTask(taskMan, ov62_021E5B04); break; default: @@ -404,20 +553,26 @@ static void ov62_021E5B6C(MicTestTaskManager *taskMan, u32 *state) { } } +enum { + MICTEST_FADE_OUT_STATE_START, + MICTEST_FADE_OUT_STATE_WAIT, + MICTEST_FADE_OUT_STATE_END, +}; + static void MicTestTask_FadeOut(MicTestTaskManager *taskMan, u32 *state) { MicTestData *micTest = MicTestTaskMan_GetMicTestData(taskMan); switch (*state) { - case 0: - BeginNormalPaletteFade(0, 0, 0, 0, 6, 1, micTest->heapId); - (*state) = 1; + case MICTEST_FADE_OUT_STATE_START: + BeginNormalPaletteFade(0, 0, 0, RGB_BLACK, 6, 1, micTest->heapId); + (*state) = MICTEST_FADE_OUT_STATE_WAIT; break; - case 1: + case MICTEST_FADE_OUT_STATE_WAIT: if (IsPaletteFadeFinished()) { - (*state) = 2; + (*state) = MICTEST_FADE_OUT_STATE_END; } break; - case 2: + case MICTEST_FADE_OUT_STATE_END: MicTest_SetTask(taskMan, MicTestTask_End); break; default: @@ -553,15 +708,15 @@ static void ov62_021E5FD4(MicTestSub_B8 *a0, HeapID heapId) { SetBothScreensModesAndDisable(&sMicTestGraphicsMode); for (u32 i = 0; i < 5; i++) { - InitBgFromTemplate(a0->bgConfig, ov62_021E6728[i].unk1C, &ov62_021E6728[i].bgTemplate, ov62_021E6728[i].unk1D); - BgClearTilemapBufferAndCommit(a0->bgConfig, ov62_021E6728[i].unk1C); - BG_ClearCharDataRange(ov62_021E6728[i].unk1C, 32, 0, heapId); + InitBgFromTemplate(a0->bgConfig, ov62_021E6728[i].bgId, &ov62_021E6728[i].bgTemplate, ov62_021E6728[i].unk1D); + BgClearTilemapBufferAndCommit(a0->bgConfig, ov62_021E6728[i].bgId); + BG_ClearCharDataRange(ov62_021E6728[i].bgId, 32, 0, heapId); } } static void ov62_021E6024(MicTestSub_B8 *a0) { for (u32 i = 0; i < 5; i++) { - FreeBgTilemapBuffer(a0->bgConfig, ov62_021E6728[i].unk1C); + FreeBgTilemapBuffer(a0->bgConfig, ov62_021E6728[i].bgId); } FreeToHeap(a0->bgConfig); } @@ -586,14 +741,14 @@ static void ov62_021E60D4(MicTestSub_B8 *a0) { } static void ov62_021E60E4(MicTestSub_B8 *a0, HeapID heapId) { - a0->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, 0xea, heapId); + a0->msgData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0234_bin, heapId); for (int i = 0; i < 3; i++) { - AddWindowParameterized(a0->bgConfig, &a0->window[i], ov62_021E66F8[i].bgId, ov62_021E66F8[i].x, ov62_021E66F8[i].y, ov62_021E66F8[i].width, ov62_021E66F8[i].height, ov62_021E66F8[i].palNum, ov62_021E66F8[i].baseTile); + AddWindowParameterized(a0->bgConfig, &a0->window[i], sMicTestTextBoxes[i].bgId, sMicTestTextBoxes[i].x, sMicTestTextBoxes[i].y, sMicTestTextBoxes[i].width, sMicTestTextBoxes[i].height, sMicTestTextBoxes[i].palNum, sMicTestTextBoxes[i].baseTile); FillWindowPixelBuffer(&a0->window[i], 0); ClearWindowTilemap(&a0->window[i]); String *str = NewString_ReadMsgData(a0->msgData, i); - AddTextPrinterParameterizedWithColor(&a0->window[i], ov62_021E66F8[i].fontId, str, 0, 0, 0xFF, ov62_021E66F8[i].color, 0); + AddTextPrinterParameterizedWithColor(&a0->window[i], sMicTestTextBoxes[i].fontId, str, 0, 0, 0xFF, sMicTestTextBoxes[i].color, 0); String_Delete(str); CopyWindowToVram(&a0->window[i]); } @@ -617,8 +772,8 @@ static void ov62_021E61AC(MicTestInput *input, HeapID heapId, MICCallback a2, Mi input->unk1C = data; input->mic.type = MIC_SAMPLING_TYPE_8BIT; - input->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); //?????? - input->mic.size = (1 << 8); + input->mic.buffer = (void *)((((u32)data) + 0x1F) & ~0x1F); // alignment to 32-bit boundary + input->mic.size = 256; input->mic.rate = 0x1040; input->mic.loop_enable = TRUE; input->mic.full_callback = a2; @@ -744,15 +899,15 @@ static void MicTest_MicrophoneCallback(MICResult result, void *data) { static u32 MicTest_GetVolumeBracket(u8 volume) { u32 ret; - if (volume <= 0x8C) { + if (volume <= 140) { ret = 0; - } else if (volume >= 0x8D && volume <= 0x98) { + } else if (volume >= 141 && volume <= 152) { ret = 1; - } else if (volume >= 0x99 && volume <= 0xA6) { + } else if (volume >= 153 && volume <= 166) { ret = 2; - } else if (volume >= 0xA7 && volume <= 0xBB) { + } else if (volume >= 167 && volume <= 187) { ret = 3; - } else if (volume >= 0xBC) { + } else if (volume >= 188) { ret = 4; } else { GF_ASSERT(FALSE); @@ -782,9 +937,9 @@ static BOOL ov62_021E63E8(MicTestData *micTest, HeapID heapId, s16 x, s16 y) { } if (args != NULL) { - s32 rand1 = (LCRandom() * 0x1002 / 0x10000) + 0x1333; - s32 rand2 = (LCRandom() * 0x3E / 0x10000) + 0x3C; - s32 rand3 = (LCRandom() * 0x10 / 0x10000) + 6; + s32 rand1 = (LCRandom() * 4098 / 0x10000) + 4915; + s32 rand2 = (LCRandom() * 62 / 0x10000) + 60; + s32 rand3 = (LCRandom() * 16 / 0x10000) + 6; ov62_021E6480(flag, args, x, y, rand1, rand2, rand3, 1); return TRUE; } @@ -828,15 +983,15 @@ static void ov62_021E6570(SysTask *task, void *_data) { VEC_Add(&data->unk8, &data->unk14, &data->unk8); - s16 x = data->unk8.x >> 12; - s16 y = data->unk8.y >> 12; + s16 x = data->unk8.x >> FX32_SHIFT; + s16 y = data->unk8.y >> FX32_SHIFT; data->unk20 = data->unk20 + data->unk24; while (data->unk20 > FX32_CONST(360)) { data->unk20 -= FX32_CONST(360); } - x += GF_SinDegNoWrap(data->unk20 >> 12) * data->unk28 >> 12; + x += GF_SinDegNoWrap(data->unk20 >> FX32_SHIFT) * data->unk28 >> FX32_SHIFT; UnkImageStruct_SetSpritePositionXY(data->unk0, x, y); @@ -861,7 +1016,7 @@ static int MicTest_CheckTouchscreenInput() { } static int MicTest_CheckReturn(MicTestData *data) { - if (MicTest_CheckTouchscreenInput() == TS_HITBOX_MIC_TEST_RETURN || (gSystem.newKeys & 2)) { + if (MicTest_CheckTouchscreenInput() == TS_HITBOX_MIC_TEST_RETURN || (gSystem.newKeys & PAD_BUTTON_B)) { return TRUE; } return FALSE; From f3cabab48940caa50b0ea098a5e5816f56bcba28 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:52:13 -0400 Subject: [PATCH 13/15] Final thing in renaming master->main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b9de8053a..1119928a54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: build on: push: - branches: [ master ] + branches: [ main ] pull_request: workflow_dispatch: From 894d1c4e8cab2f28551a7307aa399ba845e7a1e6 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 30 Oct 2024 23:29:31 -0400 Subject: [PATCH 14/15] Update webhook.sh --- .github/calcrom/webhook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh index ba8e941a1c..ff3f88830a 100644 --- a/.github/calcrom/webhook.sh +++ b/.github/calcrom/webhook.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex -# Only run this script if it's the master branch build. -if [[ "$GITHUB_REF" != "refs/heads/master" || "$GITHUB_EVENT_NAME" != "push" ]]; then +# Only run this script if it's the main branch build. +if [[ "$GITHUB_REF" != "refs/heads/main" || "$GITHUB_EVENT_NAME" != "push" ]]; then exit 0 fi From 5fe6d0190bd80c59f0b8897ccf037b6b5d36cdbd Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 31 Oct 2024 20:57:58 -0400 Subject: [PATCH 15/15] Add OS_SetIrqCheckFlag --- src/overlay_mic_test.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 39a303bf52..1642c148d9 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -612,19 +612,12 @@ static void MicTest_SetBanks() { GfGfx_SetBanks(&sMicTestGraphicsBanks); } -// TODO: Is this a library struct? -typedef struct UnkStruct_27E0000 { - u8 unk_0000[0x3FF8]; - u32 unk_3FF8; -} UnkStruct_27E0000; - static void MicTest_VBlankIntrCB(void *data) { MicTestData *micTest = data; NNS_GfdDoVramTransfer(); ov62_021E5FC4(micTest); ov62_021E60D4(&micTest->unkB8); - UnkStruct_27E0000 *unkStruct = (UnkStruct_27E0000 *)(0x27e0000); - unkStruct->unk_3FF8 |= 1; + OS_SetIrqCheckFlag(OS_IE_VBLANK); } static void MicTest_InitSpriteRenderer(MicTestData *micTest, HeapID heapId) {