diff --git a/.gitignore b/.gitignore index e7b673320..8e5cdbe12 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ build-cmake-* *.4bpp *.lz *.gbapal +*.NCLR # For asmdiff */baserom.* diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc index 33034518f..148e495c8 100644 --- a/asm/include/overlay_12_battle_command.inc +++ b/asm/include/overlay_12_battle_command.inc @@ -300,8 +300,8 @@ .public BtlCmd_CalcWeatherBallParams .public BtlCmd_TryPursuit .public BtlCmd_ApplyTypeEffectiveness -.public BtlCmd_SetPokemonEncounter44 -.public BtlCmd_SetPokemonEncounter45 +.public BtlCmd_IfTurnFlag +.public BtlCmd_SetTurnFlag .public BtlCmd_CalcGyroBallPower .public BtlCmd_TryMetalBurst .public BtlCmd_CalcPaybackPower diff --git a/asm/include/unk_0206A360.inc b/asm/include/unk_0206A360.inc deleted file mode 100644 index acccd4334..000000000 --- a/asm/include/unk_0206A360.inc +++ /dev/null @@ -1,42 +0,0 @@ -#include -#pragma once -.public GfGfxLoader_LoadCharData -.public GfGfxLoader_LoadScrnData -.public GfGfxLoader_GXLoadPal -.public BeginNormalPaletteFade -.public IsPaletteFadeFinished -.public AllocFromHeapAtEnd -.public FreeToHeap -.public SetBgControlParam -.public SetBgPriority -.public ToggleBgLayer -.public BG_ClearCharDataRange -.public BgClearTilemapBufferAndCommit -.public GetBgColorMode -.public GetBgPriority -.public AllocWindows -.public AddWindowParameterized -.public WindowArray_Delete -.public GF_AssertFail -.public FieldSystem_GetBgConfigPtr -.public TaskManager_Call -.public TaskManager_GetFieldSystem -.public TaskManager_GetEnvironment -.public PlayerAvatar_GetMapObject -.public PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply -.public MapObject_GetPositionVec -.public MapObject_SetPositionVec -.public sub_0205FC94 -.public MapObject_AreBitsSetForMovementScriptInit -.public MapObject_SetHeldMovement -.public FollowMon_GetMapObject -.public sub_02069DC8 -.public FollowMon_IsActive -.public sub_0206A360 -.public sub_0206A388 -.public G2x_SetBlendAlpha_ -.public gSystem -.public NNS_G3dGlb -.public Field_PlayerAvatar_OrrTransitionFlags -.public Field_PlayerAvatar_ApplyTransitionFlags -.public ov01_02205790 diff --git a/asm/overlay_12_battle_command.s b/asm/overlay_12_battle_command.s index 8290b9b99..9b56743ba 100644 --- a/asm/overlay_12_battle_command.s +++ b/asm/overlay_12_battle_command.s @@ -4704,8 +4704,8 @@ sBattleScriptCommandTable: ; 0x0226C6C8 .word BtlCmd_CalcWeatherBallParams .word BtlCmd_TryPursuit .word BtlCmd_ApplyTypeEffectiveness - .word BtlCmd_SetPokemonEncounter44 - .word BtlCmd_SetPokemonEncounter45 + .word BtlCmd_IfTurnFlag + .word BtlCmd_SetTurnFlag .word BtlCmd_CalcGyroBallPower .word BtlCmd_TryMetalBurst .word BtlCmd_CalcPaybackPower diff --git a/asm/unk_0206A360.s b/asm/unk_0206A360.s deleted file mode 100644 index 844da4119..000000000 --- a/asm/unk_0206A360.s +++ /dev/null @@ -1,675 +0,0 @@ -#include "constants/pokemon.h" -#include "constants/species.h" -#include "constants/maps.h" -#include "constants/sprites.h" -#include "constants/items.h" -#include "constants/moves.h" -#include "constants/std_script.h" - .include "asm/macros.inc" - .include "unk_0206A360.inc" - .include "global.inc" - - .public NNS_G3dGlb - - .text - - thumb_func_start sub_0206A360 -sub_0206A360: ; 0x0206A360 - push {r3, r4} - ldr r4, _0206A384 ; =_0210FAE8 - mov r2, #0xff - mov r3, #0 -_0206A368: - ldr r1, [r4] - cmp r0, r1 - bne _0206A374 - lsl r0, r3, #0x18 - lsr r2, r0, #0x18 - b _0206A37C -_0206A374: - add r3, r3, #1 - add r4, #0x3c - cmp r3, #0x19 - blt _0206A368 -_0206A37C: - add r0, r2, #0 - pop {r3, r4} - bx lr - nop -_0206A384: .word _0210FAE8 - thumb_func_end sub_0206A360 - - thumb_func_start sub_0206A388 -sub_0206A388: ; 0x0206A388 - push {r3, r4, r5, r6, r7, lr} - sub sp, #8 - str r0, [sp] - add r6, r1, #0 - add r5, r2, #0 - add r7, r3, #0 - bl TaskManager_GetFieldSystem - str r0, [sp, #4] - mov r0, #4 - mov r1, #0x38 - bl AllocFromHeapAtEnd - add r4, r0, #0 - mov r0, #0 - str r0, [r4] - str r0, [r4, #4] - ldr r0, [sp, #4] - bl FieldSystem_GetBgConfigPtr - str r0, [r4, #0xc] - mov r0, #0 - strh r0, [r4, #0x18] - strh r0, [r4, #0x1a] - strh r6, [r4, #0x16] - cmp r5, #4 - bhi _0206A3EA - add r1, r5, r5 - add r1, pc - ldrh r1, [r1, #6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_0206A3CA: ; jump table - .short _0206A3D4 - _0206A3CA - 2 ; case 0 - .short _0206A3D8 - _0206A3CA - 2 ; case 1 - .short _0206A3DE - _0206A3CA - 2 ; case 2 - .short _0206A3E4 - _0206A3CA - 2 ; case 3 - .short _0206A3E4 - _0206A3CA - 2 ; case 4 -_0206A3D4: - str r0, [r4, #0x2c] - b _0206A3F2 -_0206A3D8: - mov r0, #1 - str r0, [r4, #0x2c] - b _0206A3F2 -_0206A3DE: - mov r0, #2 - str r0, [r4, #0x2c] - b _0206A3F2 -_0206A3E4: - mov r0, #3 - str r0, [r4, #0x2c] - b _0206A3F2 -_0206A3EA: - bl GF_AssertFail - mov r0, #0 - str r0, [r4, #0x2c] -_0206A3F2: - mov r0, #4 - str r0, [r4, #8] - str r7, [r4, #0x30] - mov r0, #0 - strh r0, [r4, #0x34] - strh r0, [r4, #0x36] - ldr r0, [sp] - ldr r1, _0206A40C ; =sub_0206A410 - add r2, r4, #0 - bl TaskManager_Call - add sp, #8 - pop {r3, r4, r5, r6, r7, pc} - .balign 4, 0 -_0206A40C: .word sub_0206A410 - thumb_func_end sub_0206A388 - - thumb_func_start sub_0206A410 -sub_0206A410: ; 0x0206A410 - push {r4, r5, lr} - sub sp, #0xc - add r4, r0, #0 - bl TaskManager_GetFieldSystem - add r5, r0, #0 - add r0, r4, #0 - bl TaskManager_GetEnvironment - add r4, r0, #0 - ldr r0, [r4] - cmp r0, #3 - bls _0206A42C - b _0206A5BC -_0206A42C: - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_0206A438: ; jump table - .short _0206A440 - _0206A438 - 2 ; case 0 - .short _0206A4D0 - _0206A438 - 2 ; case 1 - .short _0206A4E0 - _0206A438 - 2 ; case 2 - .short _0206A50C - _0206A438 - 2 ; case 3 -_0206A440: - ldr r0, [r4, #0xc] - mov r1, #2 - bl GetBgColorMode - strh r0, [r4, #0x14] - ldr r0, [r4, #0xc] - mov r1, #2 - bl GetBgPriority - str r0, [r4, #0x1c] - ldr r0, [r4, #0xc] - mov r1, #0 - bl GetBgPriority - str r0, [r4, #0x20] - ldr r0, [r4, #0xc] - mov r1, #1 - bl GetBgPriority - str r0, [r4, #0x24] - ldr r0, [r4, #0xc] - mov r1, #3 - bl GetBgPriority - str r0, [r4, #0x28] - ldr r0, [r4, #0xc] - mov r1, #2 - mov r2, #0 - mov r3, #1 - bl SetBgControlParam - mov r0, #3 - mov r1, #0 - bl SetBgPriority - mov r0, #2 - mov r1, #1 - bl SetBgPriority - mov r0, #0 - mov r1, #2 - bl SetBgPriority - add r0, r4, #0 - bl sub_0206A5D0 - add r0, r4, #0 - bl sub_0206A660 - mov r0, #0 - str r0, [sp] - ldr r0, _0206A5C4 ; =0x04000050 - mov r1, #4 - mov r2, #0x21 - mov r3, #0x10 - bl G2x_SetBlendAlpha_ - mov r0, #0x10 - mov r1, #1 - str r0, [sp] - str r1, [sp, #4] - ldr r0, [r4, #8] - add r2, r1, #0 - str r0, [sp, #8] - mov r0, #0 - add r3, r0, #0 - bl BeginNormalPaletteFade - ldr r0, [r4] - add r0, r0, #1 - str r0, [r4] - b _0206A5BC -_0206A4D0: - bl IsPaletteFadeFinished - cmp r0, #0 - beq _0206A5BC - ldr r0, [r4] - add r0, r0, #1 - str r0, [r4] - b _0206A5BC -_0206A4E0: - ldr r0, _0206A5C8 ; =gSystem - ldr r1, [r0, #0x48] - mov r0, #1 - tst r0, r1 - beq _0206A4F6 - mov r0, #0 - strh r0, [r4, #0x18] - ldr r0, [r4] - add r0, r0, #1 - str r0, [r4] - b _0206A5BC -_0206A4F6: - ldr r0, [r4, #4] - add r0, r0, #1 - str r0, [r4, #4] - cmp r0, #0x3c - ble _0206A5BC - mov r0, #0 - strh r0, [r4, #0x18] - ldr r0, [r4] - add r0, r0, #1 - str r0, [r4] - b _0206A5BC -_0206A50C: - ldrh r0, [r4, #0x18] - cmp r0, #0x10 - bhs _0206A536 - ldrh r0, [r4, #0x1a] - add r0, r0, #1 - strh r0, [r4, #0x1a] - ldrh r0, [r4, #0x1a] - cmp r0, #2 - blo _0206A528 - mov r0, #0 - strh r0, [r4, #0x1a] - ldrh r0, [r4, #0x18] - add r0, r0, #1 - strh r0, [r4, #0x18] -_0206A528: - ldrh r2, [r4, #0x18] - mov r0, #0x10 - sub r1, r0, r2 - lsl r0, r2, #8 - orr r1, r0 - ldr r0, _0206A5CC ; =0x04000052 - strh r1, [r0] -_0206A536: - add r0, r4, #0 - add r1, r5, #0 - bl sub_0206A694 - cmp r0, #0 - beq _0206A5BC - ldrh r0, [r4, #0x18] - cmp r0, #0x10 - blo _0206A5BC - mov r0, #2 - mov r1, #0 - bl ToggleBgLayer - ldrh r3, [r4, #0x14] - ldr r0, [r4, #0xc] - mov r1, #2 - lsl r3, r3, #0x18 - mov r2, #0 - lsr r3, r3, #0x18 - bl SetBgControlParam - ldr r1, [r4, #0x1c] - mov r0, #2 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - bl SetBgPriority - ldr r1, [r4, #0x20] - mov r0, #0 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - bl SetBgPriority - ldr r1, [r4, #0x24] - mov r0, #1 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - bl SetBgPriority - ldr r1, [r4, #0x28] - mov r0, #3 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - bl SetBgPriority - ldr r0, _0206A5C4 ; =0x04000050 - mov r2, #0 - strh r2, [r0] - ldr r3, [r4, #8] - mov r0, #2 - mov r1, #0x20 - bl BG_ClearCharDataRange - ldr r0, [r4, #0xc] - mov r1, #2 - bl BgClearTilemapBufferAndCommit - ldr r0, [r4, #0x10] - mov r1, #1 - bl WindowArray_Delete - add r0, r4, #0 - bl FreeToHeap - add sp, #0xc - mov r0, #1 - pop {r4, r5, pc} -_0206A5BC: - mov r0, #0 - add sp, #0xc - pop {r4, r5, pc} - nop -_0206A5C4: .word 0x04000050 -_0206A5C8: .word gSystem -_0206A5CC: .word 0x04000052 - thumb_func_end sub_0206A410 - - thumb_func_start sub_0206A5D0 -sub_0206A5D0: ; 0x0206A5D0 - push {r3, r4, r5, lr} - sub sp, #0x10 - add r4, r0, #0 - mov r0, #0x16 - lsl r0, r0, #4 - str r0, [sp] - ldr r0, [r4, #8] - mov r1, #0x3c - str r0, [sp, #4] - ldrh r2, [r4, #0x16] - ldr r5, _0206A654 ; =_0210FAE8 + 8 - ldr r3, [r4, #0x2c] - mul r1, r2 - mov r2, #0xc - mul r2, r3 - add r1, r5, r1 - ldr r1, [r2, r1] - mov r2, #0 - mov r0, #0x96 - add r3, r2, #0 - bl GfGfxLoader_GXLoadPal - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - mov r0, #1 - str r0, [sp, #8] - ldr r0, [r4, #8] - mov r1, #0x3c - str r0, [sp, #0xc] - ldrh r2, [r4, #0x16] - ldr r5, _0206A658 ; =_0210FAE8 + 12 - ldr r3, [r4, #0x2c] - mul r1, r2 - mov r2, #0xc - mul r2, r3 - add r1, r5, r1 - ldr r1, [r2, r1] - ldr r2, [r4, #0xc] - mov r0, #0x96 - mov r3, #2 - bl GfGfxLoader_LoadCharData - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - mov r0, #1 - str r0, [sp, #8] - ldr r0, [r4, #8] - mov r1, #0x3c - str r0, [sp, #0xc] - ldrh r2, [r4, #0x16] - ldr r5, _0206A65C ; =_0210FAE8 + 16 - ldr r3, [r4, #0x2c] - mul r1, r2 - mov r2, #0xc - mul r2, r3 - add r1, r5, r1 - ldr r1, [r2, r1] - ldr r2, [r4, #0xc] - mov r0, #0x96 - mov r3, #2 - bl GfGfxLoader_LoadScrnData - add sp, #0x10 - pop {r3, r4, r5, pc} - .balign 4, 0 -_0206A654: .word _0210FAE8 + 8 -_0206A658: .word _0210FAE8 + 12 -_0206A65C: .word _0210FAE8 + 16 - thumb_func_end sub_0206A5D0 - - thumb_func_start sub_0206A660 -sub_0206A660: ; 0x0206A660 - push {r3, r4, lr} - sub sp, #0x14 - add r4, r0, #0 - ldr r0, [r4, #8] - mov r1, #1 - bl AllocWindows - str r0, [r4, #0x10] - mov r3, #0 - str r3, [sp] - mov r0, #0x1c - str r0, [sp, #4] - mov r2, #2 - str r2, [sp, #8] - mov r0, #0xd - str r0, [sp, #0xc] - mov r0, #0xb - lsl r0, r0, #6 - str r0, [sp, #0x10] - ldr r0, [r4, #0xc] - ldr r1, [r4, #0x10] - bl AddWindowParameterized - add sp, #0x14 - pop {r3, r4, pc} - .balign 4, 0 - thumb_func_end sub_0206A660 - - thumb_func_start sub_0206A694 -sub_0206A694: ; 0x0206A694 - push {r3, r4, r5, r6, lr} - sub sp, #0xc - add r5, r1, #0 - ldr r1, [r0, #0x30] - cmp r1, #0 - bne _0206A6A6 - add sp, #0xc - mov r0, #1 - pop {r3, r4, r5, r6, pc} -_0206A6A6: - add r4, r0, #0 - ldrh r0, [r0, #0x34] - add r4, #0x34 - cmp r0, #5 - bhi _0206A790 - add r0, r0, r0 - add r0, pc - ldrh r0, [r0, #6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_0206A6BC: ; jump table - .short _0206A6C8 - _0206A6BC - 2 ; case 0 - .short _0206A6D8 - _0206A6BC - 2 ; case 1 - .short _0206A714 - _0206A6BC - 2 ; case 2 - .short _0206A72A - _0206A6BC - 2 ; case 3 - .short _0206A74A - _0206A6BC - 2 ; case 4 - .short _0206A78A - _0206A6BC - 2 ; case 5 -_0206A6C8: - ldr r0, [r5, #0x40] - mov r1, #0 - bl PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply - ldrh r0, [r4] - add r0, r0, #1 - strh r0, [r4] - b _0206A790 -_0206A6D8: - ldr r0, [r5, #0x40] - bl PlayerAvatar_GetMapObject - ldrh r1, [r4, #2] - add r6, r0, #0 - add r1, r1, #1 - strh r1, [r4, #2] - add r1, sp, #0 - bl MapObject_GetPositionVec - mov r0, #2 - ldr r1, [sp, #4] - lsl r0, r0, #0xc - sub r0, r1, r0 - str r0, [sp, #4] - add r0, r6, #0 - add r1, sp, #0 - bl MapObject_SetPositionVec - ldrh r0, [r4, #2] - cmp r0, #0x10 - blo _0206A790 - ldr r0, [r5, #0x40] - mov r1, #1 - bl PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply - ldrh r0, [r4] - add r0, r0, #1 - strh r0, [r4] - b _0206A790 -_0206A714: - ldr r0, [r5, #0x40] - mov r1, #1 - bl Field_PlayerAvatar_OrrTransitionFlags - ldr r0, [r5, #0x40] - bl Field_PlayerAvatar_ApplyTransitionFlags - ldrh r0, [r4] - add r0, r0, #1 - strh r0, [r4] - b _0206A790 -_0206A72A: - ldr r0, [r5, #0x40] - bl PlayerAvatar_GetMapObject - add r5, r0, #0 - bl MapObject_AreBitsSetForMovementScriptInit - cmp r0, #0 - beq _0206A790 - add r0, r5, #0 - mov r1, #1 - bl MapObject_SetHeldMovement - ldrh r0, [r4] - add r0, r0, #1 - strh r0, [r4] - b _0206A790 -_0206A74A: - ldr r0, [r5, #0x40] - bl PlayerAvatar_GetMapObject - bl MapObject_AreBitsSetForMovementScriptInit - cmp r0, #0 - beq _0206A790 - add r0, r5, #0 - bl FollowMon_IsActive - cmp r0, #0 - beq _0206A782 - add r0, r5, #0 - mov r1, #1 - bl ov01_02205790 - add r0, r5, #0 - bl FollowMon_GetMapObject - mov r1, #0x30 - bl sub_0205FC94 - add r0, r5, #0 - bl FollowMon_GetMapObject - mov r1, #1 - bl sub_02069DC8 -_0206A782: - ldrh r0, [r4] - add r0, r0, #1 - strh r0, [r4] - b _0206A790 -_0206A78A: - add sp, #0xc - mov r0, #1 - pop {r3, r4, r5, r6, pc} -_0206A790: - mov r0, #0 - add sp, #0xc - pop {r3, r4, r5, r6, pc} - .balign 4, 0 - thumb_func_end sub_0206A694 - - .data - -_0210FAE8: - .byte 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .byte 0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .byte 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 - .byte 0x19, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - - .byte 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 - .byte 0x22, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - - .byte 0xEB, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 - .byte 0x22, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - - .byte 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x00 - .byte 0x2B, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - - .byte 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00 - .byte 0x2F, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00 - .byte 0x34, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 - - .byte 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x37, 0x00, 0x00, 0x00 - .byte 0x38, 0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00 - .byte 0x3C, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00 - .byte 0x40, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - - .byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00 - .byte 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00 - .byte 0x48, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x4B, 0x00, 0x00, 0x00 - .byte 0x4C, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00 - .byte 0x50, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00 - .byte 0x54, 0x00, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00 - .byte 0x58, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - - .byte 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00 - .byte 0x5C, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00 - .byte 0x60, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00 - .byte 0x64, 0x00, 0x00, 0x00, 0x65, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 - - .byte 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00 - .byte 0x68, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00 - .byte 0x69, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00 - .byte 0x6D, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00 - - .byte 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00 - .byte 0x71, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00 - .byte 0x75, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00 - .byte 0x79, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 - - .byte 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00 - .byte 0x7D, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 - .byte 0x7E, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00 - .byte 0x82, 0x00, 0x00, 0x00, 0x83, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 - - .byte 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00 - .byte 0x86, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00 - .byte 0x87, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00, 0x8A, 0x00, 0x00, 0x00 - .byte 0x8B, 0x00, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - - .byte 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x8E, 0x00, 0x00, 0x00 - .byte 0x8F, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x00 - .byte 0x90, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x00, 0x93, 0x00, 0x00, 0x00 - .byte 0x94, 0x00, 0x00, 0x00, 0x95, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00 - - .byte 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x97, 0x00, 0x00, 0x00 - .byte 0x98, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00 - .byte 0x99, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00 - .byte 0x9D, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - - .byte 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x97, 0x00, 0x00, 0x00 - .byte 0x98, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00 - .byte 0x99, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x9C, 0x00, 0x00, 0x00 - .byte 0x9D, 0x00, 0x00, 0x00, 0x9E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00 - - .byte 0x93, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x00, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00 - .byte 0xA1, 0x00, 0x00, 0x00, 0xA2, 0x00, 0x00, 0x00, 0xA3, 0x00, 0x00, 0x00, 0xA4, 0x00, 0x00, 0x00 - .byte 0xA5, 0x00, 0x00, 0x00, 0xA6, 0x00, 0x00, 0x00, 0xA7, 0x00, 0x00, 0x00, 0xA8, 0x00, 0x00, 0x00 - .byte 0xA9, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 - - .byte 0x6A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x00, 0x00, 0x00, 0xAC, 0x00, 0x00, 0x00 - .byte 0xAD, 0x00, 0x00, 0x00, 0xAE, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00 - .byte 0xAE, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0xB0, 0x00, 0x00, 0x00, 0xB1, 0x00, 0x00, 0x00 - .byte 0xB2, 0x00, 0x00, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00 - - .byte 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0xB5, 0x00, 0x00, 0x00 - .byte 0xB6, 0x00, 0x00, 0x00, 0xB7, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00 - .byte 0xB7, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0xB9, 0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00 - .byte 0xBB, 0x00, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00 - - .byte 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x00, 0x00 - .byte 0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xC1, 0x00, 0x00, 0x00, 0xC2, 0x00, 0x00, 0x00 - .byte 0xC3, 0x00, 0x00, 0x00, 0xC4, 0x00, 0x00, 0x00, 0xC5, 0x00, 0x00, 0x00, 0xC6, 0x00, 0x00, 0x00 - .byte 0xC7, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 - - .byte 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC9, 0x00, 0x00, 0x00, 0xCA, 0x00, 0x00, 0x00 - .byte 0xCB, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00, 0xCD, 0x00, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00 - .byte 0xCC, 0x00, 0x00, 0x00, 0xCD, 0x00, 0x00, 0x00, 0xCE, 0x00, 0x00, 0x00, 0xCF, 0x00, 0x00, 0x00 - .byte 0xD0, 0x00, 0x00, 0x00, 0xD1, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00 - - .byte 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD2, 0x00, 0x00, 0x00, 0xD3, 0x00, 0x00, 0x00 - .byte 0xD4, 0x00, 0x00, 0x00, 0xD5, 0x00, 0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0xD7, 0x00, 0x00, 0x00 - .byte 0xD5, 0x00, 0x00, 0x00, 0xD6, 0x00, 0x00, 0x00, 0xD7, 0x00, 0x00, 0x00, 0xD8, 0x00, 0x00, 0x00 - .byte 0xD9, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00 - - .byte 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDB, 0x00, 0x00, 0x00, 0xDC, 0x00, 0x00, 0x00 - .byte 0xDD, 0x00, 0x00, 0x00, 0xDE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00 - .byte 0xDE, 0x00, 0x00, 0x00, 0xDF, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE1, 0x00, 0x00, 0x00 - .byte 0xE2, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00 diff --git a/common.mk b/common.mk index c510bed5f..672c979cc 100644 --- a/common.mk +++ b/common.mk @@ -39,7 +39,7 @@ MWLD = $(TOOLSDIR)/mwccarm/$(MWCCVER)/mwldarm.exe MAKEROM := $(TOOLSDIR)/bin/makerom.exe MAKELCF := $(TOOLSDIR)/bin/makelcf.exe MAKEBNR := $(TOOLSDIR)/bin/makebanner.exe -NTRCOMP := $(TOOLSDIR)/bin/ntrcomp.exe +NTRCOMP := $(WINE) $(TOOLSDIR)/bin/ntrcomp.exe export LM_LICENSE_FILE := $(TOOLSDIR)/mwccarm/license.dat diff --git a/files/.gitignore b/files/.gitignore index f1501c323..0a047990d 100644 --- a/files/.gitignore +++ b/files/.gitignore @@ -35,6 +35,7 @@ a/1/3/3 a/1/3/6 a/1/3/8 a/1/4/1 +a/1/5/0 a/1/5/2 a/1/6/3 a/1/6/9 diff --git a/files/a/1/5/0 b/files/a/1/5/0 deleted file mode 100644 index defda9537..000000000 Binary files a/files/a/1/5/0 and /dev/null differ diff --git a/files/battledata/script/effect_script/effect_script_0231.s b/files/battledata/script/effect_script/effect_script_0231.s index d11984c2c..f5d672e72 100644 --- a/files/battledata/script/effect_script/effect_script_0231.s +++ b/files/battledata/script/effect_script/effect_script_0231.s @@ -3,7 +3,7 @@ .data _000: - GetCurrentMoveData MOVEATTRIBUTE_POWER + GetCurrentMoveData MOVE_ATTRIBUTE_POWER UpdateVarFromVar OPCODE_SET, BSCRIPT_VAR_MOVE_POWER, BSCRIPT_VAR_CALC_TEMP CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_DEFENDER_ASSURANCE_DAMAGE_MASK, 0, _018 UpdateVarFromVar OPCODE_SET, BSCRIPT_VAR_MOVE_POWER, BSCRIPT_VAR_CALC_TEMP diff --git a/files/battledata/script/subscript/subscript_0000_StartEncounter.s b/files/battledata/script/subscript/subscript_0000_StartEncounter.s index 47ebb6ad7..407511e5a 100644 --- a/files/battledata/script/subscript/subscript_0000_StartEncounter.s +++ b/files/battledata/script/subscript/subscript_0000_StartEncounter.s @@ -59,7 +59,7 @@ _098: _100: SpriteToOAM BATTLER_CATEGORY_ENEMY Wait - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_POKE_BALL + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_POKE_BALL PokemonSlideIn BATTLER_CATEGORY_PLAYER WaitTime 96 HealthbarSlideInDelay BATTLER_CATEGORY_PLAYER @@ -81,14 +81,14 @@ _118: WaitButtonABTime 30 PrintFirstSendOutMessage BATTLER_CATEGORY_ENEMY HideBattleStartPartyGauge BATTLER_CATEGORY_ENEMY - ThrowPokeball BATTLER_CATEGORY_ENEMY, BTLSCR_THROW_POKE_BALL + ThrowPokeball BATTLER_CATEGORY_ENEMY, GAME_THROW_POKE_BALL PokemonSlideIn BATTLER_CATEGORY_ENEMY WaitTime 112 HealthbarSlideInDelay BATTLER_CATEGORY_ENEMY Wait PrintFirstSendOutMessage BATTLER_CATEGORY_PLAYER HideBattleStartPartyGauge BATTLER_CATEGORY_PLAYER - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_POKE_BALL + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_POKE_BALL PokemonSlideIn BATTLER_CATEGORY_PLAYER WaitTime 96 HealthbarSlideInDelay BATTLER_CATEGORY_PLAYER @@ -108,14 +108,14 @@ _169: WaitButtonABTime 30 PrintFirstSendOutMessage BATTLER_CATEGORY_PLAYER HideBattleStartPartyGauge BATTLER_CATEGORY_PLAYER - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_POKE_BALL + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_POKE_BALL PokemonSlideIn BATTLER_CATEGORY_PLAYER WaitTime 96 HealthbarSlideInDelay BATTLER_CATEGORY_PLAYER Wait PrintFirstSendOutMessage BATTLER_CATEGORY_ENEMY HideBattleStartPartyGauge BATTLER_CATEGORY_ENEMY - ThrowPokeball BATTLER_CATEGORY_ENEMY, BTLSCR_THROW_POKE_BALL + ThrowPokeball BATTLER_CATEGORY_ENEMY, GAME_THROW_POKE_BALL PokemonSlideIn BATTLER_CATEGORY_ENEMY WaitTime 112 HealthbarSlideInDelay BATTLER_CATEGORY_ENEMY diff --git a/files/battledata/script/subscript/subscript_0007_Miss.s b/files/battledata/script/subscript/subscript_0007_Miss.s index bc5b6529a..3b42f3bf2 100644 --- a/files/battledata/script/subscript/subscript_0007_Miss.s +++ b/files/battledata/script/subscript/subscript_0007_Miss.s @@ -77,7 +77,7 @@ _CHECK_OHKO_FAIL: GoTo _PRINT_MSG _CHECK_RANGE: - GetCurrentMoveData MOVEATTRIBUTE_RANGE + GetCurrentMoveData MOVE_ATTRIBUTE_RANGE CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000004, _MON_AVOIDED CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000008, _MON_AVOIDED // {0}’s attack missed! diff --git a/files/battledata/script/subscript/subscript_0018_FallAsleep.s b/files/battledata/script/subscript/subscript_0018_FallAsleep.s index 84f4e6def..ad50f781f 100644 --- a/files/battledata/script/subscript/subscript_0018_FallAsleep.s +++ b/files/battledata/script/subscript/subscript_0018_FallAsleep.s @@ -106,7 +106,7 @@ _237: CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_ABILITY, _337 CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT, _337 WaitButtonABTime 30 - GetCurrentMoveData MOVEATTRIBUTE_RANGE + GetCurrentMoveData MOVE_ATTRIBUTE_RANGE CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000004, _270 CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000008, _270 Call BATTLE_SUBSCRIPT_BUT_IT_FAILED diff --git a/files/battledata/script/subscript/subscript_0037_Confuse.s b/files/battledata/script/subscript/subscript_0037_Confuse.s index 3a53ee42d..f6229c8a2 100644 --- a/files/battledata/script/subscript/subscript_0037_Confuse.s +++ b/files/battledata/script/subscript/subscript_0037_Confuse.s @@ -46,7 +46,7 @@ _100: _101: CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_INDIRECT, _185 WaitButtonABTime 30 - GetCurrentMoveData MOVEATTRIBUTE_RANGE + GetCurrentMoveData MOVE_ATTRIBUTE_RANGE CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000004, _124 CompareVarToValue OPCODE_EQU, BSCRIPT_VAR_CALC_TEMP, 0x00000008, _124 Call BATTLE_SUBSCRIPT_BUT_IT_FAILED diff --git a/files/battledata/script/subscript/subscript_0227_SafariThrowBait.s b/files/battledata/script/subscript/subscript_0227_SafariThrowBait.s index 2603b20a1..5be23f885 100644 --- a/files/battledata/script/subscript/subscript_0227_SafariThrowBait.s +++ b/files/battledata/script/subscript/subscript_0227_SafariThrowBait.s @@ -7,7 +7,7 @@ _000: PrintGlobalMessage msg_0197_00851, TAG_TRNAME_NICKNAME, BATTLER_CATEGORY_ATTACKER, BATTLER_CATEGORY_DEFENDER Wait WaitButtonABTime 30 - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_SAFARI_BAIT + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_SAFARI_BAIT Wait PlayBattleAnimation BATTLER_CATEGORY_ENEMY, BATTLE_ANIMATION_HAPPY Wait diff --git a/files/battledata/script/subscript/subscript_0228_SafariThrowBall.s b/files/battledata/script/subscript/subscript_0228_SafariThrowBall.s index 1362bd5d0..065559937 100644 --- a/files/battledata/script/subscript/subscript_0228_SafariThrowBall.s +++ b/files/battledata/script/subscript/subscript_0228_SafariThrowBall.s @@ -7,7 +7,7 @@ _000: PrintGlobalMessage msg_0197_00854, TAG_TRNAME_NICKNAME, BATTLER_CATEGORY_ATTACKER, BATTLER_CATEGORY_DEFENDER Wait WaitButtonABTime 30 - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_SAFARI_ROCK + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_SAFARI_ROCK Wait PlayBattleAnimation BATTLER_CATEGORY_ENEMY, BATTLE_ANIMATION_ANGRY Wait diff --git a/files/battledata/script/subscript/subscript_0264_SuperEffectiveBerries.s b/files/battledata/script/subscript/subscript_0264_SuperEffectiveBerries.s index b2c84f58e..fffc0a875 100644 --- a/files/battledata/script/subscript/subscript_0264_SuperEffectiveBerries.s +++ b/files/battledata/script/subscript/subscript_0264_SuperEffectiveBerries.s @@ -15,7 +15,7 @@ _020: GoTo _033 _031: - GetCurrentMoveData MOVEATTRIBUTE_TYPE + GetCurrentMoveData MOVE_ATTRIBUTE_TYPE _033: GetItemHoldEffect BATTLER_CATEGORY_MSG_TEMP, BSCRIPT_VAR_TEMP_DATA diff --git a/files/battledata/script/subscript/subscript_0275_ThrowSafariBall.s b/files/battledata/script/subscript/subscript_0275_ThrowSafariBall.s index eb3200a7b..c7129eb87 100644 --- a/files/battledata/script/subscript/subscript_0275_ThrowSafariBall.s +++ b/files/battledata/script/subscript/subscript_0275_ThrowSafariBall.s @@ -8,14 +8,14 @@ _000: // {0} used one {1}! PrintMessage msg_0197_00857, TAG_TRNAME_ITEM, BATTLER_CATEGORY_ATTACKER, BATTLER_CATEGORY_MSG_TEMP Wait - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_SAFARI_BALL + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_SAFARI_BALL GoTo _THROW_BALL _SET_PARK_BALL: // {0}, come back! PrintGlobalMessage msg_0197_01225, TAG_NICKNAME, BATTLER_CATEGORY_ENEMY Wait - ThrowPokeball BATTLER_CATEGORY_PLAYER, BTLSCR_THROW_PARK_BALL + ThrowPokeball BATTLER_CATEGORY_PLAYER, GAME_THROW_PARK_BALL _THROW_BALL: StartCatchMonTask CAPTURE_SAFARI diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic.mk b/files/fielddata/graphic/preview_graphic/preview_graphic.mk new file mode 100644 index 000000000..8b2d516ea --- /dev/null +++ b/files/fielddata/graphic/preview_graphic/preview_graphic.mk @@ -0,0 +1,18 @@ +PREVIEW_GRAPHIC_DIR := files/fielddata/graphic/preview_graphic/preview_graphic +PREVIEW_GRAPHIC_NARC := $(PREVIEW_GRAPHIC_DIR).narc + +PREVIEW_GRAPHIC_PNG := $(wildcard $(PREVIEW_GRAPHIC_DIR)/*.png) +PREVIEW_GRAPHIC_NSCR := $(wildcard $(PREVIEW_GRAPHIC_DIR)/*.NSCR) + +PREVIEW_GRAPHIC_NCGR := $(PREVIEW_GRAPHIC_PNG:%.png=%.NCGR) +PREVIEW_GRAPHIC_NCLR := $(PREVIEW_GRAPHIC_PNG:%.png=%.NCLR) +PREVIEW_GRAPHIC_NCGR_LZ := $(PREVIEW_GRAPHIC_NCGR:%.NCGR=%.NCGR.lz) +PREVIEW_GRAPHIC_NSCR_LZ := $(PREVIEW_GRAPHIC_NSCR:%.NSCR=%.NSCR.lz) + +8BPP_NOPAD_NCLR_PNG_FILES += $(PREVIEW_GRAPHIC_NCLR) +VERSION101_SOPC_8BPP_NCGR_FILES += $(PREVIEW_GRAPHIC_NCGR) + +$(PREVIEW_GRAPHIC_NARC): $(PREVIEW_GRAPHIC_NCGR_LZ) $(PREVIEW_GRAPHIC_NSCR_LZ) $(PREVIEW_GRAPHIC_NCLR) + $(KNARC) -p $(PREVIEW_GRAPHIC_NARC) -d $(PREVIEW_GRAPHIC_DIR) -i + +FS_CLEAN_TARGETS += $(PREVIEW_GRAPHIC_NCGR_LZ) $(PREVIEW_GRAPHIC_NSCR_LZ) $(PREVIEW_GRAPHIC_NCLR) diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/.gitignore b/files/fielddata/graphic/preview_graphic/preview_graphic/.gitignore new file mode 100644 index 000000000..eeff1be16 --- /dev/null +++ b/files/fielddata/graphic/preview_graphic/preview_graphic/.gitignore @@ -0,0 +1 @@ +*.NCGR diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcignore b/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcignore new file mode 100644 index 000000000..7af22f6f8 --- /dev/null +++ b/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcignore @@ -0,0 +1,3 @@ +*.png +*.NCGR +*.NSCR diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcorder b/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcorder new file mode 100644 index 000000000..84ba279c9 --- /dev/null +++ b/files/fielddata/graphic/preview_graphic/preview_graphic/.knarcorder @@ -0,0 +1,228 @@ +preview_graphic_dark_cave_r45_morning.NCLR +preview_graphic_dark_cave_r45_morning.NCGR.lz +preview_graphic_dark_cave_r45_morning.NSCR.lz +preview_graphic_dark_cave_r45_day.NCLR +preview_graphic_dark_cave_r45_day.NCGR.lz +preview_graphic_dark_cave_r45_day.NSCR.lz +preview_graphic_dark_cave_r45_night.NCLR +preview_graphic_dark_cave_r45_night.NCGR.lz +preview_graphic_dark_cave_r45_night.NSCR.lz +preview_graphic_dark_cave_r31_morning.NCLR +preview_graphic_dark_cave_r31_morning.NCGR.lz +preview_graphic_dark_cave_r31_morning.NSCR.lz +preview_graphic_dark_cave_r31_day.NCLR +preview_graphic_dark_cave_r31_day.NCGR.lz +preview_graphic_dark_cave_r31_day.NSCR.lz +preview_graphic_dark_cave_r31_night.NCLR +preview_graphic_dark_cave_r31_night.NCGR.lz +preview_graphic_dark_cave_r31_night.NSCR.lz +preview_graphic_sprout_tower_morning.NCLR +preview_graphic_sprout_tower_morning.NCGR.lz +preview_graphic_sprout_tower_morning.NSCR.lz +preview_graphic_sprout_tower_day.NCLR +preview_graphic_sprout_tower_day.NCGR.lz +preview_graphic_sprout_tower_day.NSCR.lz +preview_graphic_sprout_tower_night.NCLR +preview_graphic_sprout_tower_night.NCGR.lz +preview_graphic_sprout_tower_night.NSCR.lz +preview_graphic_ruins_of_alph_morning.NCLR +preview_graphic_ruins_of_alph_morning.NCGR.lz +preview_graphic_ruins_of_alph_morning.NSCR.lz +preview_graphic_ruins_of_alph_day.NCLR +preview_graphic_ruins_of_alph_day.NCGR.lz +preview_graphic_ruins_of_alph_day.NSCR.lz +preview_graphic_ruins_of_alph_night.NCLR +preview_graphic_ruins_of_alph_night.NCGR.lz +preview_graphic_ruins_of_alph_night.NSCR.lz +preview_graphic_union_cave_morning.NCLR +preview_graphic_union_cave_morning.NCGR.lz +preview_graphic_union_cave_morning.NSCR.lz +preview_graphic_union_cave_day.NCLR +preview_graphic_union_cave_day.NCGR.lz +preview_graphic_union_cave_day.NSCR.lz +preview_graphic_union_cave_night.NCLR +preview_graphic_union_cave_night.NCGR.lz +preview_graphic_union_cave_night.NSCR.lz +preview_graphic_slowpoke_well_morning.NCLR +preview_graphic_slowpoke_well_morning.NCGR.lz +preview_graphic_slowpoke_well_morning.NSCR.lz +preview_graphic_slowpoke_well_day.NCLR +preview_graphic_slowpoke_well_day.NCGR.lz +preview_graphic_slowpoke_well_day.NSCR.lz +preview_graphic_slowpoke_well_night.NCLR +preview_graphic_slowpoke_well_night.NCGR.lz +preview_graphic_slowpoke_well_night.NSCR.lz +preview_graphic_ilex_forest_morning.NCLR +preview_graphic_ilex_forest_morning.NCGR.lz +preview_graphic_ilex_forest_morning.NSCR.lz +preview_graphic_ilex_forest_day.NCLR +preview_graphic_ilex_forest_day.NCGR.lz +preview_graphic_ilex_forest_day.NSCR.lz +preview_graphic_ilex_forest_evening.NCLR +preview_graphic_ilex_forest_evening.NCGR.lz +preview_graphic_ilex_forest_evening.NSCR.lz +preview_graphic_ilex_forest_night.NCLR +preview_graphic_ilex_forest_night.NCGR.lz +preview_graphic_ilex_forest_night.NSCR.lz +preview_graphic_national_park_morning.NCLR +preview_graphic_national_park_morning.NCGR.lz +preview_graphic_national_park_morning.NSCR.lz +preview_graphic_national_park_day.NCLR +preview_graphic_national_park_day.NCGR.lz +preview_graphic_national_park_day.NSCR.lz +preview_graphic_national_park_evening.NCLR +preview_graphic_national_park_evening.NCGR.lz +preview_graphic_national_park_evening.NSCR.lz +preview_graphic_national_park_night.NCLR +preview_graphic_national_park_night.NCGR.lz +preview_graphic_national_park_night.NSCR.lz +preview_graphic_burned_tower_morning.NCLR +preview_graphic_burned_tower_morning.NCGR.lz +preview_graphic_burned_tower_morning.NSCR.lz +preview_graphic_burned_tower_day.NCLR +preview_graphic_burned_tower_day.NCGR.lz +preview_graphic_burned_tower_day.NSCR.lz +preview_graphic_burned_tower_evening.NCLR +preview_graphic_burned_tower_evening.NCGR.lz +preview_graphic_burned_tower_evening.NSCR.lz +preview_graphic_burned_tower_night.NCLR +preview_graphic_burned_tower_night.NCGR.lz +preview_graphic_burned_tower_night.NSCR.lz +preview_graphic_bell_tower_morning.NCLR +preview_graphic_bell_tower_morning.NCGR.lz +preview_graphic_bell_tower_morning.NSCR.lz +preview_graphic_bell_tower_day.NCLR +preview_graphic_bell_tower_day.NCGR.lz +preview_graphic_bell_tower_day.NSCR.lz +preview_graphic_bell_tower_evening.NCLR +preview_graphic_bell_tower_evening.NCGR.lz +preview_graphic_bell_tower_evening.NSCR.lz +preview_graphic_bell_tower_night.NCLR +preview_graphic_bell_tower_night.NCGR.lz +preview_graphic_bell_tower_night.NSCR.lz +preview_graphic_whirl_islands_morning.NCLR +preview_graphic_whirl_islands_morning.NCGR.lz +preview_graphic_whirl_islands_morning.NSCR.lz +preview_graphic_whirl_islands_day.NCLR +preview_graphic_whirl_islands_day.NCGR.lz +preview_graphic_whirl_islands_day.NSCR.lz +preview_graphic_whirl_islands_night.NCLR +preview_graphic_whirl_islands_night.NCGR.lz +preview_graphic_whirl_islands_night.NSCR.lz +preview_graphic_mt_mortar_morning.NCLR +preview_graphic_mt_mortar_morning.NCGR.lz +preview_graphic_mt_mortar_morning.NSCR.lz +preview_graphic_mt_mortar_day.NCLR +preview_graphic_mt_mortar_day.NCGR.lz +preview_graphic_mt_mortar_day.NSCR.lz +preview_graphic_mt_mortar_evening.NCLR +preview_graphic_mt_mortar_evening.NCGR.lz +preview_graphic_mt_mortar_evening.NSCR.lz +preview_graphic_mt_mortar_night.NCLR +preview_graphic_mt_mortar_night.NCGR.lz +preview_graphic_mt_mortar_night.NSCR.lz +preview_graphic_ice_path_morning.NCLR +preview_graphic_ice_path_morning.NCGR.lz +preview_graphic_ice_path_morning.NSCR.lz +preview_graphic_ice_path_day.NCLR +preview_graphic_ice_path_day.NCGR.lz +preview_graphic_ice_path_day.NSCR.lz +preview_graphic_ice_path_night.NCLR +preview_graphic_ice_path_night.NCGR.lz +preview_graphic_ice_path_night.NSCR.lz +preview_graphic_dragons_den_morning.NCLR +preview_graphic_dragons_den_morning.NCGR.lz +preview_graphic_dragons_den_morning.NSCR.lz +preview_graphic_dragons_den_day.NCLR +preview_graphic_dragons_den_day.NCGR.lz +preview_graphic_dragons_den_day.NSCR.lz +preview_graphic_dragons_den_night.NCLR +preview_graphic_dragons_den_night.NCGR.lz +preview_graphic_dragons_den_night.NSCR.lz +preview_graphic_tohjo_falls_morning.NCLR +preview_graphic_tohjo_falls_morning.NCGR.lz +preview_graphic_tohjo_falls_morning.NSCR.lz +preview_graphic_tohjo_falls_day.NCLR +preview_graphic_tohjo_falls_day.NCGR.lz +preview_graphic_tohjo_falls_day.NSCR.lz +preview_graphic_tohjo_falls_night.NCLR +preview_graphic_tohjo_falls_night.NCGR.lz +preview_graphic_tohjo_falls_night.NSCR.lz +preview_graphic_victory_road_morning.NCLR +preview_graphic_victory_road_morning.NCGR.lz +preview_graphic_victory_road_morning.NSCR.lz +preview_graphic_victory_road_day.NCLR +preview_graphic_victory_road_day.NCGR.lz +preview_graphic_victory_road_day.NSCR.lz +preview_graphic_victory_road_night.NCLR +preview_graphic_victory_road_night.NCGR.lz +preview_graphic_victory_road_night.NSCR.lz +preview_graphic_viridian_forest_morning.NCLR +preview_graphic_viridian_forest_morning.NCGR.lz +preview_graphic_viridian_forest_morning.NSCR.lz +preview_graphic_viridian_forest_day.NCLR +preview_graphic_viridian_forest_day.NCGR.lz +preview_graphic_viridian_forest_day.NSCR.lz +preview_graphic_viridian_forest_evening.NCLR +preview_graphic_viridian_forest_evening.NCGR.lz +preview_graphic_viridian_forest_evening.NSCR.lz +preview_graphic_viridian_forest_night.NCLR +preview_graphic_viridian_forest_night.NCGR.lz +preview_graphic_viridian_forest_night.NSCR.lz +preview_graphic_diglett_cave_morning.NCLR +preview_graphic_diglett_cave_morning.NCGR.lz +preview_graphic_diglett_cave_morning.NSCR.lz +preview_graphic_diglett_cave_day.NCLR +preview_graphic_diglett_cave_day.NCGR.lz +preview_graphic_diglett_cave_day.NSCR.lz +preview_graphic_diglett_cave_night.NCLR +preview_graphic_diglett_cave_night.NCGR.lz +preview_graphic_diglett_cave_night.NSCR.lz +preview_graphic_rock_tunnel_morning.NCLR +preview_graphic_rock_tunnel_morning.NCGR.lz +preview_graphic_rock_tunnel_morning.NSCR.lz +preview_graphic_rock_tunnel_day.NCLR +preview_graphic_rock_tunnel_day.NCGR.lz +preview_graphic_rock_tunnel_day.NSCR.lz +preview_graphic_rock_tunnel_night.NCLR +preview_graphic_rock_tunnel_night.NCGR.lz +preview_graphic_rock_tunnel_night.NSCR.lz +preview_graphic_mt_moon_morning.NCLR +preview_graphic_mt_moon_morning.NCGR.lz +preview_graphic_mt_moon_morning.NSCR.lz +preview_graphic_mt_moon_day.NCLR +preview_graphic_mt_moon_day.NCGR.lz +preview_graphic_mt_moon_day.NSCR.lz +preview_graphic_mt_moon_evening.NCLR +preview_graphic_mt_moon_evening.NCGR.lz +preview_graphic_mt_moon_evening.NSCR.lz +preview_graphic_mt_moon_night.NCLR +preview_graphic_mt_moon_night.NCGR.lz +preview_graphic_mt_moon_night.NSCR.lz +preview_graphic_seafoam_islands_morning.NCLR +preview_graphic_seafoam_islands_morning.NCGR.lz +preview_graphic_seafoam_islands_morning.NSCR.lz +preview_graphic_seafoam_islands_day.NCLR +preview_graphic_seafoam_islands_day.NCGR.lz +preview_graphic_seafoam_islands_day.NSCR.lz +preview_graphic_seafoam_islands_night.NCLR +preview_graphic_seafoam_islands_night.NCGR.lz +preview_graphic_seafoam_islands_night.NSCR.lz +preview_graphic_mt_silver_morning.NCLR +preview_graphic_mt_silver_morning.NCGR.lz +preview_graphic_mt_silver_morning.NSCR.lz +preview_graphic_mt_silver_day.NCLR +preview_graphic_mt_silver_day.NCGR.lz +preview_graphic_mt_silver_day.NSCR.lz +preview_graphic_mt_silver_night.NCLR +preview_graphic_mt_silver_night.NCGR.lz +preview_graphic_mt_silver_night.NSCR.lz +preview_graphic_cerulean_cave_morning.NCLR +preview_graphic_cerulean_cave_morning.NCGR.lz +preview_graphic_cerulean_cave_morning.NSCR.lz +preview_graphic_cerulean_cave_day.NCLR +preview_graphic_cerulean_cave_day.NCGR.lz +preview_graphic_cerulean_cave_day.NSCR.lz +preview_graphic_cerulean_cave_night.NCLR +preview_graphic_cerulean_cave_night.NCGR.lz +preview_graphic_cerulean_cave_night.NSCR.lz diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.NSCR new file mode 100644 index 000000000..ab1982605 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.png new file mode 100644 index 000000000..54db78233 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.NSCR new file mode 100644 index 000000000..ab1982605 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.png new file mode 100644 index 000000000..c24b2898e Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.NSCR new file mode 100644 index 000000000..1d2d2a7e2 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.png new file mode 100644 index 000000000..512ec5c49 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.NSCR new file mode 100644 index 000000000..8157aab45 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.png new file mode 100644 index 000000000..40ea89bda Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_bell_tower_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.NSCR new file mode 100644 index 000000000..7dea34886 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.png new file mode 100644 index 000000000..27d380df4 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.NSCR new file mode 100644 index 000000000..44eb94aec Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.png new file mode 100644 index 000000000..f37a6a579 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.NSCR new file mode 100644 index 000000000..d9ace1e23 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.png new file mode 100644 index 000000000..97b8b77e8 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.NSCR new file mode 100644 index 000000000..8a90b6dcf Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.png new file mode 100644 index 000000000..b7c5aa1f8 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_burned_tower_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.NSCR new file mode 100644 index 000000000..095acf169 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.png new file mode 100644 index 000000000..961b9cf31 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.NSCR new file mode 100644 index 000000000..095acf169 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.png new file mode 100644 index 000000000..2ec8c4a91 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.NSCR new file mode 100644 index 000000000..94a952eb9 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.png new file mode 100644 index 000000000..e4389dafb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_cerulean_cave_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.NSCR new file mode 100644 index 000000000..16dca81fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.png new file mode 100644 index 000000000..dd4e3954f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.NSCR new file mode 100644 index 000000000..16dca81fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.png new file mode 100644 index 000000000..477283036 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.NSCR new file mode 100644 index 000000000..16dca81fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.png new file mode 100644 index 000000000..93e02f1cf Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r31_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.NSCR new file mode 100644 index 000000000..a507f34ca Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.png new file mode 100644 index 000000000..5e4f60bff Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.NSCR new file mode 100644 index 000000000..16dca81fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.png new file mode 100644 index 000000000..00b5b7177 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.NSCR new file mode 100644 index 000000000..16dca81fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.png new file mode 100644 index 000000000..6f7e7e5b5 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dark_cave_r45_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.NSCR new file mode 100644 index 000000000..61ddf440f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.png new file mode 100644 index 000000000..75abb9d14 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.NSCR new file mode 100644 index 000000000..61ddf440f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.png new file mode 100644 index 000000000..f2a0d7181 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.NSCR new file mode 100644 index 000000000..61ddf440f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.png new file mode 100644 index 000000000..1851972d6 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_diglett_cave_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.NSCR new file mode 100644 index 000000000..6b5b610be Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.png new file mode 100644 index 000000000..121b821c3 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.NSCR new file mode 100644 index 000000000..ff4daac54 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.png new file mode 100644 index 000000000..61dbb4995 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.NSCR new file mode 100644 index 000000000..db615231a Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.png new file mode 100644 index 000000000..482e66a1f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_dragons_den_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.NSCR new file mode 100644 index 000000000..7c12a3571 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.png new file mode 100644 index 000000000..961a92494 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.NSCR new file mode 100644 index 000000000..7c12a3571 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.png new file mode 100644 index 000000000..90302abec Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.NSCR new file mode 100644 index 000000000..7c12a3571 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.png new file mode 100644 index 000000000..f287ec324 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ice_path_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.NSCR new file mode 100644 index 000000000..475f6aab8 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.png new file mode 100644 index 000000000..3a1394c71 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.NSCR new file mode 100644 index 000000000..13a02a235 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.png new file mode 100644 index 000000000..9ae190b16 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.NSCR new file mode 100644 index 000000000..856035ab9 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.png new file mode 100644 index 000000000..5a71e9dd3 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.NSCR new file mode 100644 index 000000000..0c8d38ab4 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.png new file mode 100644 index 000000000..02a55de64 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ilex_forest_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.NSCR new file mode 100644 index 000000000..5ee1ef323 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.png new file mode 100644 index 000000000..4da0cc3be Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.NSCR new file mode 100644 index 000000000..bf9fa16d3 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.png new file mode 100644 index 000000000..0cca3ed97 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.NSCR new file mode 100644 index 000000000..e52ea5eae Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.png new file mode 100644 index 000000000..c0cffc48e Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.NSCR new file mode 100644 index 000000000..bb36daf42 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.png new file mode 100644 index 000000000..4d23cccc7 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_moon_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.NSCR new file mode 100644 index 000000000..128cda4ce Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.png new file mode 100644 index 000000000..e344aacb0 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.NSCR new file mode 100644 index 000000000..f0b178bc3 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.png new file mode 100644 index 000000000..840fdfdfd Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.NSCR new file mode 100644 index 000000000..128cda4ce Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.png new file mode 100644 index 000000000..b58d00bb5 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.NSCR new file mode 100644 index 000000000..e5e21d979 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.png new file mode 100644 index 000000000..d3e075bee Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_mortar_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.NSCR new file mode 100644 index 000000000..9fcc9ece5 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.png new file mode 100644 index 000000000..300687df8 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.NSCR new file mode 100644 index 000000000..72d75a185 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.png new file mode 100644 index 000000000..4839a2c99 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.NSCR new file mode 100644 index 000000000..29d0afd56 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.png new file mode 100644 index 000000000..7ae0f06ef Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_mt_silver_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.NSCR new file mode 100644 index 000000000..40cf9ec62 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.png new file mode 100644 index 000000000..b5879c0fb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.NSCR new file mode 100644 index 000000000..503f6d258 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.png new file mode 100644 index 000000000..0dac7f15a Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.NSCR new file mode 100644 index 000000000..4b594d311 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.png new file mode 100644 index 000000000..acdf5d647 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.NSCR new file mode 100644 index 000000000..a1e619972 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.png new file mode 100644 index 000000000..c858f34cb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_national_park_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.NSCR new file mode 100644 index 000000000..a99364cd0 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.png new file mode 100644 index 000000000..20e2cebad Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.NSCR new file mode 100644 index 000000000..a99364cd0 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.png new file mode 100644 index 000000000..41711dd9d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.NSCR new file mode 100644 index 000000000..2f839bea5 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.png new file mode 100644 index 000000000..4766e70a9 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_rock_tunnel_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.NSCR new file mode 100644 index 000000000..47d4b4d14 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.png new file mode 100644 index 000000000..5f7a6c14a Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.NSCR new file mode 100644 index 000000000..47d4b4d14 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.png new file mode 100644 index 000000000..259207c7c Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.NSCR new file mode 100644 index 000000000..47d4b4d14 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.png new file mode 100644 index 000000000..ef51bdc11 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_ruins_of_alph_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.NSCR new file mode 100644 index 000000000..46b8c2048 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.png new file mode 100644 index 000000000..763c2cb88 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.NSCR new file mode 100644 index 000000000..46b8c2048 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.png new file mode 100644 index 000000000..9450db6ee Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.NSCR new file mode 100644 index 000000000..46b8c2048 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.png new file mode 100644 index 000000000..5e761567d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_seafoam_islands_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.NSCR new file mode 100644 index 000000000..e460b8024 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.png new file mode 100644 index 000000000..10e7abfb4 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.NSCR new file mode 100644 index 000000000..fc313a2d1 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.png new file mode 100644 index 000000000..4cd6a9402 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.NSCR new file mode 100644 index 000000000..507afd533 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.png new file mode 100644 index 000000000..22cad726f Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_slowpoke_well_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.NSCR new file mode 100644 index 000000000..138a32d68 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.png new file mode 100644 index 000000000..472f4842c Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.NSCR new file mode 100644 index 000000000..abfcb33a7 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.png new file mode 100644 index 000000000..f6acfb30c Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.NSCR new file mode 100644 index 000000000..587b03ce4 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.png new file mode 100644 index 000000000..ab5ff03c0 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_sprout_tower_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.NSCR new file mode 100644 index 000000000..d86c31f35 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.png new file mode 100644 index 000000000..399090068 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.NSCR new file mode 100644 index 000000000..d86c31f35 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.png new file mode 100644 index 000000000..108375052 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.NSCR new file mode 100644 index 000000000..d86c31f35 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.png new file mode 100644 index 000000000..00343226c Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_tohjo_falls_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.NSCR new file mode 100644 index 000000000..84fdeb304 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.png new file mode 100644 index 000000000..adafe4b7d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.NSCR new file mode 100644 index 000000000..77e03b82d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.png new file mode 100644 index 000000000..648d4ae3b Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.NSCR new file mode 100644 index 000000000..77e03b82d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.png new file mode 100644 index 000000000..e98ffb0b6 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_union_cave_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.NSCR new file mode 100644 index 000000000..25400668d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.png new file mode 100644 index 000000000..b0419a1f5 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.NSCR new file mode 100644 index 000000000..4d897dbfc Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.png new file mode 100644 index 000000000..309ee1bc1 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.NSCR new file mode 100644 index 000000000..787100f64 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.png new file mode 100644 index 000000000..e8193308e Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_victory_road_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.NSCR new file mode 100644 index 000000000..1db876b9c Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.png new file mode 100644 index 000000000..e2cf4a26b Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.NSCR new file mode 100644 index 000000000..1979b87ee Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.png new file mode 100644 index 000000000..178dc14f6 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_evening.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.NSCR new file mode 100644 index 000000000..2a5ff28bb Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.png new file mode 100644 index 000000000..e8cc7c44a Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.NSCR new file mode 100644 index 000000000..d67e4a449 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.png new file mode 100644 index 000000000..8edfaed29 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_viridian_forest_night.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.NSCR new file mode 100644 index 000000000..73c87fd98 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.png new file mode 100644 index 000000000..d7e716ce0 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_day.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.NSCR new file mode 100644 index 000000000..73c87fd98 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.png new file mode 100644 index 000000000..a96879ca2 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_morning.png differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.NSCR b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.NSCR new file mode 100644 index 000000000..73c87fd98 Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.NSCR differ diff --git a/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.png b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.png new file mode 100644 index 000000000..bd88feb1d Binary files /dev/null and b/files/fielddata/graphic/preview_graphic/preview_graphic/preview_graphic_whirl_islands_night.png differ diff --git a/filesystem.mk b/filesystem.mk index dc2619c2b..ddf64e8a9 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -432,6 +432,7 @@ $(eval $(call arc_strip_name,files/application/zukanlist/zukan_data/zukan_enc_$( $(eval $(call arc_strip_name,files/fielddata/encountdata/s_enc_data.narc,files/a/1/3/6)) $(eval $(call arc_strip_name,files/poketool/johtozukan.narc,files/a/1/3/8)) $(eval $(call arc_strip_name,files/fielddata/tsurepoke/tp_param.narc,files/a/1/4/1)) +$(eval $(call arc_strip_name,files/fielddata/graphic/preview_graphic/preview_graphic.narc,files/a/1/5/0)) $(eval $(call arc_strip_name,files/system/touch_subwindow.narc,files/a/1/5/2)) $(eval $(call arc_strip_name,files/data/gs_areawindow.narc,files/a/1/6/3)) $(eval $(call arc_strip_name,files/poketool/personal/performance.narc,files/a/1/6/9)) @@ -504,6 +505,7 @@ include files/data/resdat.mk include files/demo/title/titledemo.mk include files/demo/opening/gs_opening.mk include files/poketool/personal/personal.mk +include files/fielddata/graphic/preview_graphic/preview_graphic.mk $(filter-out $(DIFF_ARCS) $(FS_RULE_OVERRIDES),$(NITROFS_FILES)): ; diff --git a/graphics_files_rules.mk b/graphics_files_rules.mk index d358a2e17..6acb77000 100644 --- a/graphics_files_rules.mk +++ b/graphics_files_rules.mk @@ -8,6 +8,7 @@ $(IR_NCLR_FILES): GFX_FLAGS = -ir $(4BPP_NCLR_FILES): GFX_FLAGS = -bitdepth 4 $(8BPP_NSCR_FILES): GFX_FLAGS = -bitdepth 8 $(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10 +$(8BPP_NOPAD_NCLR_PNG_FILES): GFX_FLAGS = -bitdepth 8 -nopad $(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): GFX_FLAGS = -bitdepth 8 -nopad -comp 10 $(4BPP_NOPAD_PCMP_NCLR_FILES): GFX_FLAGS = -bitdepth 4 -nopad -pcmp @@ -30,4 +31,4 @@ $(PADDED_LZ_FILES): LZ_FLAGS += -A4 $(GFX) $< $@ $(GFX_FLAGS) %.lz: % - $(WINE) $(NTRCOMP) $(LZ_FLAGS) -o $@ $< + $(NTRCOMP) $(LZ_FLAGS) -o $@ $< diff --git a/include/battle/battle_command.h b/include/battle/battle_command.h index a83d7cec3..c95c28397 100644 --- a/include/battle/battle_command.h +++ b/include/battle/battle_command.h @@ -152,8 +152,8 @@ BOOL BtlCmd_CalcWeightBasedPower(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_CalcWeatherBallParams(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_TryPursuit(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *bsys, BattleContext *ctx); -BOOL BtlCmd_SetPokemonEncounter44(BattleSystem *bsys, BattleContext *ctx); -BOOL BtlCmd_SetPokemonEncounter45(BattleSystem *bsys, BattleContext *ctx); +BOOL BtlCmd_IfTurnFlag(BattleSystem *bsys, BattleContext *ctx); +BOOL BtlCmd_SetTurnFlag(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_CalcGyroBallPower(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_TryMetalBurst(BattleSystem *bsys, BattleContext *ctx); BOOL BtlCmd_CalcPaybackPower(BattleSystem *bsys, BattleContext *ctx); diff --git a/include/constants/battle_subscript.h b/include/constants/battle_subscript.h index 4cbce2e12..27a0b7bf7 100644 --- a/include/constants/battle_subscript.h +++ b/include/constants/battle_subscript.h @@ -513,11 +513,11 @@ #define TURN_FLAG_ROOSTING 6 //Safari Throw -#define BTLSCR_THROW_POKE_BALL 0 -#define BTLSCR_THROW_SAFARI_BALL 1 -#define BTLSCR_THROW_SAFARI_ROCK 2 -#define BTLSCR_THROW_SAFARI_BAIT 3 -#define BTLSCR_THROW_PARK_BALL 4 -#define BTLSCR_THROW_SPORT_BALL 5 +#define GAME_THROW_POKE_BALL 0 +#define GAME_THROW_SAFARI_BALL 1 +#define GAME_THROW_SAFARI_ROCK 2 +#define GAME_THROW_SAFARI_BAIT 3 +#define GAME_THROW_PARK_BALL 4 +#define GAME_THROW_SPORT_BALL 5 #endif //POKEHEARTGOLD_CONSTANTS_BATTLE_SUBSCRIPT_H diff --git a/include/constants/movements.h b/include/constants/movements.h index 6f954f61c..c7e2723b9 100644 --- a/include/constants/movements.h +++ b/include/constants/movements.h @@ -15,6 +15,7 @@ #define MOVEMENT_RUN_RIGHT 19 #define MOVEMENT_WALK_IN_PLACE_FACE_DOWN 37 #define MOVEMENT_WALK_IN_PLACE_FACE_RIGHT 39 +#define MOVEMENT_WALK_UNK_48 48 #define MOVEMENT_UNK_71 71 #define MOVEMENT_UNK_72 72 #define MOVEMENT_EMOTE_EXCLAMATION 75 diff --git a/include/constants/moves.h b/include/constants/moves.h index 9b7ef62a0..5015b6bf3 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -473,18 +473,18 @@ #define NUM_MOVES MOVE_SHADOW_FORCE //Move Attributes -#define MOVEATTRIBUTE_EFFECT 0 -#define MOVEATTRIBUTE_CLASS 1 -#define MOVEATTRIBUTE_POWER 2 -#define MOVEATTRIBUTE_TYPE 3 -#define MOVEATTRIBUTE_ACCURACY 4 -#define MOVEATTRIBUTE_PP 5 -#define MOVEATTRIBUTE_EFFECT_CHANCE 6 -#define MOVEATTRIBUTE_RANGE 7 -#define MOVEATTRIBUTE_PRIORTY 8 -#define MOVEATTRIBUTE_FLAGS 9 -#define MOVEATTRIBUTE_CONTEST_EFFECT 10 -#define MOVEATTRIBUTE_CONTEST_TYPE 11 +#define MOVE_ATTRIBUTE_EFFECT 0 +#define MOVE_ATTRIBUTE_CLASS 1 +#define MOVE_ATTRIBUTE_POWER 2 +#define MOVE_ATTRIBUTE_TYPE 3 +#define MOVE_ATTRIBUTE_ACCURACY 4 +#define MOVE_ATTRIBUTE_PP 5 +#define MOVE_ATTRIBUTE_EFFECT_CHANCE 6 +#define MOVE_ATTRIBUTE_RANGE 7 +#define MOVE_ATTRIBUTE_PRIORTY 8 +#define MOVE_ATTRIBUTE_FLAGS 9 +#define MOVE_ATTRIBUTE_CONTEST_EFFECT 10 +#define MOVE_ATTRIBUTE_CONTEST_TYPE 11 #define CATEGORY_PHYSICAL 0 #define CATEGORY_SPECIAL 1 diff --git a/include/map_preview_graphic.h b/include/map_preview_graphic.h new file mode 100644 index 000000000..6d5e05ddd --- /dev/null +++ b/include/map_preview_graphic.h @@ -0,0 +1,9 @@ +#ifndef POKEHEARTGOLD_MAP_PREVIEW_GRAPHIC_H +#define POKEHEARTGOLD_MAP_PREVIEW_GRAPHIC_H + +#include "task.h" + +u8 MapPreviewGraphic_GetIndex(u32 mapId); +void MapPreviewGraphic_BeginShowImage(TaskManager *man, int index, u8 time, int a3); + +#endif //POKEHEARTGOLD_MAP_PREVIEW_GRAPHIC_H diff --git a/include/overlay_01.h b/include/overlay_01.h index dcc647746..b66d18235 100644 --- a/include/overlay_01.h +++ b/include/overlay_01.h @@ -29,8 +29,6 @@ typedef struct UnkStruct_field_021F4360 { void ov01_021E636C(int a0); void ov01_021EFAF8(FieldSystem *fieldSystem); -void Field_PlayerAvatar_OrrTransitionFlags(PlayerAvatar *avatar, int a1); -void Field_PlayerAvatar_ApplyTransitionFlags(PlayerAvatar *avatar); void ov01_021F35C4(FieldSystem *fieldSystem, int a1, int *a2); u32 GetHoneySweetScentWorkSize(void); BOOL Task_HoneyOrSweetScent(TaskManager *taskManager); diff --git a/include/unk_0206A360.h b/include/unk_0206A360.h deleted file mode 100644 index d20a4a1ff..000000000 --- a/include/unk_0206A360.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEHEARTGOLD_UNK_0206A360_H -#define POKEHEARTGOLD_UNK_0206A360_H - -#include "task.h" - -int sub_0206A360(u32 mapId); -void sub_0206A388(TaskManager *man, int index, u8 time, int a3); - -#endif //POKEHEARTGOLD_UNK_0206A360_H \ No newline at end of file diff --git a/main.lsf b/main.lsf index c18f6c789..1cd8acac5 100644 --- a/main.lsf +++ b/main.lsf @@ -246,7 +246,7 @@ Static main Object asm/unk_02069660.o Object asm/unk_0206979C.o Object src/follow_mon.o - Object asm/unk_0206A360.o + Object src/map_preview_graphic.o Object asm/field_take_photo.o Object src/unk_0206B910.o Object src/alph_checks.o diff --git a/src/battle/battle_command.c b/src/battle/battle_command.c index faabfe608..cddaad290 100644 --- a/src/battle/battle_command.c +++ b/src/battle/battle_command.c @@ -4270,7 +4270,7 @@ BOOL BtlCmd_ApplyTypeEffectiveness(BattleSystem *bsys, BattleContext *ctx) { return FALSE; } -BOOL BtlCmd_SetPokemonEncounter44(BattleSystem *bsys, BattleContext *ctx) { +BOOL BtlCmd_IfTurnFlag(BattleSystem *bsys, BattleContext *ctx) { int ret = FALSE; BattleScriptIncrementPointer(ctx, 1); @@ -4327,7 +4327,7 @@ BOOL BtlCmd_SetPokemonEncounter44(BattleSystem *bsys, BattleContext *ctx) { return FALSE; } -BOOL BtlCmd_SetPokemonEncounter45(BattleSystem *bsys, BattleContext *ctx) { +BOOL BtlCmd_SetTurnFlag(BattleSystem *bsys, BattleContext *ctx) { BattleScriptIncrementPointer(ctx, 1); int side = BattleScriptReadWord(ctx); diff --git a/src/field_use_item.c b/src/field_use_item.c index 37bab59ae..32f77e82f 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -32,6 +32,7 @@ #include "msgdata/msg/msg_0010.h" #include "script.h" #include "msgdata/msg.naix" +#include "overlay_01_021F1AFC.h" struct ItemUseFuncDat { ItemMenuUseFunc menu; diff --git a/src/map_preview_graphic.c b/src/map_preview_graphic.c new file mode 100644 index 000000000..cfb10f998 --- /dev/null +++ b/src/map_preview_graphic.c @@ -0,0 +1,946 @@ +#include "global.h" +#include "field_map_object.h" +#include "field_player_avatar.h" +#include "follow_mon.h" +#include "gf_gfx_loader.h" +#include "gf_rtc.h" +#include "system.h" +#include "map_preview_graphic.h" +#include "unk_0200FA24.h" +#include "unk_02062108.h" +#include "overlay_01_021F1AFC.h" +#include "overlay_01.h" +#include "constants/maps.h" +#include "constants/movements.h" +#include "fielddata/graphic/preview_graphic/preview_graphic.naix" + +typedef struct MapPreviewGraphicData { + int mapId; + u32 unused4; + struct { + int palNo; + int charNo; + int scrnNo; + } files[4]; + int unused3C; //this looks like it was originally used as a dungeon index const +} MapPreviewGraphicData; + +typedef struct UnkStateMachineSubstruct_0206A388 { + u16 state; + u16 unk2; +} UnkStateMachineSubstruct_0206A388; + +typedef struct UnkStruct_0206A388 { + int state; + int displayTimer; + HeapID heapId; + BgConfig *bgConfig; + Window *window; + u16 bgColorMode; + u16 index; + u16 fadeOutTimer; + u16 unk1A; + u32 bg2Priority; + u32 bg0Priority; + u32 bg1Priority; + u32 bg3Priority; + int timeIndex; + int unk30; + UnkStateMachineSubstruct_0206A388 unk34; +} UnkStruct_0206A388; + +static MapPreviewGraphicData sMapPreviewGraphicData[] = { + { + //Dark Cave, North Side + .mapId = MAP_D42R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r45_night_NSCR_lz + } + }, + .unused3C = 0 + }, + { + //Dark Cave, South Side + .mapId = MAP_D42R0102, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dark_cave_r31_night_NSCR_lz + } + }, + .unused3C = 0 + }, + { + //Sprout Tower + .mapId = MAP_D15R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_sprout_tower_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_sprout_tower_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_sprout_tower_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_sprout_tower_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_sprout_tower_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_sprout_tower_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_sprout_tower_night_NSCR_lz + } + }, + .unused3C = 1 + }, + { + //Ruins of Alph 1 + .mapId = MAP_D24R0211, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NSCR_lz + } + }, + .unused3C = 2 + }, + { + //Ruins of Alph 2 + .mapId = MAP_D24R0217, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ruins_of_alph_night_NSCR_lz + } + }, + .unused3C = 2 + }, + { + //Union Cave + .mapId = MAP_D25R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_union_cave_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_union_cave_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_union_cave_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_union_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_union_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_union_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_union_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_union_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_union_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_union_cave_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_union_cave_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_union_cave_night_NSCR_lz + } + }, + .unused3C = 3 + }, + { + //Slowpoke Well + .mapId = MAP_D26R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_slowpoke_well_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_slowpoke_well_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_slowpoke_well_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_slowpoke_well_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_slowpoke_well_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_slowpoke_well_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_slowpoke_well_night_NSCR_lz + } + }, + .unused3C = 4 + }, + { + //Ilex Forest + .mapId = MAP_D36R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_ilex_forest_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ilex_forest_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ilex_forest_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ilex_forest_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ilex_forest_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ilex_forest_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ilex_forest_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ilex_forest_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ilex_forest_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ilex_forest_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ilex_forest_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ilex_forest_night_NSCR_lz + } + }, + .unused3C = 5 + }, + { + //National Park + .mapId = MAP_D22R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_national_park_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_national_park_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_national_park_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_national_park_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_national_park_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_national_park_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_national_park_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_national_park_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_national_park_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_national_park_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_national_park_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_national_park_night_NSCR_lz + } + }, + .unused3C = 6 + }, + { + //Burned Tower + .mapId = MAP_D18R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_burned_tower_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_burned_tower_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_burned_tower_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_burned_tower_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_burned_tower_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_burned_tower_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_burned_tower_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_burned_tower_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_burned_tower_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_burned_tower_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_burned_tower_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_burned_tower_night_NSCR_lz + } + }, + .unused3C = 7 + }, + { + //Bell Tower + .mapId = MAP_D17R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_bell_tower_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_bell_tower_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_bell_tower_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_bell_tower_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_bell_tower_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_bell_tower_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_bell_tower_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_bell_tower_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_bell_tower_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_bell_tower_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_bell_tower_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_bell_tower_night_NSCR_lz + } + }, + .unused3C = 8 + }, + { + //Whirl Islands + .mapId = MAP_D40R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_whirl_islands_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_whirl_islands_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_whirl_islands_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_whirl_islands_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_whirl_islands_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_whirl_islands_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_whirl_islands_night_NSCR_lz + } + }, + .unused3C = 9 + }, + { + //Mt Mortar + .mapId = MAP_D38R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_mt_mortar_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_mortar_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_mortar_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_mortar_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_mortar_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_mortar_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_mortar_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_mortar_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_mortar_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_mortar_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_mortar_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_mortar_night_NSCR_lz + } + }, + .unused3C = 11 + }, + { + //Ice Path + .mapId = MAP_D39R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_ice_path_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ice_path_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ice_path_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ice_path_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ice_path_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ice_path_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ice_path_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ice_path_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ice_path_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_ice_path_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_ice_path_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_ice_path_night_NSCR_lz + } + }, + .unused3C = 12 + }, + { + //Dragon's Den + .mapId = MAP_D44R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_dragons_den_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dragons_den_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dragons_den_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dragons_den_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_dragons_den_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_dragons_den_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_dragons_den_night_NSCR_lz + } + }, + .unused3C = 13 + }, + { + //Tohjo Falls + .mapId = MAP_D45R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_tohjo_falls_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_tohjo_falls_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_tohjo_falls_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_tohjo_falls_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_tohjo_falls_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_tohjo_falls_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_tohjo_falls_night_NSCR_lz + } + }, + .unused3C = 14 + }, + { + //Victory Road South + .mapId = MAP_D43R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_night_NSCR_lz + } + }, + .unused3C = 15 + }, + { + //Victory Road North + .mapId = MAP_D43R0103, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_victory_road_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_victory_road_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_victory_road_night_NSCR_lz + } + }, + .unused3C = 15 + }, + { + //Viridian Forest + .mapId = MAP_D46R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_viridian_forest_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_viridian_forest_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_viridian_forest_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_viridian_forest_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_viridian_forest_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_viridian_forest_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_viridian_forest_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_viridian_forest_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_viridian_forest_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_viridian_forest_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_viridian_forest_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_viridian_forest_night_NSCR_lz + } + }, + .unused3C = 16 + }, + { + //Diglett Cave + .mapId = MAP_D01R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_diglett_cave_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_diglett_cave_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_diglett_cave_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_diglett_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_diglett_cave_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_diglett_cave_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_diglett_cave_night_NSCR_lz + } + }, + .unused3C = 17 + }, + { + //Rock Tunnel + .mapId = MAP_D05R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_rock_tunnel_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_rock_tunnel_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_rock_tunnel_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_rock_tunnel_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_rock_tunnel_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_rock_tunnel_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_rock_tunnel_night_NSCR_lz + } + }, + .unused3C = 18 + }, + { + //Mt Moon + .mapId = MAP_D02R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_mt_moon_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_moon_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_moon_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_moon_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_moon_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_moon_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_moon_evening_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_moon_evening_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_moon_evening_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_moon_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_moon_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_moon_night_NSCR_lz + } + }, + .unused3C = 20 + }, + { + //Seafoam Islands + .mapId = MAP_D11R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_seafoam_islands_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_seafoam_islands_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_seafoam_islands_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_seafoam_islands_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_seafoam_islands_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_seafoam_islands_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_seafoam_islands_night_NSCR_lz + } + }, + .unused3C = 21 + }, + { + //Mt Silver + .mapId = MAP_D41R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_mt_silver_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_silver_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_silver_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_silver_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_mt_silver_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_mt_silver_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_mt_silver_night_NSCR_lz + } + }, + .unused3C = 22 + }, + { + //Cerulean Cave + .mapId = MAP_D03R0101, + .unused4 = 0, + .files = { + { + .palNo = NARC_preview_graphic_preview_graphic_cerulean_cave_morning_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_cerulean_cave_morning_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_cerulean_cave_morning_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_cerulean_cave_day_NSCR_lz + }, + { + .palNo = NARC_preview_graphic_preview_graphic_cerulean_cave_night_NCLR, + .charNo = NARC_preview_graphic_preview_graphic_cerulean_cave_night_NCGR_lz, + .scrnNo = NARC_preview_graphic_preview_graphic_cerulean_cave_night_NSCR_lz + } + }, + .unused3C = 23 + } +}; + +static BOOL Task_MapPreviewGraphic_ShowImage(TaskManager *man); +static void MapPreviewGraphic_LoadGfx(UnkStruct_0206A388 *unk); +static void MapPreviewGraphic_InitWindow(UnkStruct_0206A388 *unk); +static int sub_0206A694(UnkStruct_0206A388 *unk, FieldSystem *fsys); + +u8 MapPreviewGraphic_GetIndex(u32 mapId) { + u8 ret = -1; + for (int i = 0; i < (int) NELEMS(sMapPreviewGraphicData); i++) { + if (sMapPreviewGraphicData[i].mapId == mapId) { + ret = i; + break; + } + } + return ret; +} + +void MapPreviewGraphic_BeginShowImage(TaskManager *man, int index, u8 time, int a3) { + FieldSystem *fsys = TaskManager_GetFieldSystem(man); + UnkStruct_0206A388 *unk = AllocFromHeapAtEnd(HEAP_ID_4, sizeof(UnkStruct_0206A388)); + + unk->state = 0; + unk->displayTimer = 0; + unk->bgConfig = FieldSystem_GetBgConfigPtr(fsys); + unk->fadeOutTimer = 0; + unk->unk1A = 0; + unk->index = index; + + switch (time) { + case RTC_TIMEOFDAY_MORN: + unk->timeIndex = 0; + break; + case RTC_TIMEOFDAY_DAY: + unk->timeIndex = 1; + break; + case RTC_TIMEOFDAY_EVE: + unk->timeIndex = 2; + break; + case RTC_TIMEOFDAY_NITE: + case RTC_TIMEOFDAY_LATE: + unk->timeIndex = 3; + break; + default: + GF_ASSERT(FALSE); + unk->timeIndex = 0; + break; + } + + unk->heapId = HEAP_ID_4; + unk->unk30 = a3; + unk->unk34.state = 0; + unk->unk34.unk2 = 0; + + TaskManager_Call(man, Task_MapPreviewGraphic_ShowImage, unk); +} + +typedef enum PreviewGraphicState { + PG_STATE_INIT, + PG_STATE_FADE_IN, + PG_STATE_WAIT_OR_SKIP, + PG_STATE_FADE_OUT +} PreviewGraphicState; + +static BOOL Task_MapPreviewGraphic_ShowImage(TaskManager *man) { + FieldSystem *fsys = TaskManager_GetFieldSystem(man); + UnkStruct_0206A388 *unk = TaskManager_GetEnvironment(man); + + switch (unk->state) { + case PG_STATE_INIT: + unk->bgColorMode = GetBgColorMode(unk->bgConfig, 2); + unk->bg2Priority = GetBgPriority(unk->bgConfig, GF_BG_LYR_MAIN_2); + unk->bg0Priority = GetBgPriority(unk->bgConfig, GF_BG_LYR_MAIN_0); + unk->bg1Priority = GetBgPriority(unk->bgConfig, GF_BG_LYR_MAIN_1); + unk->bg3Priority = GetBgPriority(unk->bgConfig, GF_BG_LYR_MAIN_3); + SetBgControlParam(unk->bgConfig, 2, GF_BG_CNT_SET_COLOR_MODE, 1); + SetBgPriority(GF_BG_LYR_MAIN_3, 0); + SetBgPriority(GF_BG_LYR_MAIN_2, 1); + SetBgPriority(GF_BG_LYR_MAIN_0, 2); + MapPreviewGraphic_LoadGfx(unk); + MapPreviewGraphic_InitWindow(unk); + G2_SetBlendAlpha(4, 33, 16, 0); + BeginNormalPaletteFade(0, 1, 1, RGB_BLACK, 16, 1, unk->heapId); + unk->state++; + break; + case PG_STATE_FADE_IN: + if (IsPaletteFadeFinished()) { + unk->state++; + } + break; + case PG_STATE_WAIT_OR_SKIP: + if (gSystem.newKeys & PAD_BUTTON_A) { + unk->fadeOutTimer = 0; + unk->state++; + break; + } + if (++unk->displayTimer > 60) { + unk->fadeOutTimer = 0; + unk->state++; + } + break; + case PG_STATE_FADE_OUT: + if (unk->fadeOutTimer < 16) { + if (++unk->unk1A >= 2) { + unk->unk1A = 0; + unk->fadeOutTimer++; + } + reg_G2_BLDALPHA = (16 - unk->fadeOutTimer) | (unk->fadeOutTimer << 8); + } + if (sub_0206A694(unk, fsys) && unk->fadeOutTimer >= 16) { + ToggleBgLayer(2, GF_PLANE_TOGGLE_OFF); + SetBgControlParam(unk->bgConfig, 2, GF_BG_CNT_SET_COLOR_MODE, unk->bgColorMode); + SetBgPriority(GF_BG_LYR_MAIN_2, (u8) unk->bg2Priority); + SetBgPriority(GF_BG_LYR_MAIN_0, (u8) unk->bg0Priority); + SetBgPriority(GF_BG_LYR_MAIN_1, (u8) unk->bg1Priority); + SetBgPriority(GF_BG_LYR_MAIN_3, (u8) unk->bg3Priority); + reg_G2_BLDCNT = 0; + BG_ClearCharDataRange(2, 0x20, 0, unk->heapId); + BgClearTilemapBufferAndCommit(unk->bgConfig, 2); + WindowArray_Delete(unk->window, 1); + FreeToHeap(unk); + return TRUE; + } + break; + } + return FALSE; +} + +static void MapPreviewGraphic_LoadGfx(UnkStruct_0206A388 *unk) { + GfGfxLoader_GXLoadPal(NARC_a_1_5_0, sMapPreviewGraphicData[unk->index].files[unk->timeIndex].palNo, GF_PAL_LOCATION_MAIN_BG, GF_PAL_SLOT_0_OFFSET, 0x160, unk->heapId); + GfGfxLoader_LoadCharData(NARC_a_1_5_0, sMapPreviewGraphicData[unk->index].files[unk->timeIndex].charNo, unk->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, 1, unk->heapId); + GfGfxLoader_LoadScrnData(NARC_a_1_5_0, sMapPreviewGraphicData[unk->index].files[unk->timeIndex].scrnNo, unk->bgConfig, GF_BG_LYR_MAIN_2, 0, 0, 1, unk->heapId); +} + +static void MapPreviewGraphic_InitWindow(UnkStruct_0206A388 *unk) { + unk->window = AllocWindows(unk->heapId, 1); + AddWindowParameterized(unk->bgConfig, unk->window, 2, 0, 0, 28, 2, 13, 0x2C0); +} + +static int sub_0206A694(UnkStruct_0206A388 *unk, FieldSystem *fsys) { + LocalMapObject *player; + + if (!unk->unk30) { + return TRUE; + } + + UnkStateMachineSubstruct_0206A388 *unkSub = &unk->unk34; //required to match + + switch (unk->unk34.state) { + case 0: + PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fsys->playerAvatar, FALSE); + unkSub->state++; + break; + case 1: + VecFx32 pos; + player = PlayerAvatar_GetMapObject(fsys->playerAvatar); + unkSub->unk2++; + MapObject_GetPositionVec(player, &pos); + pos.y -= 2 * FX32_ONE; + MapObject_SetPositionVec(player, &pos); + if (unkSub->unk2 >= 16) { + PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(fsys->playerAvatar, TRUE); + unkSub->state++; + } + break; + case 2: + Field_PlayerAvatar_OrrTransitionFlags(fsys->playerAvatar, PLAYER_TRANSITION_WALKING); + Field_PlayerAvatar_ApplyTransitionFlags(fsys->playerAvatar); + unkSub->state++; + break; + case 3: + player = PlayerAvatar_GetMapObject(fsys->playerAvatar); + if (MapObject_AreBitsSetForMovementScriptInit(player)) { + MapObject_SetHeldMovement(player, MOVEMENT_FACE_DOWN); + unkSub->state++; + } + break; + case 4: + player = PlayerAvatar_GetMapObject(fsys->playerAvatar); + if (MapObject_AreBitsSetForMovementScriptInit(player)) { + if (FollowMon_IsActive(fsys)) { + ov01_02205790(fsys, 1); + sub_0205FC94(FollowMon_GetMapObject(fsys), MOVEMENT_WALK_UNK_48); + sub_02069DC8(FollowMon_GetMapObject(fsys), TRUE); + } + unkSub->state++; + } + break; + case 5: + return TRUE; + } + + return FALSE; +} diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 7532f690e..a7caf1cb4 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -100,6 +100,7 @@ #include "constants/phone_contacts.h" #include "constants/trainers.h" #include "render_window.h" +#include "overlay_01_021F1AFC.h" FS_EXTERN_OVERLAY(OVY_26); FS_EXTERN_OVERLAY(npc_trade); diff --git a/src/unk_02055BF0.c b/src/unk_02055BF0.c index df9bf94ec..643c811bb 100644 --- a/src/unk_02055BF0.c +++ b/src/unk_02055BF0.c @@ -13,7 +13,7 @@ #include "unk_02054E00.h" #include "unk_020552A4.h" #include "camera.h" -#include "unk_0206A360.h" +#include "map_preview_graphic.h" #include "unk_02005D10.h" #include "unk_02062108.h" #include "unk_02054648.h" @@ -23,6 +23,7 @@ #include "overlay_01_021FB4C0.h" #include "overlay_01_022053EC.h" #include "overlay_01_021F4704.h" +#include "overlay_01_021F1AFC.h" #include "unk_02055244.h" #include "constants/sndseq.h" @@ -191,14 +192,14 @@ BOOL sub_02055DBC(TaskManager *man) { if(GF_SndGetFadeTimer() == 0) { sub_02055110(fieldSystem, env->location.mapId, 1); if(!MapHeader_IsCave(env->destinationMapID)) { //this has gotta be for the pre-entering images right? - int index = sub_0206A360(env->location.mapId); //this gets the index of the location in the list of maps that have map icons + int index = MapPreviewGraphic_GetIndex(env->location.mapId); //this gets the index of the location in the list of maps that have map icons if (index != 255) { int parity = 0; if (env->transitionNo == 8) { parity = 1; } TIMEOFDAY time = GF_RTC_GetTimeOfDay(); - sub_0206A388(man, index, time, parity); //this should set the specific map icon based on time? + MapPreviewGraphic_BeginShowImage(man, index, time, parity); //this should set the specific map icon based on time? env->state++; ov01_021EFAF8(fieldSystem); //<= this func specifically gets and displays the area's icon and text break;