Merge remote-tracking branch 'origin/master' into intro_movie

.gitignore

@@ -31,6 +31,7 @@ build-cmake-*
 *.4bpp
 *.lz
 *.gbapal
+*.NCLR
 
 # For asmdiff
 */baserom.*

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

asm/include/unk_0206A360.inc

@@ -1,42 +0,0 @@
-#include <nitro/fs/overlay.h>
-#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

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

asm/unk_0206A360.s

@@ -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

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
 

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

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

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

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!

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

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

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 

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 

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

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

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)

files/fielddata/graphic/preview_graphic/preview_graphic/.gitignore

@@ -0,0 +1 @@
+*.NCGR

files/fielddata/graphic/preview_graphic/preview_graphic/.knarcignore

@@ -0,0 +1,3 @@
+*.png
+*.NCGR
+*.NSCR

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