Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-02 19:13:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

field_move.c, 1

Browse Source
This commit is contained in:
PikalaxALT 2022-03-25 16:21:14 -04:00
parent 950c456c92
commit a1f71d3d9b
117 changed files with 591 additions and 656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/field_map_object.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

527
asm/field_move.s → asm/field_move_s.s
View File

@ -7,403 +7,14 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"
.text
; a0: 0 = use, 1 = check
; a1: menu idx
thumb_func_start PartyMenu_GetFieldMoveFunc
PartyMenu_GetFieldMoveFunc: ; 0x02067DF4
cmp r0, #0
bne _02067E00
ldr r0, _02067E08 ; =_020FE7BC
lsl r1, r1, #3
ldr r0, [r0, r1]
bx lr
_02067E00:
ldr r0, _02067E0C ; =_020FE7BC + 4
lsl r1, r1, #3
ldr r0, [r0, r1]
bx lr
.balign 4, 0
_02067E08: .word _020FE7BC
_02067E0C: .word _020FE7BC + 4
thumb_func_end PartyMenu_GetFieldMoveFunc
thumb_func_start sub_02067E10
sub_02067E10: ; 0x02067E10
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r5, r0, #0
add r4, r1, #0
str r5, [r4, #4]
ldr r1, [r5, #0x20]
ldr r1, [r1]
str r1, [r4]
mov r1, #0
strh r1, [r4, #0xc]
add r1, sp, #8
bl Fsys_GetFacingObject
ldr r0, [sp, #8]
str r0, [r4, #8]
ldr r0, [sp, #8]
cmp r0, #0
beq _02067E62
bl MapObject_GetGfxID
cmp r0, #0x54
beq _02067E46
cmp r0, #0x55
beq _02067E50
cmp r0, #0x56
beq _02067E5A
b _02067E62
_02067E46:
ldrh r1, [r4, #0xc]
mov r0, #8
orr r0, r1
strh r0, [r4, #0xc]
b _02067E62
_02067E50:
ldrh r1, [r4, #0xc]
mov r0, #0x10
orr r0, r1
strh r0, [r4, #0xc]
b _02067E62
_02067E5A:
ldrh r1, [r4, #0xc]
mov r0, #1
orr r0, r1
strh r0, [r4, #0xc]
_02067E62:
ldr r0, [r5, #0x40]
bl GetPlayerXCoord
str r0, [sp, #4]
ldr r0, [r5, #0x40]
bl GetPlayerYCoord
add r2, r0, #0
ldr r1, [sp, #4]
str r2, [sp]
add r0, r5, #0
bl GetMetatileBehaviorAt
add r7, r0, #0
ldr r0, [r5, #0x40]
add r1, sp, #4
add r2, sp, #0
bl sub_0205E02C
ldr r1, [sp, #4]
ldr r2, [sp]
add r0, r5, #0
bl GetMetatileBehaviorAt
add r6, r0, #0
ldr r0, [r5, #0x40]
add r1, r7, #0
add r2, r6, #0
bl ov01_021F20C0
cmp r0, #0
beq _02067EAA
ldrh r1, [r4, #0xc]
mov r0, #4
orr r0, r1
strh r0, [r4, #0xc]
_02067EAA:
ldr r0, [r5, #0x40]
bl PlayerAvatar_GetFacingDirection
add r1, r0, #0
add r0, r6, #0
bl ov01_021F25E8
cmp r0, #0
beq _02067EC4
ldrh r1, [r4, #0xc]
mov r0, #0x40
orr r0, r1
strh r0, [r4, #0xc]
_02067EC4:
lsl r0, r6, #0x18
lsr r0, r0, #0x18
bl sub_0205B8DC
cmp r0, #0
beq _02067ED8
ldrh r1, [r4, #0xc]
mov r0, #0x20
orr r0, r1
strh r0, [r4, #0xc]
_02067ED8:
lsl r0, r6, #0x18
lsr r0, r0, #0x18
bl sub_0205B8E8
cmp r0, #0
beq _02067EEE
ldrh r1, [r4, #0xc]
mov r0, #1
lsl r0, r0, #0xc
orr r0, r1
strh r0, [r4, #0xc]
_02067EEE:
ldr r0, [r5, #0xc]
bl Save_FlyPoints_get
bl FlyPoints_GetWeatherType
cmp r0, #0xb
bne _02067F04
ldrh r1, [r4, #0xc]
mov r0, #0x80
orr r0, r1
strh r0, [r4, #0xc]
_02067F04:
lsl r0, r6, #0x18
lsr r0, r0, #0x18
bl sub_0205BAF8
cmp r0, #0
bne _02067F1A
add r0, r5, #0
bl ov01_021E7FA8
cmp r0, #0
beq _02067F24
_02067F1A:
ldrh r1, [r4, #0xc]
mov r0, #2
lsl r0, r0, #0xc
orr r0, r1
strh r0, [r4, #0xc]
_02067F24:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
thumb_func_end sub_02067E10
thumb_func_start PartyMenuEnv_create
PartyMenuEnv_create: ; 0x02067F28
push {r3, r4, r5, lr}
add r5, r0, #0
add r4, r1, #0
mov r0, #0x20
mov r1, #0x10
bl AllocFromHeap
ldr r1, _02067F48 ; =0x19740205
str r1, [r0]
ldr r1, [r4, #8]
str r1, [r0, #4]
ldr r2, [r5]
ldr r1, [r5, #4]
str r2, [r0, #8]
str r1, [r0, #0xc]
pop {r3, r4, r5, pc}
.balign 4, 0
_02067F48: .word 0x19740205
thumb_func_end PartyMenuEnv_create
thumb_func_start PartyMenuEnv_delete
PartyMenuEnv_delete: ; 0x02067F4C
push {r4, lr}
add r4, r0, #0
ldr r1, [r4]
ldr r0, _02067F64 ; =0x19740205
cmp r1, r0
beq _02067F5C
bl GF_AssertFail
_02067F5C:
add r0, r4, #0
bl FreeToHeap
pop {r4, pc}
.balign 4, 0
_02067F64: .word 0x19740205
thumb_func_end PartyMenuEnv_delete
thumb_func_start FieldMoveMenuCheck_Cut
FieldMoveMenuCheck_Cut: ; 0x02067F68
push {r4, lr}
add r4, r0, #0
ldr r1, [r4, #4]
ldr r0, [r1, #0x70]
sub r0, r0, #2
cmp r0, #1
bhi _02067F7A
mov r0, #PARTY_MENU_RESPONSE_NOT_HERE
pop {r4, pc}
_02067F7A:
ldr r0, [r1, #0xc]
bl Sav2_PlayerData_GetProfileAddr
mov r1, #1
bl PlayerProfile_TestBadgeFlag
cmp r0, #0
bne _02067F8E
mov r0, #PARTY_MENU_RESPONSE_NEED_BADGE
pop {r4, pc}
_02067F8E:
ldrh r1, [r4, #0xc]
mov r0, #1
tst r1, r0
beq _02067F98
mov r0, #PARTY_MENU_RESPONSE_OK
; else: PARTY_MENU_RESPONSE_NOT_HERE
_02067F98:
pop {r4, pc}
.balign 4, 0
thumb_func_end FieldMoveMenuCheck_Cut
thumb_func_start FieldMoveMenuUse_Cut
FieldMoveMenuUse_Cut: ; 0x02067F9C
push {r4, r5, r6, lr}
add r5, r0, #0
ldr r0, [r5]
add r6, r1, #0
bl TaskManager_GetEnv
add r4, r0, #0
add r0, r5, #0
add r1, r6, #0
bl PartyMenuEnv_create
add r5, r0, #0
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02067FCC ; =sub_02067FD0
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
str r5, [r4, r0]
mov r0, #0xc
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02067FCC: .word sub_02067FD0
thumb_func_end FieldMoveMenuUse_Cut
thumb_func_start sub_02067FD0
sub_02067FD0: ; 0x02067FD0
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
bl TaskManager_GetEnv
add r4, r0, #0
add r0, r5, #0
bl TaskManager_GetSys
add r6, r0, #0
ldr r1, _02068008 ; =std_menu_cut
ldr r2, [r4, #4]
add r0, r5, #0
bl StartScriptFromMenu
mov r2, #0
str r2, [sp]
ldrh r1, [r4, #0xc]
add r0, r6, #0
add r3, r2, #0
bl FieldMoveArgsSet
add r0, r4, #0
bl PartyMenuEnv_delete
mov r0, #0
add sp, #4
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_02068008: .word std_menu_cut
thumb_func_end sub_02067FD0
thumb_func_start FieldMoveMenuCheck_Fly
FieldMoveMenuCheck_Fly: ; 0x0206800C
push {r4, lr}
add r4, r0, #0
ldr r1, [r4, #4]
ldr r0, [r1, #0x70]
sub r0, r0, #2
cmp r0, #1
bhi _0206801E
mov r0, #PARTY_MENU_RESPONSE_NOT_HERE
pop {r4, pc}
_0206801E:
ldr r0, [r1, #0xc]
bl Sav2_PlayerData_GetProfileAddr
mov r1, #4
bl PlayerProfile_TestBadgeFlag
cmp r0, #0
bne _02068032
mov r0, #PARTY_MENU_RESPONSE_NEED_BADGE
pop {r4, pc}
_02068032:
ldr r0, [r4]
bl MapHeader_IsFlyAllowed
cmp r0, #0
bne _02068040
mov r0, #PARTY_MENU_RESPONSE_NOT_HERE
pop {r4, pc}
_02068040:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl ScriptState_CheckHaveFollower
cmp r0, #1
bne _02068054
mov r0, #PARTY_MENU_RESPONSE_HAVE_FOLLOWER
pop {r4, pc}
_02068054:
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl ScriptState_CheckRocketCostumeFlag
cmp r0, #1
bne _02068068
mov r0, #PARTY_MENU_RESPONSE_NOT_NOW
pop {r4, pc}
_02068068:
; static inline
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl ScriptState_CheckSafariSysFlag
cmp r0, #1
beq _02068088
ldr r0, [r4, #4]
ldr r0, [r0, #0xc]
bl SavArray_Flags_get
bl ScriptState_CheckPalParkSysFlag
cmp r0, #1
bne _0206808C
_02068088:
mov r0, #1
b _0206808E
_0206808C:
mov r0, #0
_0206808E:
cmp r0, #1
bne _02068096
mov r0, #PARTY_MENU_RESPONSE_NOT_HERE
pop {r4, pc}
_02068096:
mov r0, #PARTY_MENU_RESPONSE_OK
pop {r4, pc}
.balign 4, 0
thumb_func_end FieldMoveMenuCheck_Fly
thumb_func_start FieldMoveMenuUse_Fly
FieldMoveMenuUse_Fly: ; 0x0206809C
push {r4, r5, r6, lr}
add r5, r0, #0
ldr r0, [r5]
bl TaskManager_GetSys
add r6, r0, #0
ldr r0, [r5]
bl TaskManager_GetEnv
add r4, r0, #0
mov r0, #0xb
mov r1, #4
bl AllocFromHeap
ldrh r1, [r5, #4]
str r1, [r0]
mov r1, #0xe1
lsl r1, r1, #2
str r0, [r4, r1]
add r0, r6, #0
mov r1, #0
bl TownMap_new
mov r1, #0xe
lsl r1, r1, #6
str r0, [r4, r1]
ldr r1, _020680DC ; =sub_0203D758
add r0, r4, #0
bl sub_0203C8F0
pop {r4, r5, r6, pc}
nop
_020680DC: .word sub_0203D758
thumb_func_end FieldMoveMenuUse_Fly
.public PartyMenuEnv_create
.public PartyMenuEnv_delete
thumb_func_start FieldMoveMenuCheck_Surf
FieldMoveMenuCheck_Surf: ; 0x020680E0
@ -479,7 +90,7 @@ FieldMoveMenuUse_Surf: ; 0x02068150
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068180 ; =sub_02068184
ldr r1, _02068180 ; =Task_UseSurfInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -488,11 +99,11 @@ FieldMoveMenuUse_Surf: ; 0x02068150
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068180: .word sub_02068184
_02068180: .word Task_UseSurfInField
thumb_func_end FieldMoveMenuUse_Surf
thumb_func_start sub_02068184
sub_02068184: ; 0x02068184
thumb_func_start Task_UseSurfInField
Task_UseSurfInField: ; 0x02068184
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -518,7 +129,7 @@ sub_02068184: ; 0x02068184
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_020681BC: .word std_menu_surf
thumb_func_end sub_02068184
thumb_func_end Task_UseSurfInField
thumb_func_start FieldMoveMenuCheck_Strength
FieldMoveMenuCheck_Strength: ; 0x020681C0
@ -573,7 +184,7 @@ FieldMoveMenuUse_Strength: ; 0x02068200
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068230 ; =sub_02068234
ldr r1, _02068230 ; =Task_UseStrengthInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -582,11 +193,11 @@ FieldMoveMenuUse_Strength: ; 0x02068200
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068230: .word sub_02068234
_02068230: .word Task_UseStrengthInField
thumb_func_end FieldMoveMenuUse_Strength
thumb_func_start sub_02068234
sub_02068234: ; 0x02068234
thumb_func_start Task_UseStrengthInField
Task_UseStrengthInField: ; 0x02068234
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -612,7 +223,7 @@ sub_02068234: ; 0x02068234
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_0206826C: .word std_menu_strength
thumb_func_end sub_02068234
thumb_func_end Task_UseStrengthInField
thumb_func_start FieldMoveMenuCheck_RockSmash
FieldMoveMenuCheck_RockSmash: ; 0x02068270
@ -662,7 +273,7 @@ FieldMoveMenuUse_RockSmash: ; 0x020682A8
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _020682D8 ; =sub_020682DC
ldr r1, _020682D8 ; =Task_UseRockSmashInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -671,11 +282,11 @@ FieldMoveMenuUse_RockSmash: ; 0x020682A8
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_020682D8: .word sub_020682DC
_020682D8: .word Task_UseRockSmashInField
thumb_func_end FieldMoveMenuUse_RockSmash
thumb_func_start sub_020682DC
sub_020682DC: ; 0x020682DC
thumb_func_start Task_UseRockSmashInField
Task_UseRockSmashInField: ; 0x020682DC
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -701,7 +312,7 @@ sub_020682DC: ; 0x020682DC
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_02068314: .word std_menu_rock_smash
thumb_func_end sub_020682DC
thumb_func_end Task_UseRockSmashInField
thumb_func_start FieldMoveMenuCheck_Waterfall
FieldMoveMenuCheck_Waterfall: ; 0x02068318
@ -759,7 +370,7 @@ FieldMoveMenuUse_Waterfall: ; 0x02068360
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068390 ; =sub_02068394
ldr r1, _02068390 ; =Task_UseWaterfallInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -768,11 +379,11 @@ FieldMoveMenuUse_Waterfall: ; 0x02068360
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068390: .word sub_02068394
_02068390: .word Task_UseWaterfallInField
thumb_func_end FieldMoveMenuUse_Waterfall
thumb_func_start sub_02068394
sub_02068394: ; 0x02068394
thumb_func_start Task_UseWaterfallInField
Task_UseWaterfallInField: ; 0x02068394
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -798,7 +409,7 @@ sub_02068394: ; 0x02068394
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_020683CC: .word std_menu_waterfall
thumb_func_end sub_02068394
thumb_func_end Task_UseWaterfallInField
thumb_func_start FieldMoveMenuCheck_RockClimb
FieldMoveMenuCheck_RockClimb: ; 0x020683D0
@ -866,7 +477,7 @@ FieldMoveMenuUse_RockClimb: ; 0x02068430
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068460 ; =sub_02068464
ldr r1, _02068460 ; =Task_UseRockClimbInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -875,11 +486,11 @@ FieldMoveMenuUse_RockClimb: ; 0x02068430
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068460: .word sub_02068464
_02068460: .word Task_UseRockClimbInField
thumb_func_end FieldMoveMenuUse_RockClimb
thumb_func_start sub_02068464
sub_02068464: ; 0x02068464
thumb_func_start Task_UseRockClimbInField
Task_UseRockClimbInField: ; 0x02068464
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -905,7 +516,7 @@ sub_02068464: ; 0x02068464
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_0206849C: .word std_menu_rock_climb
thumb_func_end sub_02068464
thumb_func_end Task_UseRockClimbInField
thumb_func_start FieldMoveMenuCheck_Flash
FieldMoveMenuCheck_Flash: ; 0x020684A0
@ -952,7 +563,7 @@ FieldMoveMenuUse_Flash: ; 0x020684D0
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068500 ; =sub_02068504
ldr r1, _02068500 ; =Task_UseFlashInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -961,11 +572,11 @@ FieldMoveMenuUse_Flash: ; 0x020684D0
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068500: .word sub_02068504
_02068500: .word Task_UseFlashInField
thumb_func_end FieldMoveMenuUse_Flash
thumb_func_start sub_02068504
sub_02068504: ; 0x02068504
thumb_func_start Task_UseFlashInField
Task_UseFlashInField: ; 0x02068504
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -1001,7 +612,7 @@ _02068536:
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_02068550: .word std_menu_flash
thumb_func_end sub_02068504
thumb_func_end Task_UseFlashInField
thumb_func_start FieldMoveMenuCheck_Teleport
FieldMoveMenuCheck_Teleport: ; 0x02068554
@ -1094,7 +705,7 @@ FieldMoveMenuUse_Teleport: ; 0x020685D0
ldrh r1, [r5, #4]
str r1, [r0]
mov r0, #0xd5
ldr r1, _0206861C ; =sub_02068620
ldr r1, _0206861C ; =Task_UseTeleportInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1103,11 +714,11 @@ FieldMoveMenuUse_Teleport: ; 0x020685D0
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
nop
_0206861C: .word sub_02068620
_0206861C: .word Task_UseTeleportInField
thumb_func_end FieldMoveMenuUse_Teleport
thumb_func_start sub_02068620
sub_02068620: ; 0x02068620
thumb_func_start Task_UseTeleportInField
Task_UseTeleportInField: ; 0x02068620
push {r4, r5, r6, lr}
add r5, r0, #0
bl TaskManager_GetSys
@ -1136,7 +747,7 @@ sub_02068620: ; 0x02068620
pop {r4, r5, r6, pc}
.balign 4, 0
_02068660: .word ov02_0224C558
thumb_func_end sub_02068620
thumb_func_end Task_UseTeleportInField
thumb_func_start FieldMoveMenuCheck_Dig
FieldMoveMenuCheck_Dig: ; 0x02068664
@ -1211,7 +822,7 @@ FieldMoveMenuUse_Dig: ; 0x020686BC
ldrh r1, [r5, #4]
str r1, [r0]
mov r0, #0xd5
ldr r1, _02068708 ; =sub_0206870C
ldr r1, _02068708 ; =Task_UseDigInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1220,11 +831,11 @@ FieldMoveMenuUse_Dig: ; 0x020686BC
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
nop
_02068708: .word sub_0206870C
_02068708: .word Task_UseDigInField
thumb_func_end FieldMoveMenuUse_Dig
thumb_func_start sub_0206870C
sub_0206870C: ; 0x0206870C
thumb_func_start Task_UseDigInField
Task_UseDigInField: ; 0x0206870C
push {r4, r5, r6, lr}
add r5, r0, #0
bl TaskManager_GetSys
@ -1253,7 +864,7 @@ sub_0206870C: ; 0x0206870C
pop {r4, r5, r6, pc}
.balign 4, 0
_0206874C: .word ov02_0224C3AC
thumb_func_end sub_0206870C
thumb_func_end Task_UseDigInField
thumb_func_start FieldMoveMenuCheck_SweetScent
FieldMoveMenuCheck_SweetScent: ; 0x02068750
@ -1311,7 +922,7 @@ FieldMoveMenuUse_SweetScent: ; 0x02068780
add r0, r7, #0
bl sub_020505C0
mov r0, #0xd5
ldr r1, _020687CC ; =ov01_021FCE98
ldr r1, _020687CC ; =Task_UseSweetScentInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1320,7 +931,7 @@ FieldMoveMenuUse_SweetScent: ; 0x02068780
strh r0, [r4, #0x26]
pop {r3, r4, r5, r6, r7, pc}
nop
_020687CC: .word ov01_021FCE98
_020687CC: .word Task_UseSweetScentInField
thumb_func_end FieldMoveMenuUse_SweetScent
thumb_func_start FieldMoveMenuCheck_Chatter
@ -1356,7 +967,7 @@ FieldMoveMenuUse_Chatter: ; 0x020687E4
add r0, r7, #0
bl sub_020505C0
mov r0, #0xd5
ldr r1, _0206881C ; =sub_02068820
ldr r1, _0206881C ; =Task_UseChatterInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1365,11 +976,11 @@ FieldMoveMenuUse_Chatter: ; 0x020687E4
strh r0, [r4, #0x26]
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
_0206881C: .word sub_02068820
_0206881C: .word Task_UseChatterInField
thumb_func_end FieldMoveMenuUse_Chatter
thumb_func_start sub_02068820
sub_02068820: ; 0x02068820
thumb_func_start Task_UseChatterInField
Task_UseChatterInField: ; 0x02068820
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -1395,7 +1006,7 @@ sub_02068820: ; 0x02068820
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_02068858: .word std_menu_chatter
thumb_func_end sub_02068820
thumb_func_end Task_UseChatterInField
thumb_func_start FieldMoveMenuCheck_Whirlpool
FieldMoveMenuCheck_Whirlpool: ; 0x0206885C
@ -1453,7 +1064,7 @@ FieldMoveMenuUse_Whirlpool: ; 0x020688A4
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _020688D4 ; =sub_020688D8
ldr r1, _020688D4 ; =Task_UseWhirlpoolInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1462,11 +1073,11 @@ FieldMoveMenuUse_Whirlpool: ; 0x020688A4
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_020688D4: .word sub_020688D8
_020688D4: .word Task_UseWhirlpoolInField
thumb_func_end FieldMoveMenuUse_Whirlpool
thumb_func_start sub_020688D8
sub_020688D8: ; 0x020688D8
thumb_func_start Task_UseWhirlpoolInField
Task_UseWhirlpoolInField: ; 0x020688D8
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -1492,7 +1103,7 @@ sub_020688D8: ; 0x020688D8
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_02068910: .word std_menu_whirlpool
thumb_func_end sub_020688D8
thumb_func_end Task_UseWhirlpoolInField
thumb_func_start FieldMoveMenuCheck_Headbutt
FieldMoveMenuCheck_Headbutt: ; 0x02068914
@ -1531,7 +1142,7 @@ FieldMoveMenuUse_Headbutt: ; 0x02068934
ldr r0, [r6, #4]
bl sub_020505C0
mov r0, #0xd5
ldr r1, _02068964 ; =sub_02068968
ldr r1, _02068964 ; =Task_UseHeadbuttInField
lsl r0, r0, #2
str r1, [r4, r0]
add r0, #0x2c
@ -1540,11 +1151,11 @@ FieldMoveMenuUse_Headbutt: ; 0x02068934
strh r0, [r4, #0x26]
pop {r4, r5, r6, pc}
.balign 4, 0
_02068964: .word sub_02068968
_02068964: .word Task_UseHeadbuttInField
thumb_func_end FieldMoveMenuUse_Headbutt
thumb_func_start sub_02068968
sub_02068968: ; 0x02068968
thumb_func_start Task_UseHeadbuttInField
Task_UseHeadbuttInField: ; 0x02068968
push {r3, r4, r5, r6, lr}
sub sp, #4
add r5, r0, #0
@ -1570,7 +1181,7 @@ sub_02068968: ; 0x02068968
pop {r3, r4, r5, r6, pc}
.balign 4, 0
_020689A0: .word std_menu_headbutt
thumb_func_end sub_02068968
thumb_func_end Task_UseHeadbuttInField
thumb_func_start sub_020689A4
sub_020689A4: ; 0x020689A4
@ -1590,21 +1201,3 @@ sub_020689A4: ; 0x020689A4
add r0, r4, #0
pop {r4, r5, r6, pc}
thumb_func_end sub_020689A4
.rodata
_020FE7BC:
.word FieldMoveMenuUse_Cut, FieldMoveMenuCheck_Cut
.word FieldMoveMenuUse_Fly, FieldMoveMenuCheck_Fly
.word FieldMoveMenuUse_Surf, FieldMoveMenuCheck_Surf
.word FieldMoveMenuUse_Strength, FieldMoveMenuCheck_Strength
.word FieldMoveMenuUse_RockSmash, FieldMoveMenuCheck_RockSmash
.word FieldMoveMenuUse_Waterfall, FieldMoveMenuCheck_Waterfall
.word FieldMoveMenuUse_RockClimb, FieldMoveMenuCheck_RockClimb
.word FieldMoveMenuUse_Flash, FieldMoveMenuCheck_Flash
.word FieldMoveMenuUse_Teleport, FieldMoveMenuCheck_Teleport
.word FieldMoveMenuUse_Dig, FieldMoveMenuCheck_Dig
.word FieldMoveMenuUse_SweetScent, FieldMoveMenuCheck_SweetScent
.word FieldMoveMenuUse_Chatter, FieldMoveMenuCheck_Chatter
.word FieldMoveMenuUse_Whirlpool, FieldMoveMenuCheck_Whirlpool
.word FieldMoveMenuUse_Headbutt, FieldMoveMenuCheck_Headbutt

2
asm/field_player_avatar.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

6
asm/overlay_01_021FCE98.s
View File

@ -13,8 +13,8 @@
.text
thumb_func_start ov01_021FCE98
ov01_021FCE98: ; 0x021FCE98
thumb_func_start Task_UseSweetScentInField
Task_UseSweetScentInField: ; 0x021FCE98
push {r3, r4, r5, r6, r7, lr}
str r0, [sp]
bl TaskManager_GetSys
@ -175,7 +175,7 @@ _021FCFDE:
nop
_021FCFE4: .word ov01_02205A60
_021FCFE8: .word Task_HoneyOrSweetScent
thumb_func_end ov01_021FCE98
thumb_func_end Task_UseSweetScentInField
thumb_func_start ov01_021FCFEC
ov01_021FCFEC: ; 0x021FCFEC

6
asm/unk_0203BC10.s
View File

@ -3446,8 +3446,8 @@ sub_0203D718: ; 0x0203D718
_0203D754: .word sub_0203CFC0
thumb_func_end sub_0203D718
thumb_func_start sub_0203D758
sub_0203D758: ; 0x0203D758
thumb_func_start Task_UseFlyInField
Task_UseFlyInField: ; 0x0203D758
push {r4, r5, r6, r7, lr}
sub sp, #0xc
add r4, r0, #0
@ -3533,7 +3533,7 @@ _0203D808:
nop
_0203D810: .word sub_0203CA9C
_0203D814: .word sub_02067C30
thumb_func_end sub_0203D758
thumb_func_end Task_UseFlyInField
thumb_func_start sub_0203D818
sub_0203D818: ; 0x0203D818

2
asm/unk_0205CB48.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0205FD20.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02061284.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02062108.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020632B0.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020648EC.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020658D4.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02066EDC.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0206793C.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02067A60.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020689C8.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02078834.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02078DD8.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02078E30.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0207CB7C.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0207EB24.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0207F42C.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02080BB4.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02082908.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020850F4.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02085604.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_020863F4.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02087284.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02087A78.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02087E70.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02087FD4.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208805C.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_02088288.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208B1AC.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208C3E4.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208DE40.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208E55C.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208E600.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208F658.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208F814.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_0208FB64.s
View File

@ -2,7 +2,7 @@
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/ribbon.h"
#include "party_menu.h"
#include "constants/party_menu.h"
#include "msgdata/msg/msg_0300.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_data_020FCBD8.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_data_020FD978.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
asm/unk_data_020FDB44.s
View File

@ -7,7 +7,7 @@
#include "constants/items.h"
#include "constants/std_script.h"
#include "fielddata/script/scr_seq/event_D24R0204.h"
#include "party_menu.h"
#include "constants/party_menu.h"
.include "asm/macros.inc"
.include "global.inc"

2
files/fielddata/script/scr_seq/scr_seq_0003.s
View File

@ -1062,7 +1062,7 @@ _0ED8:
npc_msg msg_0040_00044
call _0F89
call _0216
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0F49
npc_msg msg_0040_00045

2
files/fielddata/script/scr_seq/scr_seq_0005_D01R0101.s
View File

@ -19,7 +19,7 @@ _001F:
check_registered_phone_number PHONE_CONTACT_BROCK, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _009E
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _004D
goto _0102

8
files/fielddata/script/scr_seq/scr_seq_0015_D11R0106.s
View File

@ -24,7 +24,7 @@ scr_seq_D11R0106_009:
check_registered_phone_number PHONE_CONTACT_BLAINE, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _008A
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _0069
clearflag FLAG_UNK_2F5
@ -80,7 +80,7 @@ scr_seq_D11R0106_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 14, VAR_SPECIAL_RESULT
check_badge BADGE_VOLCANO, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _01B6
npc_msg msg_0053_D11R0106_00000
@ -89,7 +89,7 @@ scr_seq_D11R0106_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _01CC
give_badge 14
give_badge BADGE_VOLCANO
addvar VAR_UNK_4135, 1
setflag FLAG_UNK_265
setflag FLAG_HIDE_ROUTE_19_WORKMEN_CLOSED
@ -365,7 +365,7 @@ scr_seq_D11R0106_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 14, VAR_SPECIAL_RESULT
check_badge BADGE_VOLCANO, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _04B6
npc_msg msg_0053_D11R0106_00024

2
files/fielddata/script/scr_seq/scr_seq_0037_D24R0101.s
View File

@ -51,7 +51,7 @@ _00B3:
goto_if_ge _00C6
setvar VAR_SCENE_SINJOH_MYSTRI_ROOM, 1
_00C6:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _0104
get_weekday VAR_TEMP_x4000

2
files/fielddata/script/scr_seq/scr_seq_0048_D24R0211.s
View File

@ -18,7 +18,7 @@ scr_seq_D24R0211_003:
end
_0027:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _0065
get_weekday VAR_TEMP_x4000

2
files/fielddata/script/scr_seq/scr_seq_0054_D24R0217.s
View File

@ -17,7 +17,7 @@ scr_seq_D24R0217_002:
end
_0023:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _0061
get_weekday VAR_TEMP_x4001

2
files/fielddata/script/scr_seq/scr_seq_0059_D26R0101.s
View File

@ -16,7 +16,7 @@ scr_seq_D26R0101_002:
end
_001F:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _005D
get_weekday VAR_TEMP_x4000

2
files/fielddata/script/scr_seq/scr_seq_0092_D36R0101.s
View File

@ -37,7 +37,7 @@ scr_seq_D36R0101_000:
goto _00C3
_0077:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _00B5
get_weekday VAR_TEMP_x4000

2
files/fielddata/script/scr_seq/scr_seq_0112_D44R0103.s
View File

@ -150,7 +150,7 @@ _019C:
npc_msg msg_0130_D44R0103_00016
play_fanfare SEQ_ME_BADGE
wait_fanfare
give_badge 7
give_badge BADGE_RISING
npc_msg msg_0130_D44R0103_00017
apply_movement obj_D44R0103_chourou, _0408
apply_movement obj_player, _0418

12
files/fielddata/script/scr_seq/scr_seq_0146.s
View File

@ -33,7 +33,7 @@ scr_seq_0146_000:
get_party_slot_with_move VAR_SPECIAL_RESULT, MOVE_CUT
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _009E
check_badge 1, VAR_SPECIAL_RESULT
check_badge BADGE_HIVE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _009E
npc_msg msg_0211_00000
@ -180,7 +180,7 @@ scr_seq_0146_001:
copyvar VAR_SPECIAL_x8004, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _02D7
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _02D7
npc_msg msg_0211_00003
@ -342,7 +342,7 @@ _051C:
get_party_slot_with_move VAR_SPECIAL_RESULT, MOVE_STRENGTH
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _0564
check_badge 2, VAR_SPECIAL_RESULT
check_badge BADGE_PLAIN, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0564
npc_msg msg_0211_00007
@ -496,7 +496,7 @@ scr_seq_0146_003:
get_party_slot_with_move VAR_SPECIAL_RESULT, MOVE_ROCK_CLIMB
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _0797
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0797
check_escort_mode VAR_SPECIAL_RESULT
@ -661,7 +661,7 @@ scr_seq_0146_005:
get_party_slot_with_move VAR_SPECIAL_RESULT, MOVE_WATERFALL
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _0997
check_badge 7, VAR_SPECIAL_RESULT
check_badge BADGE_RISING, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0997
npc_msg msg_0211_00024
@ -706,7 +706,7 @@ scr_seq_0146_016:
get_party_slot_with_move VAR_SPECIAL_RESULT, MOVE_WHIRLPOOL
compare VAR_SPECIAL_RESULT, 6
goto_if_eq _0A34
check_badge 6, VAR_SPECIAL_RESULT
check_badge BADGE_GLACIER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0A34
npc_msg msg_0211_00029

2
files/fielddata/script/scr_seq/scr_seq_0153_P01R0102.s
View File

@ -33,7 +33,7 @@ _0054:
check_registered_phone_number PHONE_CONTACT_SABRINA, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _0097
check_badge 13, VAR_TEMP_x4000
check_badge BADGE_MARSH, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 1
goto_if_eq _0080
goto _00C1

2
files/fielddata/script/scr_seq/scr_seq_0157_P01R0302.s
View File

@ -43,7 +43,7 @@ _0050:
_005B:
goto_if_set FLAG_UNK_ABB, _0084
goto_if_set FLAG_UNK_092, _0084
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _008F
_0084:

2
files/fielddata/script/scr_seq/scr_seq_0191_R10.s
View File

@ -25,7 +25,7 @@ _002B:
end
scr_seq_R10_001:
check_badge 15, VAR_TEMP_x4004
check_badge BADGE_EARTH, VAR_TEMP_x4004
compare VAR_TEMP_x4004, 1
goto_if_eq _0052
goto _00BF

2
files/fielddata/script/scr_seq/scr_seq_0202_R14.s
View File

@ -287,7 +287,7 @@ _03D2:
clearflag FLAG_HIDE_ROUTE_14_EUSINE_2
setvar VAR_UNK_4086, 0
setflag FLAG_UNK_14D
check_badge 9, VAR_SPECIAL_RESULT
check_badge BADGE_CASCADE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_ne _0449
clearflag FLAG_HIDE_ROUTE_25_SUICUNE

2
files/fielddata/script/scr_seq/scr_seq_0213_R22R0101.s
View File

@ -35,7 +35,7 @@ _006B:
check_registered_phone_number PHONE_CONTACT_JANINE, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00DF
check_badge 12, VAR_TEMP_x4002
check_badge BADGE_SOUL, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 0
goto_if_ne _009D
goto _012C

2
files/fielddata/script/scr_seq/scr_seq_0216_R25.s
View File

@ -28,7 +28,7 @@ _003B:
clearflag FLAG_HIDE_ROUTE_25_EUSINE_2
setflag FLAG_HIDE_ROUTE_25_EUSINE
_0050:
check_badge 15, VAR_TEMP_x4000
check_badge BADGE_EARTH, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _011B
compare VAR_SCENE_ROUTE_25, 1

2
files/fielddata/script/scr_seq/scr_seq_0225_R29.s
View File

@ -18,7 +18,7 @@
scr_seq_R29_000:
get_friend_sprite VAR_OBJ_1
check_badge 0, VAR_TEMP_x4000
check_badge BADGE_ZEPHYR, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 1
goto_if_eq _0043
setflag FLAG_UNK_207

6
files/fielddata/script/scr_seq/scr_seq_0232_R32.s
View File

@ -23,7 +23,7 @@ scr_seq_R32_004:
end
_003B:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _0079
get_weekday VAR_TEMP_x4000
@ -165,7 +165,7 @@ scr_seq_R32_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _028C
goto_if_unset FLAG_UNK_070, _0297
@ -254,7 +254,7 @@ _0391:
scrcmd_603
scrcmd_602 1
scrcmd_604 48
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _03B9
npc_msg msg_0380_R32_00004

2
files/fielddata/script/scr_seq/scr_seq_0237_R34.s
View File

@ -36,7 +36,7 @@ _005D:
end
_006E:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _009F
get_weekday VAR_TEMP_x4000

8
files/fielddata/script/scr_seq/scr_seq_0743_T02GYM0101.s
View File

@ -43,7 +43,7 @@ scr_seq_T02GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0131
npc_msg msg_0454_T02GYM0101_00000
@ -52,7 +52,7 @@ scr_seq_T02GYM0101_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0147
give_badge 15
give_badge BADGE_EARTH
addvar VAR_UNK_4135, 1
setflag FLAG_UNK_998
add_special_game_stat 22
@ -106,7 +106,7 @@ scr_seq_T02GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0186
npc_msg msg_0454_T02GYM0101_00006
@ -341,7 +341,7 @@ scr_seq_T02GYM0101_004:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _04A7

10
files/fielddata/script/scr_seq/scr_seq_0752_T03GYM0101.s
View File

@ -18,7 +18,7 @@ scr_seq_T03GYM0101_003:
check_registered_phone_number PHONE_CONTACT_BROCK, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00A4
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _0053
goto _00F5
@ -85,7 +85,7 @@ scr_seq_T03GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 8, VAR_SPECIAL_RESULT
check_badge BADGE_BOULDER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0195
npc_msg msg_0462_T03GYM0101_00000
@ -94,7 +94,7 @@ scr_seq_T03GYM0101_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _01B8
give_badge 8
give_badge BADGE_BOULDER
addvar VAR_UNK_4135, 1
add_special_game_stat 22
settrainerflag TRAINER_CAMPER_JERRY
@ -136,7 +136,7 @@ scr_seq_T03GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 8, VAR_SPECIAL_RESULT
check_badge BADGE_BOULDER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _01E4
npc_msg msg_0462_T03GYM0101_00006
@ -156,7 +156,7 @@ scr_seq_T03GYM0101_002:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 8, VAR_SPECIAL_RESULT
check_badge BADGE_BOULDER, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _0216

12
files/fielddata/script/scr_seq/scr_seq_0760_T04GYM0101.s
View File

@ -19,7 +19,7 @@ scr_seq_T04GYM0101_007:
get_phone_book_rematch PHONE_CONTACT_MISTY, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 0
goto_if_ne _00ED
check_badge 15, VAR_TEMP_x4000
check_badge BADGE_EARTH, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _00E5
compare VAR_SCENE_ROUTE_25, 1
@ -198,7 +198,7 @@ scr_seq_T04GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 9, VAR_SPECIAL_RESULT
check_badge BADGE_CASCADE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0348
npc_msg msg_0469_T04GYM0101_00008
@ -207,7 +207,7 @@ scr_seq_T04GYM0101_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _035E
give_badge 9
give_badge BADGE_CASCADE
addvar VAR_UNK_4135, 1
add_special_game_stat 22
settrainerflag TRAINER_SWIMMER_F_DIANA
@ -266,7 +266,7 @@ scr_seq_T04GYM0101_002:
faceplayer
compare VAR_UNK_4088, 2
goto_if_ne _03AD
check_badge 9, VAR_SPECIAL_RESULT
check_badge BADGE_CASCADE, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _03A4
@ -288,7 +288,7 @@ scr_seq_T04GYM0101_003:
faceplayer
compare VAR_UNK_4088, 2
goto_if_ne _03F3
check_badge 9, VAR_SPECIAL_RESULT
check_badge BADGE_CASCADE, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _03EA
@ -312,7 +312,7 @@ scr_seq_T04GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 9, VAR_SPECIAL_RESULT
check_badge BADGE_CASCADE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0424
npc_msg msg_0469_T04GYM0101_00014

8
files/fielddata/script/scr_seq/scr_seq_0778_T06GYM0101.s
View File

@ -265,7 +265,7 @@ scr_seq_T06GYM0101_023:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 10, VAR_SPECIAL_RESULT
check_badge BADGE_THUNDER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _03C7
npc_msg msg_0485_T06GYM0101_00000
@ -274,7 +274,7 @@ scr_seq_T06GYM0101_023:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _03DD
give_badge 10
give_badge BADGE_THUNDER
addvar VAR_UNK_4135, 1
add_special_game_stat 22
setflag FLAG_UNK_31A
@ -328,7 +328,7 @@ scr_seq_T06GYM0101_024:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 10, VAR_SPECIAL_RESULT
check_badge BADGE_THUNDER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0409
npc_msg msg_0485_T06GYM0101_00006
@ -348,7 +348,7 @@ scr_seq_T06GYM0101_025:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 10, VAR_SPECIAL_RESULT
check_badge BADGE_THUNDER, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _043B

2
files/fielddata/script/scr_seq/scr_seq_0785_T07.s
View File

@ -50,7 +50,7 @@ _0095:
check_registered_phone_number PHONE_CONTACT_ERIKA, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _015E
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _00C3
goto _0198

8
files/fielddata/script/scr_seq/scr_seq_0786_T07GYM0101.s
View File

@ -17,7 +17,7 @@ scr_seq_T07GYM0101_002:
check_registered_phone_number PHONE_CONTACT_ERIKA, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00DE
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _004F
goto _0101
@ -87,7 +87,7 @@ scr_seq_T07GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 11, VAR_SPECIAL_RESULT
check_badge BADGE_RAINBOW, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _01A5
npc_msg msg_0492_T07GYM0101_00000
@ -96,7 +96,7 @@ scr_seq_T07GYM0101_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _01BB
give_badge 11
give_badge BADGE_RAINBOW
addvar VAR_UNK_4135, 1
add_special_game_stat 22
settrainerflag TRAINER_TWINS_JO_AND_ZOE
@ -138,7 +138,7 @@ scr_seq_T07GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 11, VAR_SPECIAL_RESULT
check_badge BADGE_RAINBOW, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _01F2

2
files/fielddata/script/scr_seq/scr_seq_0792_T07R0104.s
View File

@ -23,7 +23,7 @@ _002F:
check_registered_phone_number PHONE_CONTACT_FALKNER, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _0082
check_badge 12, VAR_TEMP_x4000
check_badge BADGE_SOUL, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 1
goto_if_eq _005B
goto _00C2

2
files/fielddata/script/scr_seq/scr_seq_0798_T07R0203.s
View File

@ -176,7 +176,7 @@ scr_seq_T07R0203_009:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0276
npc_msg msg_0503_T07R0203_00007

10
files/fielddata/script/scr_seq/scr_seq_0809_T08GYM0101.s
View File

@ -24,7 +24,7 @@ scr_seq_T08GYM0101_000:
check_registered_phone_number PHONE_CONTACT_JANINE, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00AF
check_badge 12, VAR_TEMP_x4002
check_badge BADGE_SOUL, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 0
goto_if_ne _006D
goto _00E9
@ -492,7 +492,7 @@ scr_seq_T08GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 12, VAR_SPECIAL_RESULT
check_badge BADGE_SOUL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0778
npc_msg msg_0514_T08GYM0101_00000
@ -503,7 +503,7 @@ scr_seq_T08GYM0101_001:
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _078E
setvar VAR_TEMP_x400B, 0
give_badge 12
give_badge BADGE_SOUL
addvar VAR_UNK_4135, 1
add_special_game_stat 22
settrainerflag TRAINER_PICNICKER_CINDY
@ -545,7 +545,7 @@ scr_seq_T08GYM0101_002:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 12, VAR_SPECIAL_RESULT
check_badge BADGE_SOUL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _07C4
npc_msg msg_0514_T08GYM0101_00005
@ -565,7 +565,7 @@ scr_seq_T08GYM0101_007:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 12, VAR_SPECIAL_RESULT
check_badge BADGE_SOUL, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _07F6

2
files/fielddata/script/scr_seq/scr_seq_0815_T09.s
View File

@ -41,7 +41,7 @@ _007B:
check_registered_phone_number PHONE_CONTACT_BLAINE, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00CC
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _00A9
goto _0102

2
files/fielddata/script/scr_seq/scr_seq_0825_T10R0701.s
View File

@ -134,7 +134,7 @@ _01E7:
return
_01ED:
check_badge 15, VAR_SPECIAL_RESULT
check_badge BADGE_EARTH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_ne _0204
clearflag FLAG_HIDE_ROUTE_10_ZAPDOS

10
files/fielddata/script/scr_seq/scr_seq_0829_T11GYM0101.s
View File

@ -19,7 +19,7 @@ scr_seq_T11GYM0101_004:
check_registered_phone_number PHONE_CONTACT_SABRINA, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _006C
check_badge 13, VAR_TEMP_x4000
check_badge BADGE_MARSH, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 1
goto_if_eq _0055
goto _0083
@ -50,7 +50,7 @@ scr_seq_T11GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 13, VAR_SPECIAL_RESULT
check_badge BADGE_MARSH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0140
npc_msg msg_0531_T11GYM0101_00000
@ -59,7 +59,7 @@ scr_seq_T11GYM0101_000:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _0156
give_badge 13
give_badge BADGE_MARSH
addvar VAR_UNK_4135, 1
add_special_game_stat 22
setflag FLAG_UNK_998
@ -108,7 +108,7 @@ scr_seq_T11GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 13, VAR_SPECIAL_RESULT
check_badge BADGE_MARSH, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0182
npc_msg msg_0531_T11GYM0101_00006
@ -128,7 +128,7 @@ scr_seq_T11GYM0101_002:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 13, VAR_SPECIAL_RESULT
check_badge BADGE_MARSH, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _01B4

2
files/fielddata/script/scr_seq/scr_seq_0842_T20.s
View File

@ -33,7 +33,7 @@ scr_seq_T20_006:
_005F:
setvar VAR_TEMP_x4007, 0
check_badge 2, VAR_TEMP_x4002
check_badge BADGE_PLAIN, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 0
goto_if_eq _0089
get_weekday VAR_TEMP_x4000

4
files/fielddata/script/scr_seq/scr_seq_0843_T20R0101.s
View File

@ -336,13 +336,13 @@ _049D:
end
_04A1:
check_badge 15, VAR_TEMP_x4003
check_badge BADGE_EARTH, VAR_TEMP_x4003
compare VAR_TEMP_x4003, 1
goto_if_eq _0550
goto_if_set FLAG_UNK_0F2, _0541
goto_if_set FLAG_UNK_108, _051B
goto_if_set FLAG_UNK_109, _051B
check_badge 7, VAR_TEMP_x4002
check_badge BADGE_RISING, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _0510
compare VAR_TEMP_x400F, 1

2
files/fielddata/script/scr_seq/scr_seq_0845_T20R0201.s
View File

@ -156,7 +156,7 @@ _0205:
lockall
faceplayer
goto_if_set FLAG_TALKED_TO_MOM_AFTER_NAMING_RIVAL, _0275
check_badge 0, VAR_TEMP_x4000
check_badge BADGE_ZEPHYR, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_ne _0234
npc_msg msg_0545_T20R0201_00015

2
files/fielddata/script/scr_seq/scr_seq_0849_T20R0402.s
View File

@ -22,7 +22,7 @@ scr_seq_T20R0402_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _006D
buffer_players_name 0

2
files/fielddata/script/scr_seq/scr_seq_0850_T21.s
View File

@ -24,7 +24,7 @@ scr_seq_T21_010:
end
_003F:
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 0
goto_if_eq _007D
get_weekday VAR_TEMP_x4000

10
files/fielddata/script/scr_seq/scr_seq_0859_T22GYM0101.s
View File

@ -21,7 +21,7 @@ scr_seq_T22GYM0101_000:
check_registered_phone_number PHONE_CONTACT_FALKNER, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _007E
check_badge 12, VAR_TEMP_x4001
check_badge BADGE_SOUL, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _005B
goto _00A1
@ -64,7 +64,7 @@ scr_seq_T22GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0168
npc_msg msg_0558_T22GYM0101_00000
@ -73,7 +73,7 @@ scr_seq_T22GYM0101_001:
check_battle_won VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _017E
give_badge 0
give_badge BADGE_ZEPHYR
add_special_game_stat 22
settrainerflag TRAINER_BIRD_KEEPER_GS_ROD
settrainerflag TRAINER_BIRD_KEEPER_GS_ABE
@ -124,7 +124,7 @@ scr_seq_T22GYM0101_002:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _01AA
npc_msg msg_0558_T22GYM0101_00007
@ -148,7 +148,7 @@ scr_seq_T22GYM0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 0, VAR_SPECIAL_RESULT
check_badge BADGE_ZEPHYR, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _01EF

4
files/fielddata/script/scr_seq/scr_seq_0868_T23GYM0101.s
View File

@ -13,7 +13,7 @@ scr_seq_T23GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 1, VAR_SPECIAL_RESULT
check_badge BADGE_HIVE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0030
npc_msg msg_0566_T23GYM0101_00000
@ -33,7 +33,7 @@ scr_seq_T23GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 1, VAR_SPECIAL_RESULT
check_badge BADGE_HIVE, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _0062

4
files/fielddata/script/scr_seq/scr_seq_0869_T23GYM0102.s
View File

@ -66,7 +66,7 @@ scr_seq_T23GYM0102_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 1, VAR_SPECIAL_RESULT
check_badge BADGE_HIVE, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _017A
npc_msg msg_0567_T23GYM0102_00000
@ -80,7 +80,7 @@ scr_seq_T23GYM0102_001:
npc_msg msg_0567_T23GYM0102_00002
play_fanfare SEQ_ME_BADGE
wait_fanfare
give_badge 1
give_badge BADGE_HIVE
settrainerflag TRAINER_BUG_CATCHER_AL
settrainerflag TRAINER_BUG_CATCHER_BENNY
settrainerflag TRAINER_BUG_CATCHER_JOSH

6
files/fielddata/script/scr_seq/scr_seq_0877_T24GYM0101.s
View File

@ -22,7 +22,7 @@ scr_seq_T24GYM0101_000:
faceplayer
compare VAR_TEMP_x4000, 0
goto_if_eq _010A
check_badge 4, VAR_SPECIAL_RESULT
check_badge BADGE_STORM, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _00EE
npc_msg msg_0574_T24GYM0101_00000
@ -38,7 +38,7 @@ scr_seq_T24GYM0101_000:
settrainerflag TRAINER_BLACK_BELT_LUNG
buffer_players_name 0
npc_msg msg_0574_T24GYM0101_00004
give_badge 4
give_badge BADGE_STORM
play_fanfare SEQ_ME_BADGE
wait_fanfare
addvar VAR_UNK_4134, 1
@ -127,7 +127,7 @@ scr_seq_T24GYM0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 4, VAR_SPECIAL_RESULT
check_badge BADGE_STORM, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _019A

2
files/fielddata/script/scr_seq/scr_seq_0878_T24PC0101.s
View File

@ -80,7 +80,7 @@ scr_seq_T24PC0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 4, VAR_SPECIAL_RESULT
check_badge BADGE_STORM, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0115
npc_msg msg_0575_T24PC0101_00002

8
files/fielddata/script/scr_seq/scr_seq_0886_T25GYM0101.s
View File

@ -87,7 +87,7 @@ scr_seq_T25GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 2, VAR_SPECIAL_RESULT
check_badge BADGE_PLAIN, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0202
goto_if_set FLAG_UNK_0B7, _01A0
@ -123,7 +123,7 @@ _01A0:
npc_msg msg_0582_T25GYM0101_00004
play_fanfare SEQ_ME_BADGE
wait_fanfare
give_badge 2
give_badge BADGE_PLAIN
setvar VAR_UNK_410A, 2
clearflag FLAG_UNK_084
setflag FLAG_UNK_998
@ -196,7 +196,7 @@ scr_seq_T25GYM0101_002:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 2, VAR_SPECIAL_RESULT
check_badge BADGE_PLAIN, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _02AA
npc_msg msg_0582_T25GYM0101_00010
@ -216,7 +216,7 @@ scr_seq_T25GYM0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 2, VAR_SPECIAL_RESULT
check_badge BADGE_PLAIN, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _02DC

2
files/fielddata/script/scr_seq/scr_seq_0896_T25R0601.s
View File

@ -110,7 +110,7 @@ _014C:
step_end
scr_seq_T25R0601_000:
goto_if_set FLAG_UNK_0B5, _01E5
check_badge 2, VAR_TEMP_x4000
check_badge BADGE_PLAIN, VAR_TEMP_x4000
compare VAR_TEMP_x4000, 1
goto_if_eq _0185
simple_npc_msg msg_0589_T25R0601_00000

14
files/fielddata/script/scr_seq/scr_seq_0913_T26GYM0101.s
View File

@ -53,7 +53,7 @@ _009D:
check_registered_phone_number PHONE_CONTACT_ERIKA, VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _015A
check_badge 15, VAR_TEMP_x4002
check_badge BADGE_EARTH, VAR_TEMP_x4002
compare VAR_TEMP_x4002, 1
goto_if_eq _00CB
goto _015A
@ -109,7 +109,7 @@ scr_seq_T26GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 5, VAR_SPECIAL_RESULT
check_badge BADGE_MINERAL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _020C
npc_msg msg_0606_T26GYM0101_00000
@ -123,7 +123,7 @@ scr_seq_T26GYM0101_000:
npc_msg msg_0606_T26GYM0101_00002
play_fanfare SEQ_ME_BADGE
wait_fanfare
give_badge 5
give_badge BADGE_MINERAL
addvar VAR_UNK_4134, 1
add_special_game_stat 22
compare VAR_UNK_4134, 3
@ -367,7 +367,7 @@ scr_seq_T26GYM0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 5, VAR_SPECIAL_RESULT
check_badge BADGE_MINERAL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_ne _04F4
npc_msg msg_0606_T26GYM0101_00020
@ -389,7 +389,7 @@ scr_seq_T26GYM0101_004:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 5, VAR_SPECIAL_RESULT
check_badge BADGE_MINERAL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_ne _0536
npc_msg msg_0606_T26GYM0101_00022
@ -411,7 +411,7 @@ scr_seq_T26GYM0101_005:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 5, VAR_SPECIAL_RESULT
check_badge BADGE_MINERAL, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0590
compare VAR_UNK_410E, 0
@ -438,7 +438,7 @@ scr_seq_T26GYM0101_006:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 5, VAR_SPECIAL_RESULT
check_badge BADGE_MINERAL, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _05C2

8
files/fielddata/script/scr_seq/scr_seq_0922_T27GYM0101.s
View File

@ -100,7 +100,7 @@ scr_seq_T27GYM0101_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 3, VAR_SPECIAL_RESULT
check_badge BADGE_FOG, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _01D9
npc_msg msg_0614_T27GYM0101_00000
@ -110,7 +110,7 @@ scr_seq_T27GYM0101_001:
compare VAR_SPECIAL_RESULT, 0
goto_if_eq _01EF
npc_msg msg_0614_T27GYM0101_00001
give_badge 3
give_badge BADGE_FOG
addvar VAR_UNK_4134, 1
add_special_game_stat 22
setflag FLAG_UNK_998
@ -188,7 +188,7 @@ scr_seq_T27GYM0101_003:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 3, VAR_SPECIAL_RESULT
check_badge BADGE_FOG, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _029E
npc_msg msg_0614_T27GYM0101_00007
@ -209,7 +209,7 @@ scr_seq_T27GYM0101_005:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 3, VAR_SPECIAL_RESULT
check_badge BADGE_FOG, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _02D3

2
files/fielddata/script/scr_seq/scr_seq_0926_T27R0201.s
View File

@ -29,7 +29,7 @@ scr_seq_T27R0201_000:
get_player_facing VAR_TEMP_x4001
compare VAR_TEMP_x4001, 1
goto_if_eq _00D4
check_badge 3, VAR_SPECIAL_RESULT
check_badge BADGE_FOG, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0096
get_game_version VAR_SPECIAL_RESULT

4
files/fielddata/script/scr_seq/scr_seq_0932_T28GYM0101.s
View File

@ -63,7 +63,7 @@ scr_seq_T28GYM0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 6, VAR_SPECIAL_RESULT
check_badge BADGE_GLACIER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0178
npc_msg msg_0622_T28GYM0101_00000
@ -78,7 +78,7 @@ scr_seq_T28GYM0101_000:
settrainerflag TRAINER_SKIER_DIANA
settrainerflag TRAINER_BOARDER_PATTON
npc_msg msg_0622_T28GYM0101_00001
give_badge 6
give_badge BADGE_GLACIER
addvar VAR_UNK_4134, 1
add_special_game_stat 22
compare VAR_UNK_4134, 3

4
files/fielddata/script/scr_seq/scr_seq_0934_T28GYM0103.s
View File

@ -13,7 +13,7 @@ scr_seq_T28GYM0103_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 6, VAR_SPECIAL_RESULT
check_badge BADGE_GLACIER, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _0030
npc_msg msg_0623_T28GYM0103_00000
@ -33,7 +33,7 @@ scr_seq_T28GYM0103_001:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 6, VAR_SPECIAL_RESULT
check_badge BADGE_GLACIER, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _0062

2
files/fielddata/script/scr_seq/scr_seq_0943_T30GYM0101.s
View File

@ -302,7 +302,7 @@ scr_seq_T30GYM0101_005:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 7, VAR_SPECIAL_RESULT
check_badge BADGE_RISING, VAR_SPECIAL_RESULT
buffer_players_name 0
compare VAR_SPECIAL_RESULT, 0
goto_if_ne _0407

2
files/fielddata/script/scr_seq/scr_seq_0959_W19R0101.s
View File

@ -12,7 +12,7 @@ scr_seq_W19R0101_000:
play_se SEQ_SE_DP_SELECT
lockall
faceplayer
check_badge 14, VAR_SPECIAL_RESULT
check_badge BADGE_VOLCANO, VAR_SPECIAL_RESULT
compare VAR_SPECIAL_RESULT, 1
goto_if_eq _002C
npc_msg msg_0741_W19R0101_00000

4
global.inc
View File

@ -6525,7 +6525,7 @@
.public ov01_021FCE44
.public ov01_021FCE5C
.public ov01_021FCE74
.public ov01_021FCE98
.public Task_UseSweetScentInField
.public ov01_021FCFEC
.public ov01_021FD014
.public ov01_021FD064
@ -28841,7 +28841,7 @@
.public sub_0203C8F0
.public sub_0203CA9C
.public sub_0203D718
.public sub_0203D758
.public Task_UseFlyInField
.public sub_0203D818
.public sub_0203D830
.public sub_0203D9B4

22
include/constants/badge.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef POKEHEARTGOLD_CONSTANTS_BADGE_H
#define POKEHEARTGOLD_CONSTANTS_BADGE_H
#define BADGE_ZEPHYR 0
#define BADGE_HIVE 1
#define BADGE_PLAIN 2
#define BADGE_FOG 3
#define BADGE_STORM 4
#define BADGE_MINERAL 5
#define BADGE_GLACIER 6
#define BADGE_RISING 7
#define BADGE_BOULDER 8
#define BADGE_CASCADE 9
#define BADGE_THUNDER 10
#define BADGE_RAINBOW 11
#define BADGE_SOUL 12
#define BADGE_MARSH 13
#define BADGE_VOLCANO 14
#define BADGE_EARTH 15
#endif //POKEHEARTGOLD_CONSTANTS_BADGE_H

6
include/constants/decorations.h
View File

@ -1,5 +1,5 @@
#ifndef POKEHEARTGOLD_DECORATIONS_H
#define POKEHEARTGOLD_DECORATIONS_H
#ifndef POKEHEARTGOLD_CONSTANTS_DECORATIONS_H
#define POKEHEARTGOLD_CONSTANTS_DECORATIONS_H
#define DECORATION_NONE 0
#define DECORATION_DUMMY_1 1
@ -141,4 +141,4 @@
#define DECORATION_PRETTY_FLOWERS 137
#define DECORATION_LAVISH_FLOWERS 138
#endif //POKEHEARTGOLD_DECORATIONS_H
#endif //POKEHEARTGOLD_CONSTANTS_DECORATIONS_H

6
include/constants/follow_poke_idx.h
View File

@ -1,5 +1,5 @@
#ifndef POKEHEARTGOLD_FOLLOW_POKE_IDX_H
#define POKEHEARTGOLD_FOLLOW_POKE_IDX_H
#ifndef POKEHEARTGOLD_CONSTANTS_FOLLOW_POKE_IDX_H
#define POKEHEARTGOLD_CONSTANTS_FOLLOW_POKE_IDX_H
#define TSURE_POKE_NONE 0
#define TSURE_POKE_BULBASAUR 0
@ -569,4 +569,4 @@
#define TSURE_POKE_ARCEUS_DRAGON 564
#define TSURE_POKE_ARCEUS_DARK 565
#endif //POKEHEARTGOLD_FOLLOW_POKE_IDX_H
#endif //POKEHEARTGOLD_CONSTANTS_FOLLOW_POKE_IDX_H

6
include/constants/global.fieldmap.h
View File

@ -1,5 +1,5 @@
#ifndef POKEHEARTGOLD_GLOBAL_FIELDMAP_H
#define POKEHEARTGOLD_GLOBAL_FIELDMAP_H
#ifndef POKEHEARTGOLD_CONSTANTS_GLOBAL_FIELDMAP_H
#define POKEHEARTGOLD_CONSTANTS_GLOBAL_FIELDMAP_H
// Facing direction
#define DIR_SOUTH 0
@ -44,4 +44,4 @@
#define PLAYER_TRANSITION_x2000 8192
#define PLAYER_TRANSITION_x4000 16384
#endif //POKEHEARTGOLD_GLOBAL_FIELDMAP_H
#endif //POKEHEARTGOLD_CONSTANTS_GLOBAL_FIELDMAP_H

6
include/constants/johto_dex.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_JOHTO_DEX_H
#define GUARD_JOHTO_DEX_H
#ifndef POKEHEARTGOLD_CONSTANTS_JOHTO_DEX_H
#define POKEHEARTGOLD_CONSTANTS_JOHTO_DEX_H
#define J_SPECIES_NONE 0
#define J_NUM_SPECIES 256
#endif //GUARD_JOHTO_DEX_H
#endif //POKEHEARTGOLD_CONSTANTS_JOHTO_DEX_H

Some files were not shown because too many files have changed in this diff Show More