Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 12:35:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data

Browse Source
This commit is contained in:
PikalaxALT 2019-11-25 09:15:34 -05:00
commit 10aa908f56
120 changed files with 14541 additions and 27066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3043
asm/battle_message.s
View File

File diff suppressed because it is too large Load Diff

2
asm/field_control_avatar.s
View File

@ -2572,7 +2572,7 @@ _0806DC78:
bl sub_805550C
ldrb r0, [r4, 0x7]
ldrb r1, [r4, 0x6]
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4]
ldrb r0, [r4, 0x5]
ldr r1, [r1, 0x8]

10
asm/field_effect.s
View File

@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
ldrsh r6, [r4, r0]
cmp r6, 0
bne _08084350
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08084376
@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
sub_8084564: @ 8084564
push {r4,lr}
adds r4, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08084578
@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _080852B4
@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
sub_8085A54: @ 8085A54
push {r4,lr}
adds r4, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08085A78
@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
sub_8085E0C: @ 8085E0C
push {r4-r6,lr}
adds r6, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08085E82

4
asm/field_map_obj.s
View File

@ -376,7 +376,7 @@ sub_805E080: @ 805E080
str r0, [sp, 0x8]
adds r0, r6, 0
adds r1, r7, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4]
lsls r0, r4, 1
adds r0, r4
@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader
_0805FD94:
adds r0, r2, 0
adds r1, r3, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r0, [r0, 0x4]
ldr r1, [r0, 0x4]
_0805FDA0:

6
asm/field_weather.s
View File

@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
_0807AA6C: .4byte 0x000006cb
thumb_func_end FieldWeather_StartFadingOutCreditsMap
thumb_func_start field_weather_is_fade_finished
field_weather_is_fade_finished: @ 807AA70
thumb_func_start IsWeatherNotFadingIn
IsWeatherNotFadingIn: @ 807AA70
ldr r0, _0807AA84 @ =gUnknown_2037F34
ldr r1, _0807AA88 @ =0x000006c6
adds r0, r1
@ -1904,7 +1904,7 @@ field_weather_is_fade_finished: @ 807AA70
.align 2, 0
_0807AA84: .4byte gUnknown_2037F34
_0807AA88: .4byte 0x000006c6
thumb_func_end field_weather_is_fade_finished
thumb_func_end IsWeatherNotFadingIn
thumb_func_start sub_807AA8C
sub_807AA8C: @ 807AA8C

6
asm/fldeff_cut.s
View File

@ -24,8 +24,8 @@ sub_8097874: @ 8097874
bx r1
thumb_func_end sub_8097874
thumb_func_start sub_8097898
sub_8097898: @ 8097898
thumb_func_start SetUpFieldMove_Cut
SetUpFieldMove_Cut: @ 8097898
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -138,7 +138,7 @@ _08097970:
.align 2, 0
_0809797C: .4byte gPlayerFacingPosition
_08097980: .4byte 0x0000ffff
thumb_func_end sub_8097898
thumb_func_end SetUpFieldMove_Cut
thumb_func_start sub_8097984
sub_8097984: @ 8097984

6
asm/fldeff_flash.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_80C9B2C
sub_80C9B2C: @ 80C9B2C
thumb_func_start SetUpFieldMove_Flash
SetUpFieldMove_Flash: @ 80C9B2C
push {lr}
ldr r0, _080C9B54 @ =gMapHeader
ldrb r0, [r0, 0x15]
@ -37,7 +37,7 @@ _080C9B6C:
_080C9B6E:
pop {r1}
bx r1
thumb_func_end sub_80C9B2C
thumb_func_end SetUpFieldMove_Flash
thumb_func_start sub_80C9B74
sub_80C9B74: @ 80C9B74

48
asm/item_menu.s
View File

@ -5,8 +5,8 @@
.text
thumb_func_start sub_8107DB4
sub_8107DB4: @ 8107DB4
thumb_func_start GoToBagMenu
GoToBagMenu: @ 8107DB4
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -136,19 +136,19 @@ _08107EA8: .4byte gSpecialVar_ItemId
_08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC
thumb_func_end sub_8107DB4
thumb_func_end GoToBagMenu
thumb_func_start CB2_BagMenuFromStartMenu
CB2_BagMenuFromStartMenu: @ 8107EB8
push {lr}
ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
ldr r2, _08107EC8 @ =CB2_ReturnToFieldWithOpenMenu
movs r0, 0
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
_08107EC8: .4byte CB2_ReturnToStartMenu
_08107EC8: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end CB2_BagMenuFromStartMenu
thumb_func_start sub_8107ECC
@ -157,7 +157,7 @@ sub_8107ECC: @ 8107ECC
ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x5
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@ -1934,15 +1934,15 @@ _08108CE8: .4byte 0x0000fff0
_08108CEC: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CB4
thumb_func_start sub_8108CF0
sub_8108CF0: @ 8108CF0
thumb_func_start CB2_SetUpReshowBattleScreenAfterMenu
CB2_SetUpReshowBattleScreenAfterMenu: @ 8108CF0
ldr r1, _08108CF8 @ =gUnknown_203ACFC
movs r0, 0
strb r0, [r1, 0x5]
bx lr
.align 2, 0
_08108CF8: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CF0
thumb_func_end CB2_SetUpReshowBattleScreenAfterMenu
thumb_func_start sub_8108CFC
sub_8108CFC: @ 8108CFC
@ -2514,7 +2514,7 @@ sub_8109140: @ 8109140
movs r1, 0
movs r2, 0xE
movs r3, 0x1E
bl SetBgRectPal
bl SetBgTilemapPalette
movs r0, 0x1
bl ScheduleBgCopyTilemapToVram
add sp, 0x8
@ -4399,7 +4399,7 @@ _0810A120:
_0810A13E:
ldr r0, _0810A154 @ =gUnknown_203AD10
ldr r1, [r0]
ldr r0, _0810A158 @ =sub_8126EDC
ldr r0, _0810A158 @ =CB2_ChooseMonToGiveItem
str r0, [r1]
mov r0, r8
subs r0, 0x8
@ -4409,7 +4409,7 @@ _0810A13E:
b _0810A166
.align 2, 0
_0810A154: .4byte gUnknown_203AD10
_0810A158: .4byte sub_8126EDC
_0810A158: .4byte CB2_ChooseMonToGiveItem
_0810A15C: .4byte ItemMenu_StartFadeToExitCallback
_0810A160:
adds r0, r7, 0
@ -4786,7 +4786,7 @@ _0810A458: .4byte sub_810A45C
thumb_func_start sub_810A45C
sub_810A45C: @ 810A45C
push {lr}
bl sub_8123730
bl CB2_SelectBagItemToGive
pop {r0}
bx r0
thumb_func_end sub_810A45C
@ -4918,7 +4918,7 @@ sub_810A554: @ 810A554
ldr r2, _0810A564 @ =sub_808CE60
movs r0, 0x4
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@ -5063,7 +5063,7 @@ sub_810A67C: @ 810A67C
ldr r2, _0810A68C @ =CB2_ReturnToField
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@ -6127,7 +6127,7 @@ sub_810AF74: @ 810AF74
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x6
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@ -6358,7 +6358,7 @@ _0810B16C:
movs r0, 0x8
_0810B170:
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
pop {r4}
pop {r0}
bx r0
@ -6856,10 +6856,10 @@ _0810B564:
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
ldr r1, _0810B5B0 @ =gUnknown_3005E98
ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
ldr r1, _0810B5B0 @ =gItemUseCB
ldr r0, _0810B5B4 @ =ItemUseCB_MedicineStep
str r0, [r1]
ldr r0, _0810B5B8 @ =sub_81279A4
ldr r0, _0810B5B8 @ =ChooseMonForInBattleItem
bl ItemMenu_SetExitCallback
mov r0, r9
subs r0, 0x8
@ -6868,9 +6868,9 @@ _0810B564:
str r1, [r0]
b _0810B5C6
.align 2, 0
_0810B5B0: .4byte gUnknown_3005E98
_0810B5B4: .4byte ItemUseCB_Medicine
_0810B5B8: .4byte sub_81279A4
_0810B5B0: .4byte gItemUseCB
_0810B5B4: .4byte ItemUseCB_MedicineStep
_0810B5B8: .4byte ChooseMonForInBattleItem
_0810B5BC: .4byte sub_810B070
_0810B5C0:
ldrh r0, [r5, 0x10]

8
asm/link_rfu.s
View File

@ -3172,8 +3172,8 @@ _080FEBA6:
bx r0
thumb_func_end sub_80FEB3C
thumb_func_start sub_80FEBAC
sub_80FEBAC: @ 80FEBAC
thumb_func_start DoEasyChatScreen
DoEasyChatScreen: @ 80FEBAC
push {r4-r6,lr}
mov r6, r8
push {r6}
@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC
_080FEC00: .4byte sub_80FEC54
_080FEC04: .4byte gTasks
_080FEC08: .4byte sub_80FEC0C
thumb_func_end sub_80FEBAC
thumb_func_end DoEasyChatScreen
thumb_func_start sub_80FEC0C
sub_80FEC0C: @ 80FEC0C
@ -3588,7 +3588,7 @@ _080FEF08:
ldr r0, _080FEF24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
ldr r2, _080FEF28 @ =sub_80568C4
bl sub_80FEBAC
bl DoEasyChatScreen
_080FEF12:
pop {r0}
bx r0

14
asm/link_rfu_3.s
View File

@ -3650,7 +3650,7 @@ _08117784:
ldr r0, _0811779C @ =sub_811C1C8
str r0, [r1, 0x8]
movs r0, 0x2
bl sub_81274A8
bl InitChooseHalfPartyForBattle
b _081178E0
.align 2, 0
_08117798: .4byte gMain
@ -5602,12 +5602,12 @@ _0811887C:
_081188C4: .4byte gUnknown_203B06C
_081188C8: .4byte gSpecialVar_Result
_081188CC:
bl sub_811FB18
bl GetPartyMenuType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x8
beq _081188E4
bl sub_811FB18
bl GetPartyMenuType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x9
@ -7335,7 +7335,7 @@ _081197CA:
adds r0, r1
ldr r0, [r0]
str r0, [r2]
ldr r2, _0811982C @ =gUnknown_203B06A
ldr r2, _0811982C @ =gUnionRoomRequestedMonType
ldr r1, [r6]
movs r3, 0x2
ldrsh r0, [r7, r3]
@ -7344,7 +7344,7 @@ _081197CA:
ldrb r0, [r1, 0x9]
lsrs r0, 2
strb r0, [r2]
ldr r2, _08119830 @ =gUnknown_203B068
ldr r2, _08119830 @ =gUnionRoomOfferedSpecies
ldr r1, [r6]
movs r3, 0x2
ldrsh r0, [r7, r3]
@ -7369,8 +7369,8 @@ _081197CA:
_08119820: .4byte gUnknown_8458D1C
_08119824: .4byte gUnknown_203B06C
_08119828: .4byte gUnknown_203B064
_0811982C: .4byte gUnknown_203B06A
_08119830: .4byte gUnknown_203B068
_0811982C: .4byte gUnionRoomRequestedMonType
_08119830: .4byte gUnionRoomOfferedSpecies
_08119834: .4byte gFieldCallback
_08119838: .4byte sub_807DCE4
_0811983C: .4byte CB2_ReturnToField

28
asm/naming_screen.s
View File

@ -3623,7 +3623,7 @@ sub_809F5C4: @ 809F5C4
push {r4,r5,lr}
sub sp, 0x10
movs r4, 0
ldr r1, _0809F61C @ =gUnknown_841621F
ldr r1, _0809F61C @ =gText_MaleSymbol
add r0, sp, 0xC
bl StringCopy
ldr r5, _0809F620 @ =gUnknown_203998C
@ -3635,7 +3635,7 @@ sub_809F5C4: @ 809F5C4
beq _0809F614
cmp r0, 0xFE
bne _0809F5EE
ldr r1, _0809F628 @ =gUnknown_8416221
ldr r1, _0809F628 @ =gText_FemaleSymbol
add r0, sp, 0xC
bl StringCopy
movs r4, 0x1
@ -3664,10 +3664,10 @@ _0809F614:
pop {r0}
bx r0
.align 2, 0
_0809F61C: .4byte gUnknown_841621F
_0809F61C: .4byte gText_MaleSymbol
_0809F620: .4byte gUnknown_203998C
_0809F624: .4byte 0x00001e36
_0809F628: .4byte gUnknown_8416221
_0809F628: .4byte gText_FemaleSymbol
_0809F62C: .4byte 0x00001e13
_0809F630: .4byte gUnknown_83E2428
thumb_func_end sub_809F5C4
@ -4490,7 +4490,7 @@ sub_809FC90: @ 809FC90
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FCB4 @ =CB2_ReturnToStartMenu
ldr r0, _0809FCB4 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0
movs r3, 0
@ -4500,7 +4500,7 @@ sub_809FC90: @ 809FC90
bx r0
.align 2, 0
_0809FCB0: .4byte gSaveBlock2Ptr
_0809FCB4: .4byte CB2_ReturnToStartMenu
_0809FCB4: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FC90
thumb_func_start sub_809FCB8
@ -4512,7 +4512,7 @@ sub_809FCB8: @ 809FCB8
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FCDC @ =CB2_ReturnToStartMenu
ldr r0, _0809FCDC @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x1
movs r3, 0
@ -4522,7 +4522,7 @@ sub_809FCB8: @ 809FCB8
bx r0
.align 2, 0
_0809FCD8: .4byte gSaveBlock2Ptr
_0809FCDC: .4byte CB2_ReturnToStartMenu
_0809FCDC: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FCB8
thumb_func_start sub_809FCE0
@ -4534,7 +4534,7 @@ sub_809FCE0: @ 809FCE0
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD04 @ =CB2_ReturnToStartMenu
ldr r0, _0809FD04 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x2
movs r3, 0
@ -4544,7 +4544,7 @@ sub_809FCE0: @ 809FCE0
bx r0
.align 2, 0
_0809FD00: .4byte gSaveBlock2Ptr
_0809FD04: .4byte CB2_ReturnToStartMenu
_0809FD04: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FCE0
thumb_func_start sub_809FD08
@ -4556,7 +4556,7 @@ sub_809FD08: @ 809FD08
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD2C @ =CB2_ReturnToStartMenu
ldr r0, _0809FD2C @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x3
movs r3, 0
@ -4566,7 +4566,7 @@ sub_809FD08: @ 809FD08
bx r0
.align 2, 0
_0809FD28: .4byte gSaveBlock2Ptr
_0809FD2C: .4byte CB2_ReturnToStartMenu
_0809FD2C: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FD08
thumb_func_start sub_809FD30
@ -4578,7 +4578,7 @@ sub_809FD30: @ 809FD30
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD54 @ =CB2_ReturnToStartMenu
ldr r0, _0809FD54 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x4
movs r3, 0
@ -4588,7 +4588,7 @@ sub_809FD30: @ 809FD30
bx r0
.align 2, 0
_0809FD50: .4byte gSaveBlock2Ptr
_0809FD54: .4byte CB2_ReturnToStartMenu
_0809FD54: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FD30
.align 2, 0 @ Don't pad with nop.

32
asm/overworld.s
View File

@ -473,7 +473,7 @@ _08054F8A:
str r2, [sp, 0x4]
adds r0, r2, 0
adds r1, r5, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
mov r6, r10
ldr r1, [r6]
mov r2, r8
@ -821,8 +821,8 @@ _08055232:
bx r1
thumb_func_end warp_data_is_not_neg_1
thumb_func_start get_mapheader_by_bank_and_number
get_mapheader_by_bank_and_number: @ 8055238
thumb_func_start Overworld_GetMapHeaderByGroupAndId
Overworld_GetMapHeaderByGroupAndId: @ 8055238
lsls r0, 16
lsls r1, 16
ldr r2, _0805524C @ =gMapGroups
@ -835,7 +835,7 @@ get_mapheader_by_bank_and_number: @ 8055238
bx lr
.align 2, 0
_0805524C: .4byte gMapGroups
thumb_func_end get_mapheader_by_bank_and_number
thumb_func_end Overworld_GetMapHeaderByGroupAndId
thumb_func_start warp1_get_mapheader
warp1_get_mapheader: @ 8055250
@ -850,7 +850,7 @@ warp1_get_mapheader: @ 8055250
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
pop {r1}
bx r1
.align 2, 0
@ -872,7 +872,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0
ldm r0!, {r2,r3,r6}
stm r1!, {r2,r3,r6}
@ -908,7 +908,7 @@ set_current_map_header_from_sav1: @ 80552BC
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrh r0, [r0, 0x10]
pop {r1}
bx r1
@ -2863,7 +2863,7 @@ get_map_light_level_by_bank_and_number: @ 8056158
lsls r1, 24
asrs r1, 8
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x17]
pop {r1}
bx r1
@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@ -3014,7 +3014,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@ -3036,7 +3036,7 @@ GetCurrentRegionMapSectionId: @ 8056260
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@ -3058,7 +3058,7 @@ sav1_map_get_battletype: @ 8056288
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x1B]
pop {r1}
bx r1
@ -3754,8 +3754,8 @@ _080568A0: .4byte gFieldCallback
_080568A4: .4byte sub_807DDD0
thumb_func_end c2_8056854
thumb_func_start CB2_ReturnToStartMenu
CB2_ReturnToStartMenu: @ 80568A8
thumb_func_start CB2_ReturnToFieldWithOpenMenu
CB2_ReturnToFieldWithOpenMenu: @ 80568A8
push {lr}
bl sub_80569BC
ldr r1, _080568BC @ =gFieldCallback2
@ -3767,7 +3767,7 @@ CB2_ReturnToStartMenu: @ 80568A8
.align 2, 0
_080568BC: .4byte gFieldCallback2
_080568C0: .4byte FieldCB2_ReturnToStartMenuInit
thumb_func_end CB2_ReturnToStartMenu
thumb_func_end CB2_ReturnToFieldWithOpenMenu
thumb_func_start sub_80568C4
sub_80568C4: @ 80568C4

19390
asm/party_menu.s
View File

File diff suppressed because it is too large Load Diff

4
asm/pokedex_screen.s
View File

@ -428,13 +428,13 @@ sub_8102858: @ 8102858
lsls r1, 7
movs r0, 0
bl SetGpuRegBits
ldr r0, _08102878 @ =CB2_ReturnToStartMenu
ldr r0, _08102878 @ =CB2_ReturnToFieldWithOpenMenu
bl SetMainCallback2
_08102874:
pop {r0}
bx r0
.align 2, 0
_08102878: .4byte CB2_ReturnToStartMenu
_08102878: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_8102858
thumb_func_start sub_810287C

8
asm/pokemon_jump_2.s
View File

@ -4230,8 +4230,8 @@ sub_81499E0: @ 81499E0
_081499FC: .4byte gUnknown_203F3D4
thumb_func_end sub_81499E0
thumb_func_start sub_8149A00
sub_8149A00: @ 8149A00
thumb_func_start IsSpeciesAllowedInPokemonJump
IsSpeciesAllowedInPokemonJump: @ 8149A00
push {lr}
lsls r0, 16
lsrs r0, 16
@ -4242,7 +4242,7 @@ sub_8149A00: @ 8149A00
lsrs r0, 31
pop {r1}
bx r1
thumb_func_end sub_8149A00
thumb_func_end IsSpeciesAllowedInPokemonJump
thumb_func_start sub_8149A18
sub_8149A18: @ 8149A18
@ -4264,7 +4264,7 @@ _08149A1C:
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8149A00
bl IsSpeciesAllowedInPokemonJump
cmp r0, 0
beq _08149A54
ldr r1, _08149A50 @ =gSpecialVar_Result

8
asm/pokemon_special_anim.s
View File

@ -558,7 +558,7 @@ _0811C9AA:
adds r0, r4, 0
adds r0, 0x96
ldrh r0, [r0]
bl GetItemCompatibilityRule
bl CheckIfItemIsTMHMOrEvolutionStone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -1508,8 +1508,8 @@ sub_811D120: @ 811D120
bx r1
thumb_func_end sub_811D120
thumb_func_start GetMonLevelUpWindowStats
GetMonLevelUpWindowStats: @ 811D130
thumb_func_start BufferMonStatsToTaskData
BufferMonStatsToTaskData: @ 811D130
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@ -1539,7 +1539,7 @@ GetMonLevelUpWindowStats: @ 811D130
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end GetMonLevelUpWindowStats
thumb_func_end BufferMonStatsToTaskData
thumb_func_start sub_811D178
sub_811D178: @ 811D178

6
asm/pokemon_storage_system.s
View File

@ -1455,7 +1455,7 @@ _0808C3E0:
.align 2, 0
_0808C444: .4byte gUnknown_83CDA20
_0808C448:
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
bne _0808C454
@ -6591,7 +6591,7 @@ _0808EEE8:
ldr r2, _0808EF08 @ =sub_808CE60
movs r0, 0x4
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
_0808EEF6:
adds r0, r7, 0
bl DestroyTask
@ -15947,7 +15947,7 @@ sub_80937B4: @ 80937B4
_080937C4: .4byte gUnknown_2039822
_080937C8:
ldr r4, _080937D8 @ =gUnknown_2039821
bl sub_8138B20
bl GetLastViewedMonIndex
strb r0, [r4]
_080937D0:
pop {r4}

78
asm/pokemon_summary_screen.s
View File

@ -42,7 +42,7 @@ _0813453C: .4byte gUnknown_203B140
_08134540: .4byte 0x00003308
_08134544: .4byte gUnknown_203B144
_08134548:
ldr r0, _08134574 @ =gUnknown_203B16C
ldr r0, _08134574 @ =gLastViewedMonIndex
strb r6, [r0]
ldr r0, _08134578 @ =gUnknown_203B16D
movs r1, 0
@ -64,7 +64,7 @@ _08134548:
movs r0, 0x1
b _08134596
.align 2, 0
_08134574: .4byte gUnknown_203B16C
_08134574: .4byte gLastViewedMonIndex
_08134578: .4byte gUnknown_203B16D
_0813457C: .4byte gUnknown_203B16E
_08134580: .4byte 0x000032f8
@ -3448,7 +3448,7 @@ _08136168:
ldr r0, [r6]
ldr r3, _08136208 @ =0x00003084
adds r0, r3
ldr r1, _0813620C @ =gUnknown_8416221
ldr r1, _0813620C @ =gText_FemaleSymbol
bl StringCopy
b _08136238
.align 2, 0
@ -3459,19 +3459,19 @@ _081361FC: .4byte 0x00003220
_08136200: .4byte 0x00003221
_08136204: .4byte 0x00003034
_08136208: .4byte 0x00003084
_0813620C: .4byte gUnknown_8416221
_0813620C: .4byte gText_FemaleSymbol
_08136210:
cmp r7, 0
bne _0813622C
ldr r0, [r6]
ldr r1, _08136224 @ =0x00003084
adds r0, r1
ldr r1, _08136228 @ =gUnknown_841621F
ldr r1, _08136228 @ =gText_MaleSymbol
bl StringCopy
b _08136238
.align 2, 0
_08136224: .4byte 0x00003084
_08136228: .4byte gUnknown_841621F
_08136228: .4byte gText_MaleSymbol
_0813622C:
ldr r0, [r6]
ldr r2, _08136308 @ =0x00003084
@ -3622,7 +3622,7 @@ sub_8136350: @ 8136350
bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, r4
ldr r1, _08136504 @ =gUnknown_841620C
ldr r1, _08136504 @ =gText_Slash
bl StringAppend
ldr r0, [r6]
adds r0, r7
@ -3794,7 +3794,7 @@ _081363E6:
_081364F8: .4byte gUnknown_203B140
_081364FC: .4byte 0x00003290
_08136500: .4byte 0x00003090
_08136504: .4byte gUnknown_841620C
_08136504: .4byte gText_Slash
_08136508: .4byte gUnknown_203B144
_0813650C: .4byte 0x000032f8
_08136510: .4byte sub_804CF14
@ -5618,7 +5618,7 @@ _081373EA:
str r6, [sp]
mov r7, r9
str r7, [sp, 0x4]
ldr r1, _081374E0 @ =gUnknown_841620C
ldr r1, _081374E0 @ =gText_Slash
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0x3A
@ -5663,7 +5663,7 @@ _081374D0: .4byte gUnknown_8416238
_081374D4: .4byte gUnknown_203B144
_081374D8: .4byte 0x000030b8
_081374DC: .4byte 0x00003258
_081374E0: .4byte gUnknown_841620C
_081374E0: .4byte gText_Slash
_081374E4: .4byte 0x000030f0
thumb_func_end sub_81372E4
@ -6839,8 +6839,8 @@ _08137E82:
adds r0, r1
ldr r0, [r0]
bl SetMainCallback2
bl sub_8138B20
ldr r1, _08137EE0 @ =gUnknown_203B16C
bl GetLastViewedMonIndex
ldr r1, _08137EE0 @ =gLastViewedMonIndex
strb r0, [r1]
ldr r0, [r4]
cmp r0, 0
@ -6864,7 +6864,7 @@ _08137ECC:
_08137ED4: .4byte gUnknown_203B140
_08137ED8: .4byte 0x00003214
_08137EDC: .4byte 0x000032f8
_08137EE0: .4byte gUnknown_203B16C
_08137EE0: .4byte gLastViewedMonIndex
_08137EE4: .4byte gUnknown_203B144
thumb_func_end sub_8137E64
@ -8397,14 +8397,14 @@ _08138B18: .4byte 0x00003220
_08138B1C: .4byte 0x00003221
thumb_func_end sub_8138A38
thumb_func_start sub_8138B20
sub_8138B20: @ 8138B20
ldr r0, _08138B28 @ =gUnknown_203B16C
thumb_func_start GetLastViewedMonIndex
GetLastViewedMonIndex: @ 8138B20
ldr r0, _08138B28 @ =gLastViewedMonIndex
ldrb r0, [r0]
bx lr
.align 2, 0
_08138B28: .4byte gUnknown_203B16C
thumb_func_end sub_8138B20
_08138B28: .4byte gLastViewedMonIndex
thumb_func_end GetLastViewedMonIndex
thumb_func_start GetMoveSlotToReplace
GetMoveSlotToReplace: @ 8138B2C
@ -8443,7 +8443,7 @@ sub_8138B4C: @ 8138B4C
ldrb r0, [r0]
cmp r0, 0x1
bne _08138B84
ldr r0, _08138B80 @ =gUnknown_203B16C
ldr r0, _08138B80 @ =gLastViewedMonIndex
ldrb r0, [r0]
cmp r0, 0x3
bhi _08138B76
@ -8454,7 +8454,7 @@ _08138B76:
b _08138B86
.align 2, 0
_08138B7C: .4byte gReceivedRemoteLinkPlayers
_08138B80: .4byte gUnknown_203B16C
_08138B80: .4byte gLastViewedMonIndex
_08138B84:
movs r0, 0
_08138B86:
@ -8476,7 +8476,7 @@ sub_8138B8C: @ 8138B8C
adds r2, 0xD8
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@ -8493,7 +8493,7 @@ _08138BC4:
ldr r2, _08138BE8 @ =0x000032f4
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@ -9148,7 +9148,7 @@ sub_81390B0: @ 81390B0
ldr r1, _081391DC @ =0x000032f4
adds r0, r1
ldr r6, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@ -9294,7 +9294,7 @@ sub_81391EC: @ 81391EC
ldr r1, _08139318 @ =0x000032f4
adds r0, r1
ldr r6, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@ -9442,7 +9442,7 @@ sub_8139328: @ 8139328
adds r2, 0xD8
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@ -9459,7 +9459,7 @@ _08139360:
ldr r2, _08139384 @ =0x000032f4
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@ -9489,7 +9489,7 @@ sub_8139388: @ 8139388
bl sub_8138BEC
lsls r0, 16
lsrs r0, 16
bl sub_8125A90
bl IsMoveHm
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -10269,7 +10269,7 @@ _081399DC: .4byte sub_804CF14
_081399E0: .4byte 0x00003024
_081399E4: .4byte 0x0000ffff
_081399E8:
ldr r0, _08139A1C @ =gUnknown_203B16C
ldr r0, _08139A1C @ =gLastViewedMonIndex
ldrb r1, [r0]
movs r0, 0x3
bl sub_804455C
@ -10293,7 +10293,7 @@ _081399E8:
bl CreateMonPicSprite
b _08139A40
.align 2, 0
_08139A1C: .4byte gUnknown_203B16C
_08139A1C: .4byte gLastViewedMonIndex
_08139A20: .4byte 0x0000ffff
_08139A24:
movs r0, 0x3C
@ -10787,7 +10787,7 @@ _08139E20:
.align 2, 0
_08139E28: .4byte SpriteCallbackDummy
_08139E2C:
ldr r0, _08139E48 @ =gUnknown_203B16C
ldr r0, _08139E48 @ =gLastViewedMonIndex
ldrb r1, [r0]
movs r0, 0x3
bl sub_804455C
@ -10801,7 +10801,7 @@ _08139E2C:
str r4, [sp, 0x4]
b _08139E58
.align 2, 0
_08139E48: .4byte gUnknown_203B16C
_08139E48: .4byte gLastViewedMonIndex
_08139E4C: .4byte SpriteCallbackDummy
_08139E50:
ldr r1, _08139E98 @ =SpriteCallbackDummy
@ -13221,7 +13221,7 @@ _0813B16C:
ldr r2, _0813B190 @ =0x000032f4
adds r0, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@ -13268,7 +13268,7 @@ _0813B1CC:
negs r1, r1
cmp r0, r1
beq _0813B1F4
ldr r0, _0813B1FC @ =gUnknown_203B16C
ldr r0, _0813B1FC @ =gLastViewedMonIndex
strb r2, [r0]
ldr r0, _0813B200 @ =sub_813B3F0
movs r1, 0
@ -13284,7 +13284,7 @@ _0813B1F4:
pop {r0}
bx r0
.align 2, 0
_0813B1FC: .4byte gUnknown_203B16C
_0813B1FC: .4byte gLastViewedMonIndex
_0813B200: .4byte sub_813B3F0
_0813B204: .4byte gUnknown_203B140
_0813B208: .4byte 0x0000328c
@ -13311,7 +13311,7 @@ sub_813B20C: @ 813B20C
movs r1, 0x1
negs r1, r1
adds r5, r0, 0
ldr r6, _0813B264 @ =gUnknown_203B16C
ldr r6, _0813B264 @ =gLastViewedMonIndex
cmp r3, r1
bne _0813B23E
ldrb r0, [r6]
@ -13336,7 +13336,7 @@ _0813B252:
_0813B258: .4byte gUnknown_203B140
_0813B25C: .4byte 0x000032f4
_0813B260: .4byte 0x00003214
_0813B264: .4byte gUnknown_203B16C
_0813B264: .4byte gLastViewedMonIndex
_0813B268: .4byte 0x00003210
_0813B26C:
lsls r5, r4, 24
@ -13346,7 +13346,7 @@ _0813B26E:
asrs r1, r5, 24
adds r0, r1
lsls r0, 24
ldr r4, _0813B29C @ =gUnknown_203B16C
ldr r4, _0813B29C @ =gLastViewedMonIndex
lsrs r6, r0, 24
asrs r0, 24
ldrb r3, [r4]
@ -13365,7 +13365,7 @@ _0813B294:
negs r0, r0
b _0813B2C0
.align 2, 0
_0813B29C: .4byte gUnknown_203B16C
_0813B29C: .4byte gLastViewedMonIndex
_0813B2A0: .4byte gUnknown_203B140
_0813B2A4: .4byte 0x00003210
_0813B2A8:
@ -13514,7 +13514,7 @@ _0813B39E:
bhi _0813B3B6
ldr r4, _0813B3D4 @ =gUnknown_8463FB8
adds r4, r5, r4
bl sub_8138B20
bl GetLastViewedMonIndex
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24

28
asm/region_map.s
View File

@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@ -7477,7 +7477,7 @@ _080C3BAC:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r0, _080C3BEC @ =gUnknown_20399E4
ldr r1, [r0]
@ -7506,7 +7506,7 @@ _080C3BF0:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r0, _080C3C28 @ =gUnknown_20399E4
ldr r1, [r0]
@ -7543,7 +7543,7 @@ _080C3C2C:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
b _080C3C8E
.align 2, 0
@ -7564,7 +7564,7 @@ _080C3C68:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r1, [r4]
ldrb r0, [r2, 0x14]
@ -9761,8 +9761,8 @@ _080C4DF2:
bx r1
thumb_func_end GetMapName
thumb_func_start sub_80C4DF8
sub_80C4DF8: @ 80C4DF8
thumb_func_start GetMapNameGeneric
GetMapNameGeneric: @ 80C4DF8
push {lr}
lsls r1, 16
lsrs r1, 16
@ -9770,14 +9770,14 @@ sub_80C4DF8: @ 80C4DF8
bl GetMapName
pop {r1}
bx r1
thumb_func_end sub_80C4DF8
thumb_func_end GetMapNameGeneric
thumb_func_start sub_80C4E08
sub_80C4E08: @ 80C4E08
push {lr}
lsls r1, 16
lsrs r1, 16
bl sub_80C4DF8
bl GetMapNameGeneric
pop {r1}
bx r1
thumb_func_end sub_80C4E08
@ -9893,15 +9893,15 @@ _080C4EF2:
bx r0
thumb_func_end sub_80C4ED0
thumb_func_start sub_80C4EF8
sub_80C4EF8: @ 80C4EF8
thumb_func_start MCB2_FlyMap
MCB2_FlyMap: @ 80C4EF8
push {lr}
bl sub_80C51E8
movs r0, 0x2
bl sub_80BFEDC
pop {r0}
bx r0
thumb_func_end sub_80C4EF8
thumb_func_end MCB2_FlyMap
thumb_func_start sub_80C4F08
sub_80C4F08: @ 80C4F08
@ -10283,7 +10283,7 @@ _080C5220:
_080C5250: .4byte gUnknown_20399FC
_080C5254: .4byte CB2_ReturnToField
_080C5258:
ldr r0, _080C5274 @ =sub_8124AB0
ldr r0, _080C5274 @ =CB2_ReturnToPartyMenuFromFlyMap
bl SetMainCallback2
_080C525E:
ldr r4, _080C5278 @ =gUnknown_20399FC
@ -10298,7 +10298,7 @@ _080C526E:
pop {r0}
bx r0
.align 2, 0
_080C5274: .4byte sub_8124AB0
_080C5274: .4byte CB2_ReturnToPartyMenuFromFlyMap
_080C5278: .4byte gUnknown_20399FC
thumb_func_end sub_80C5208

4
asm/script_pokemon_util_80A0058.s
View File

@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334
ldr r0, _080A034C @ =sub_80A0350
str r0, [r1, 0x8]
movs r0, 0
bl sub_81274A8
bl InitChooseHalfPartyForBattle
pop {r0}
bx r0
.align 2, 0
@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380
ldr r0, _080A0398 @ =sub_80A039C
str r0, [r1, 0x8]
movs r0, 0x1
bl sub_81274A8
bl InitChooseHalfPartyForBattle
pop {r0}
bx r0
.align 2, 0

2
asm/script_pokemon_util_80BF8FC.s
View File

@ -88,7 +88,7 @@ sub_80BF97C: @ 80BF97C
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x8]
bl sub_81283A8
bl ChoosePartyMonByMenuType
adds r0, r4, 0
bl DestroyTask
_080BF9AC:

8
asm/shop.s
View File

@ -291,7 +291,7 @@ sub_809ACD4: @ 809ACD4
ldr r2, _0809ACEC @ =CB2_ReturnToField
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
ldr r1, _0809ACF0 @ =gFieldCallback
ldr r0, _0809ACF4 @ =sub_809AD74
str r0, [r1]
@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -793,7 +793,7 @@ _0809B118:
movs r1, 0
movs r2, 0xE
movs r3, 0x1E
bl SetBgRectPal
bl SetBgTilemapPalette
b _0809B14E
.align 2, 0
_0809B138: .4byte gUnknown_2039934
@ -805,7 +805,7 @@ _0809B13C:
movs r1, 0
movs r2, 0xC
movs r3, 0x1E
bl SetBgRectPal
bl SetBgTilemapPalette
_0809B14E:
movs r0, 0x1
bl ScheduleBgCopyTilemapToVram

BIN
baserom.ips
View File

Binary file not shown.

1
common_syms/party_menu.txt Normal file
View File

@ -0,0 +1 @@
gItemUseCB

2923
data/battle_message.s
View File

File diff suppressed because it is too large Load Diff

6
data/battle_scripts_1.s
View File

@ -3167,7 +3167,7 @@ BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
printfromtable gSandstormHailContinuesStringIds
waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0
@ -3175,7 +3175,7 @@ BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd
printfromtable gSandStormHailDmgStringIds
printfromtable gSandstormHailDmgStringIds
waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
@ -3193,7 +3193,7 @@ BattleScript_WeatherDamageEndedBattle::
end2
BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds
printfromtable gSandstormHailEndStringIds
waitmessage 0x40
end2

6
data/event_scripts.s
View File

@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A
goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059
setvar VAR_0x8005, 0
special sub_8127888
special ChooseMonForWirelessMinigame
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184
goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059
setvar VAR_0x8005, 1
special sub_8127888
special ChooseMonForWirelessMinigame
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
@ -13968,7 +13968,7 @@ EventScript_1C4F26:: @ 81C4F26
end
EventScript_1C4F30:: @ 81C4F30
special sub_812781C
special ChooseMonForMoveTutor
waitstate
lock
faceplayer

16
data/graphics.s
View File

@ -13892,35 +13892,35 @@ gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8
.incbin "graphics/battle_anims/sprites/188.gbapal.lz"
.align 2
gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700
gPartyMenuBg_Gfx:: @ 8E82700
.incbin "graphics/interface/party_menu_misc.4bpp.lz"
.align 2
gUnknown_8E829C8:: @ 8E829C8
gPartyMenuBg_Pal:: @ 8E829C8
.incbin "baserom.gba", 0xE829C8, 0xE8
.align 2
gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0
gPartyMenuBg_Tilemap:: @ 8E82AB0
.incbin "graphics/interface/party_menu_misc.bin.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8
gPartyMenuPokeball_Gfx:: @ 8E82BE8
.incbin "graphics/interface/party_menu_pokeball.4bpp.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68
gPartyMenuPokeballSmall_Gfx:: @ 8E82D68
.incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C
gPartyMenuPokeball_Pal:: @ 8E82E7C
.incbin "graphics/interface/party_menu_pokeball.gbapal.lz"
.align 2
gUnknown_8E82EA0:: @ 8E82EA0
gStatusGfx_Icons:: @ 8E82EA0
.incbin "baserom.gba", 0xE82EA0, 0x204
.align 2
gFile_graphics_interface_status_icons_palette:: @ 8E830A4
gStatusPal_Icons:: @ 8E830A4
.incbin "graphics/interface/status_icons.gbapal.lz"
.align 2

261
data/link_rfu.s
View File

@ -7,82 +7,259 @@
.align 2
gUnknown_843F29C:: @ 843F29C
.incbin "baserom.gba", 0x43F29C, 0x8
.2byte 0x143a, 0x1817, 0x100b, 0x200f
gUnknown_843F2A4:: @ 843F2A4
.incbin "baserom.gba", 0x43F2A4, 0x8
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_843F2AC:: @ 843F2AC
.incbin "baserom.gba", 0x43F2AC, 0xF0
.byte 0, 2, 2, 0
.4byte gUnknown_8418A2B
.4byte gUnknown_84186D1
.4byte gUnknown_84186EF
.4byte gUnknown_841880E
.4byte gUnknown_8418902
.byte 1, 2, 3, 1
.4byte gUnknown_8418A33
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841881B
.4byte gUnknown_8418902
.byte 2, 2, 3, 1
.4byte gUnknown_8418A4A
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841883E
.4byte gUnknown_8418902
.byte 3, 2, 3, 1
.4byte gUnknown_8418A61
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841885F
.4byte gUnknown_8418902
.byte 4, 2, 5, 2
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte gUnknown_841888C
.4byte gUnknown_8418902
.byte 5, 2, 2, 0
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte NULL
.4byte NULL
.byte 6, 2, 3, 1
.4byte gUnknown_8418A77
.4byte gUnknown_84187B2
.4byte gUnknown_84187D1
.4byte gUnknown_84188AC
.4byte gUnknown_8418902
.byte 7, 2, 3, 1
.4byte gUnknown_8418AA1
.4byte gUnknown_8418745
.4byte gUnknown_8418763
.4byte gUnknown_8418881
.4byte gUnknown_8418902
.byte 9, 2, 1, 3
.4byte gUnknown_8418A87
.4byte gUnknown_84188B9
.4byte gUnknown_84188D6
.4byte gUnknown_84188F0
.4byte gUnknown_8418902
.byte 14, 2, 2, 0
.4byte gUnknown_8418AB2
.4byte gUnknown_84186D1
.4byte gUnknown_84187EE
.4byte gUnknown_8418881
.4byte gUnknown_8418902
gUnknown_843F39C:: @ 843F39C
.incbin "baserom.gba", 0x43F39C, 0x3D0
gUnknown_843F39C:: @ 843F39C data8 4x7
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_843F76C:: @ 843F76C
gUnknown_843F3B8:: @ 843F3B8
.incbin "baserom.gba", 0x43F3B8, 0x20
gUnknown_843F3D8:: @ 843F3D8
.incbin "baserom.gba", 0x43F3D8, 0x20
gUnknown_843F3F8:: @ 843F3F8
.incbin "baserom.gba", 0x43F3F8, 0x20
gUnknown_843F418:: @ 843F418
.incbin "baserom.gba", 0x43F418, 0x100
gUnknown_843F518:: @ 843F518
.incbin "baserom.gba", 0x43F518, 0x100
gUnknown_843F618:: @ 843F618
.incbin "baserom.gba", 0x43F618, 0x20
gUnknown_843F638:: @ 843F638
.incbin "baserom.gba", 0x43F638, 0x134
gUnknown_843F76C:: @ 843F76C gbapal
.incbin "baserom.gba", 0x43F76C, 0x20
gUnknown_843F78C:: @ 843F78C
gUnknown_843F78C:: @ 843F78C gbapal
.incbin "baserom.gba", 0x43F78C, 0x20
gUnknown_843F7AC:: @ 843F7AC
gUnknown_843F7AC:: @ 843F7AC 4bpp.lz
.incbin "baserom.gba", 0x43F7AC, 0xC8
gUnknown_843F874:: @ 843F874
gUnknown_843F874:: @ 843F874 gbapal
.incbin "baserom.gba", 0x43F874, 0x8
gUnknown_843F87C:: @ 843F87C
gUnknown_843F87C:: @ 843F87C gbapal
.incbin "baserom.gba", 0x43F87C, 0xC
gUnknown_843F888:: @ 843F888
.incbin "baserom.gba", 0x43F888, 0x18
gUnknown_843F888:: @ 843F888 data8 6x4
.byte 0x03, 0x04, 0x18, 0x04, 0x01, 0x04, 0x1b, 0x04, 0x03, 0x00, 0x18, 0x0a, 0x06, 0x06, 0x12, 0x04, 0x10, 0x04, 0x09, 0x02, 0x0e, 0x04, 0x12, 0x04
gUnknown_843F8A0:: @ 843F8A0
.incbin "baserom.gba", 0x43F8A0, 0x10
gUnknown_843F8A0:: @ 843F8A0 bg_template
.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
gUnknown_843F8B0:: @ 843F8B0
.incbin "baserom.gba", 0x43F8B0, 0x20
gUnknown_843F8B0:: @ 843F8B0 window_template
.align 2
.byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a
.2byte 0x0010
@ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010}
.align 2
.byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f
.2byte 0x000a
@ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a}
.align 2
.byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03
.2byte 0x0000
@ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000}
.align 2
.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
.2byte 0x0000
@ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000}
gUnknown_843F8D0:: @ 843F8D0
.incbin "baserom.gba", 0x43F8D0, 0x8
gUnknown_843F8D0:: @ 843F8D0 window_template
.align 2
.byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f
.2byte 0x0062
@ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062}
gUnknown_843F8D8:: @ 843F8D8
.incbin "baserom.gba", 0x43F8D8, 0x3
gUnknown_843F8D8:: @ 843F8D8 text
.string "{UNDERSCORE}$"
gUnknown_843F8DB:: @ 843F8DB
.incbin "baserom.gba", 0x43F8DB, 0x5
gUnknown_843F8DB:: @ 843F8DB text
.string "{CLEAR 17}$"
.align 2
gUnknown_843F8E0:: @ 843F8E0
.4byte gUnknown_847A8D8
.4byte gUnknown_847A8FA
.4byte gUnknown_847A913
.4byte gUnknown_847A934
gUnknown_843F8F0:: @ 843F8F0
.incbin "baserom.gba", 0x43F8F0, 0x20
gUnknown_843F8F0:: @ 843F8F0 sprite_sheet
obj_tiles gUnknown_843F3F8, 0x0020, 0
obj_tiles gUnknown_843F418, 0x0100, 2
obj_tiles gUnknown_843F518, 0x0100, 3
obj_tiles NULL, 0x0000, 0
gUnknown_843F910:: @ 843F910
.incbin "baserom.gba", 0x43F910, 0x28
gUnknown_843F910:: @ 843F910 sprite_palette
obj_pal gUnknown_843F3B8, 0
obj_pal gUnknown_843F3D8, 1
obj_pal gUnknown_8E99F24, 2
obj_pal gUnknown_843F618, 3
null_obj_pal
gUnknown_843F938:: @ 843F938
.incbin "baserom.gba", 0x43F938, 0x20
gUnknown_843F938:: @ 843F938 sprite_sheet
obj_tiles gUnknown_843F638, 0x0800, 5
obj_tiles gUnknown_8E9BD28, 0x1000, 1
obj_tiles gUnknown_8E99F44, 0x0800, 6
obj_tiles gUnknown_8E9A168, 0x1000, 4
gUnknown_843F958:: @ 843F958
.incbin "baserom.gba", 0x43F958, 0x10
gUnknown_843F958:: @ 843F958 data8
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
gUnknown_843F968:: @ 843F968
.incbin "baserom.gba", 0x43F968, 0x50
gUnknown_843F960::
.4byte 0x00000000, 0x00000c00
gUnknown_843F9B8:: @ 843F9B8
.incbin "baserom.gba", 0x43F9B8, 0x68
gUnknown_843F968:: @ 843F968 sprite_template
spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20
gUnknown_843FA20:: @ 843FA20
.incbin "baserom.gba", 0x43FA20, 0x20
gUnknown_843F980::
.4byte 0xc0004000, 0x00000400
gUnknown_843FA40:: @ 843FA40
.incbin "baserom.gba", 0x43FA40, 0x40
gUnknown_843F988::
.incbin "baserom.gba", 0x43F988, 0x8
gUnknown_843FA80:: @ 843FA80
.incbin "baserom.gba", 0x43FA80, 0x18
gUnknown_843F990::
.incbin "baserom.gba", 0x43F990, 0x8
gUnknown_843FA98:: @ 843FA98
.incbin "baserom.gba", 0x43FA98, 0x18
gUnknown_843F998::
.incbin "baserom.gba", 0x43F998, 0x8
gUnknown_843F9A0::
.incbin "baserom.gba", 0x43F9A0, 0x8
gUnknown_843F9A8::
.4byte 0x843f988
.4byte 0x843f990
.4byte 0x843f998
.4byte 0x843f9a0
gUnknown_843F9B8:: @ 843F9B8 sprite_template
spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20
gUnknown_843F9D0::
.4byte 0xc0004000, 0x00000400
gUnknown_843F9D8::
.incbin "baserom.gba", 0x43F9D8, 0x8
gUnknown_843F9E0::
.incbin "baserom.gba", 0x43F9E0, 0xC
gUnknown_843F9EC::
.incbin "baserom.gba", 0x43F9EC, 0xC
gUnknown_843F9F8::
.incbin "baserom.gba", 0x43F9F8, 0xC
gUnknown_843FA04::
.incbin "baserom.gba", 0x43FA04, 0x8
gUnknown_843FA0C::
.4byte gUnknown_843F9D8
.4byte gUnknown_843F9E0
.4byte gUnknown_843F9EC
.4byte gUnknown_843F9F8
.4byte gUnknown_843FA04
gUnknown_843FA20:: @ 843FA20 sprite_template
spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA38::
.4byte 0xc0000000, 0x00000c00
gUnknown_843FA40:: @ 843FA40 sprite_template
spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA58::
.4byte 0x40004000, 0x00000400
gUnknown_843FA60::
.4byte 0x40000000, 0x00000400
gUnknown_843FA68::
.incbin "baserom.gba", 0x43FA68, 0x8
gUnknown_843FA70::
.incbin "baserom.gba", 0x43FA70, 0x8
gUnknown_843FA78::
.4byte gUnknown_843FA68
.4byte gUnknown_843FA70
gUnknown_843FA80:: @ 843FA80 sprite_template
spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA98:: @ 843FA98 sprite_template
spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

672
data/party_menu.s
View File

@ -1,672 +0,0 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gMoveTutorMoves:: @ 8459B60
.2byte MOVE_MEGA_PUNCH
.2byte MOVE_SWORDS_DANCE
.2byte MOVE_MEGA_KICK
.2byte MOVE_BODY_SLAM
.2byte MOVE_DOUBLE_EDGE
.2byte MOVE_COUNTER
.2byte MOVE_SEISMIC_TOSS
.2byte MOVE_MIMIC
.2byte MOVE_METRONOME
.2byte MOVE_SOFT_BOILED
.2byte MOVE_DREAM_EATER
.2byte MOVE_THUNDER_WAVE
.2byte MOVE_EXPLOSION
.2byte MOVE_ROCK_SLIDE
.2byte MOVE_SUBSTITUTE
gMoveTutorMoveCompatibilityTable:: @ 8459B7E
.2byte 0x0000
.2byte 0x409a
.2byte 0x409a
.2byte 0x409a
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x0000
.2byte 0x0000
.2byte 0x4490
.2byte 0x0000
.2byte 0x0000
.2byte 0x4092
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x48b8
.2byte 0x48b8
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x48fd
.2byte 0x48fd
.2byte 0x60fa
.2byte 0x60fa
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x60fd
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x60fd
.2byte 0x4ffd
.2byte 0x4ffd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4cfd
.2byte 0x4cfd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4092
.2byte 0x4092
.2byte 0x409a
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x4498
.2byte 0x4498
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x41fd
.2byte 0x41fd
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4092
.2byte 0x4092
.2byte 0x409a
.2byte 0x4092
.2byte 0x4092
.2byte 0x71f9
.2byte 0x71f9
.2byte 0x71fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4c98
.2byte 0x4cfd
.2byte 0x4890
.2byte 0x4890
.2byte 0x409a
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x5088
.2byte 0x5088
.2byte 0x5090
.2byte 0x5090
.2byte 0x5480
.2byte 0x5480
.2byte 0x55fd
.2byte 0x7098
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x409a
.2byte 0x409a
.2byte 0x5880
.2byte 0x5880
.2byte 0x5490
.2byte 0x5490
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x64ff
.2byte 0x5080
.2byte 0x5080
.2byte 0x60ba
.2byte 0x60ff
.2byte 0x4ffd
.2byte 0x409a
.2byte 0x60fd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4890
.2byte 0x4c90
.2byte 0x4dfd
.2byte 0x40b2
.2byte 0x45fd
.2byte 0x48fd
.2byte 0x40fd
.2byte 0x60da
.2byte 0x4098
.2byte 0x0000
.2byte 0x4898
.2byte 0x4498
.2byte 0x0000
.2byte 0x4098
.2byte 0x4098
.2byte 0x4898
.2byte 0x4098
.2byte 0x4c90
.2byte 0x6098
.2byte 0x60d8
.2byte 0x6098
.2byte 0x60de
.2byte 0x6090
.2byte 0x61fd
.2byte 0x4090
.2byte 0x4890
.2byte 0x4090
.2byte 0x4898
.2byte 0x4898
.2byte 0x4898
.2byte 0x4dfd
.2byte 0x7fff
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4098
.2byte 0x4098
.2byte 0x60fd
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x4098
.2byte 0x4098
.2byte 0x4490
.2byte 0x4490
.2byte 0x4093
.2byte 0x4093
.2byte 0x4098
.2byte 0x4098
.2byte 0x4090
.2byte 0x4890
.2byte 0x4890
.2byte 0x48fd
.2byte 0x4ffd
.2byte 0x4cfd
.2byte 0x4ffd
.2byte 0x4ffd
.2byte 0x4c90
.2byte 0x4c90
.2byte 0x4898
.2byte 0x48fd
.2byte 0x48fd
.2byte 0x4092
.2byte 0x40dd
.2byte 0x40dd
.2byte 0x70fd
.2byte 0x41fd
.2byte 0x4092
.2byte 0x4092
.2byte 0x4092
.2byte 0x4dfd
.2byte 0x4092
.2byte 0x4092
.2byte 0x4490
.2byte 0x4098
.2byte 0x40fd
.2byte 0x4498
.2byte 0x4498
.2byte 0x4c90
.2byte 0x4cfd
.2byte 0x4c90
.2byte 0x0000
.2byte 0x0000
.2byte 0x4c98
.2byte 0x70b8
.2byte 0x70b8
.2byte 0x6cb8
.2byte 0x64b2
.2byte 0x7098
.2byte 0x49fd
.2byte 0x69fd
.2byte 0x4892
.2byte 0x40b2
.2byte 0x6098
.2byte 0x60fa
.2byte 0x44b2
.2byte 0x41ff
.2byte 0x61ff
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x7098
.2byte 0x4890
.2byte 0x48d0
.2byte 0x40fd
.2byte 0x4098
.2byte 0x60b0
.2byte 0x44b8
.2byte 0x44b8
.2byte 0x4098
.2byte 0x40b8
.2byte 0x60b8
.2byte 0x4c90
.2byte 0x4c98
.2byte 0x0000
.2byte 0x60fc
.2byte 0x60fc
.2byte 0x45fd
.2byte 0x48fd
.2byte 0x40fd
.2byte 0x69fd
.2byte 0x4ffd
.2byte 0x4898
.2byte 0x4098
.2byte 0x4098
.2byte 0x6098
.2byte 0x6098
.2byte 0x68fd
.2byte 0x4c98
.2byte 0x4c90
.2byte 0x4592
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x40ff
.2byte 0x40ff
.2byte 0x40ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x4098
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x4898
.2byte 0x4898
.2byte 0x0000
.2byte 0x0000
.2byte 0x4090
.2byte 0x0000
.2byte 0x4090
.2byte 0x409a
.2byte 0x409a
.2byte 0x41ff
.2byte 0x509a
.2byte 0x509e
.2byte 0x509e
.2byte 0x4090
.2byte 0x4092
.2byte 0x4490
.2byte 0x40b0
.2byte 0x40b0
.2byte 0x409a
.2byte 0x40ff
.2byte 0x65fd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4098
.2byte 0x4098
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x69fd
.2byte 0x7490
.2byte 0x7490
.2byte 0x7898
.2byte 0x7098
.2byte 0x45fd
.2byte 0x4090
.2byte 0x6090
.2byte 0x4090
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4090
.2byte 0x4098
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4898
.2byte 0x4898
.2byte 0x6098
.2byte 0x7098
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x40fb
.2byte 0x40ff
.2byte 0x4098
.2byte 0x5098
.2byte 0x7498
.2byte 0x7498
.2byte 0x4098
.2byte 0x4498
.2byte 0x44fd
.2byte 0x49fd
.2byte 0x49fd
.2byte 0x60ff
.2byte 0x45fd
.2byte 0x65fd
.2byte 0x4498
.2byte 0x4498
.2byte 0x0000
.2byte 0x4498
.2byte 0x65fd
.2byte 0x409a
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x54b8
.2byte 0x54b8
.2byte 0x409a
.2byte 0x40fd
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x6cba
.2byte 0x4c98
.2byte 0x4d98
.2byte 0x4098
.2byte 0x68ff
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x68fd
.2byte 0x4898
.2byte 0x49fd
.2byte 0x49fd
.2byte 0x6098
.2byte 0x6098
.2byte 0x609a
.2byte 0x60da
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x0000
.2byte 0x7098
.2byte 0x7098
.2byte 0x78fd
.2byte 0x78fd
.2byte 0x78fd
.2byte 0x6898
.2byte 0x68ff
.2byte 0x6898
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x4d98
.2byte 0x6cfd
.2byte 0x4490
.align 2
gUnknown_8459EB8:: @ 8459EB8
.incbin "baserom.gba", 0x459EB8, 0xC
gUnknown_8459EC4:: @ 8459EC4
.incbin "baserom.gba", 0x459EC4, 0x20
gUnknown_8459EE4:: @ 8459EE4
.incbin "baserom.gba", 0x459EE4, 0x20
gUnknown_8459F04:: @ 8459F04
.incbin "baserom.gba", 0x459F04, 0xC0
gUnknown_8459FC4:: @ 8459FC4
.incbin "baserom.gba", 0x459FC4, 0x1C
gUnknown_8459FE0:: @ 8459FE0
.incbin "baserom.gba", 0x459FE0, 0x1C
gUnknown_8459FFC:: @ 8459FFC
.incbin "baserom.gba", 0x459FFC, 0xF
gUnknown_845A00B:: @ 845A00B
.incbin "baserom.gba", 0x45A00B, 0x5
gUnknown_845A010:: @ 845A010
.incbin "baserom.gba", 0x45A010, 0x40
gUnknown_845A050:: @ 845A050
.incbin "baserom.gba", 0x45A050, 0x40
gUnknown_845A090:: @ 845A090
.incbin "baserom.gba", 0x45A090, 0x40
gUnknown_845A0D0:: @ 845A0D0
.incbin "baserom.gba", 0x45A0D0, 0x38
gUnknown_845A108:: @ 845A108
.incbin "baserom.gba", 0x45A108, 0x8
gUnknown_845A110:: @ 845A110
.incbin "baserom.gba", 0x45A110, 0x8
gUnknown_845A118:: @ 845A118
.incbin "baserom.gba", 0x45A118, 0x8
gUnknown_845A120:: @ 845A120
.incbin "baserom.gba", 0x45A120, 0x8
gUnknown_845A128:: @ 845A128
.incbin "baserom.gba", 0x45A128, 0x8
gUnknown_845A130:: @ 845A130
.incbin "baserom.gba", 0x45A130, 0x8
gUnknown_845A138:: @ 845A138
.incbin "baserom.gba", 0x45A138, 0x8
gUnknown_845A140:: @ 845A140
.incbin "baserom.gba", 0x45A140, 0x8
gUnknown_845A148:: @ 845A148
.incbin "baserom.gba", 0x45A148, 0x8
gUnknown_845A150:: @ 845A150
.incbin "baserom.gba", 0x45A150, 0x8
gUnknown_845A158:: @ 845A158
.incbin "baserom.gba", 0x45A158, 0x8
gUnknown_845A160:: @ 845A160
.incbin "baserom.gba", 0x45A160, 0x8
gUnknown_845A168:: @ 845A168
.incbin "baserom.gba", 0x45A168, 0x8
gUnknown_845A170:: @ 845A170
.incbin "baserom.gba", 0x45A170, 0x8
gUnknown_845A178:: @ 845A178
.incbin "baserom.gba", 0x45A178, 0x8
gUnknown_845A180:: @ 845A180
.incbin "baserom.gba", 0x45A180, 0x46
gUnknown_845A1C6:: @ 845A1C6
.incbin "baserom.gba", 0x45A1C6, 0x46
gUnknown_845A20C:: @ 845A20C
.incbin "baserom.gba", 0x45A20C, 0x36
gUnknown_845A242:: @ 845A242
.incbin "baserom.gba", 0x45A242, 0x36
gUnknown_845A278:: @ 845A278
.incbin "baserom.gba", 0x45A278, 0x36
gUnknown_845A2AE:: @ 845A2AE
.incbin "baserom.gba", 0x45A2AE, 0x2
gUnknown_845A2B0:: @ 845A2B0
.incbin "baserom.gba", 0x45A2B0, 0x2
gUnknown_845A2B2:: @ 845A2B2
.incbin "baserom.gba", 0x45A2B2, 0x3
gUnknown_845A2B5:: @ 845A2B5
.incbin "baserom.gba", 0x45A2B5, 0x3
gUnknown_845A2B8:: @ 845A2B8
.incbin "baserom.gba", 0x45A2B8, 0x2
gUnknown_845A2BA:: @ 845A2BA
.incbin "baserom.gba", 0x45A2BA, 0x2
gUnknown_845A2BC:: @ 845A2BC
.incbin "baserom.gba", 0x45A2BC, 0x2
gUnknown_845A2BE:: @ 845A2BE
.incbin "baserom.gba", 0x45A2BE, 0x2
gUnknown_845A2C0:: @ 845A2C0
.incbin "baserom.gba", 0x45A2C0, 0x2
gUnknown_845A2C2:: @ 845A2C2
.incbin "baserom.gba", 0x45A2C2, 0x3
gUnknown_845A2C5:: @ 845A2C5
.incbin "baserom.gba", 0x45A2C5, 0x3
gUnknown_845A2C8:: @ 845A2C8
.incbin "baserom.gba", 0x45A2C8, 0x3
gUnknown_845A2CB:: @ 845A2CB
.incbin "baserom.gba", 0x45A2CB, 0x3
gUnknown_845A2CE:: @ 845A2CE
.incbin "baserom.gba", 0x45A2CE, 0x3
gUnknown_845A2D1:: @ 845A2D1
.incbin "baserom.gba", 0x45A2D1, 0x3
gUnknown_845A2D4:: @ 845A2D4
.incbin "baserom.gba", 0x45A2D4, 0x3
gUnknown_845A2D7:: @ 845A2D7
.incbin "baserom.gba", 0x45A2D7, 0x3
gUnknown_845A2DA:: @ 845A2DA
.incbin "baserom.gba", 0x45A2DA, 0x3
gUnknown_845A2DD:: @ 845A2DD
.incbin "baserom.gba", 0x45A2DD, 0x3
gUnknown_845A2E0:: @ 845A2E0
.incbin "baserom.gba", 0x45A2E0, 0x3
gUnknown_845A2E3:: @ 845A2E3
.incbin "baserom.gba", 0x45A2E3, 0x5
gUnknown_845A2E8:: @ 845A2E8
.incbin "baserom.gba", 0x45A2E8, 0x6C
gUnknown_845A354:: @ 845A354
.incbin "baserom.gba", 0x45A354, 0x28
gUnknown_845A37C:: @ 845A37C
.incbin "baserom.gba", 0x45A37C, 0xB0
gUnknown_845A42C:: @ 845A42C
.incbin "baserom.gba", 0x45A42C, 0x8
gUnknown_845A434:: @ 845A434
.incbin "baserom.gba", 0x45A434, 0x8
gUnknown_845A43C:: @ 845A43C
.incbin "baserom.gba", 0x45A43C, 0x38
gUnknown_845A474:: @ 845A474
.incbin "baserom.gba", 0x45A474, 0x8
gUnknown_845A47C:: @ 845A47C
.incbin "baserom.gba", 0x45A47C, 0x8
gUnknown_845A484:: @ 845A484
.incbin "baserom.gba", 0x45A484, 0x68
gUnknown_845A4EC:: @ 845A4EC
.incbin "baserom.gba", 0x45A4EC, 0x8
gUnknown_845A4F4:: @ 845A4F4
.incbin "baserom.gba", 0x45A4F4, 0x80
gUnknown_845A574:: @ 845A574
.incbin "baserom.gba", 0x45A574, 0x8
gUnknown_845A57C:: @ 845A57C
.incbin "baserom.gba", 0x45A57C, 0x8
gUnknown_845A584:: @ 845A584
.incbin "baserom.gba", 0x45A584, 0x18
gUnknown_845A59C:: @ 845A59C
.incbin "baserom.gba", 0x45A59C, 0x7C
gUnknown_845A618:: @ 845A618
.incbin "baserom.gba", 0x45A618, 0x114
gUnknown_845A72C:: @ 845A72C
.incbin "baserom.gba", 0x45A72C, 0x34
gUnknown_845A760:: @ 845A760
.incbin "baserom.gba", 0x45A760, 0xE
gUnknown_845A76E:: @ 845A76E
.incbin "baserom.gba", 0x45A76E, 0x1A
gUnknown_845A788:: @ 845A788
.incbin "baserom.gba", 0x45A788, 0x60
gUnknown_845A7E8:: @ 845A7E8
.4byte gUnknown_841718C @ Not what other player wants
.4byte gUnknown_84171CC @ Not an egg
.4byte gUnknown_84170BC @ Mon can't be traded
.4byte gUnknown_84170BC @ Mon can't be traded
.4byte gUnknown_84170FC @ Other trainer's mon can't be traded
.4byte gUnknown_84170E0 @ Egg can't be traded
.4byte gUnknown_8417130 @ Other trainer can't accept
.4byte gUnknown_8417164 @ Can't trade with trainer now
.4byte gUnknown_8417164 @ Can't trade with trainer now
gUnknown_845A80C:: @ 845A80C
.incbin "baserom.gba", 0x45A80C, 0x74

4
data/specials.inc
View File

@ -405,8 +405,8 @@ gSpecials:: @ 815FD60
def_special get_unknown_box_id
def_special Special_OpenMuseumFossilPic
def_special Special_CloseMuseumFossilPic
def_special sub_812781C
def_special sub_8127888
def_special ChooseMonForMoveTutor
def_special ChooseMonForWirelessMinigame
def_special SetBattledTrainerFlag
def_special sub_812B35C
def_special Special_SSAnneDepartureCutscene

252
data/strings.s
View File

@ -433,16 +433,16 @@ gString_Dummy:: @ 84161CD
gUnknown_84161CE::
.string "キャンセル$"
gUnknown_84161D4::
gText_Item::
.string "ITEM$"
gUnknown_84161D9::
gText_Mail::
.string "MAIL$"
gUnknown_84161DE::
gText_Take::
.string "TAKE$"
gUnknown_84161E3::
gText_Store::
.string "STORE$"
gUnknown_84161E9::
@ -463,7 +463,7 @@ gUnknown_8416202:: @ 8416202
gUnknown_8416206::
.string "?????$"
gUnknown_841620C:: @ 841620C
gText_Slash:: @ 841620C
.string "/$"
gUnknown_841620E:: @ 841620E
@ -478,10 +478,10 @@ gText_ThreeHyphens:: @ 8416213
gUnknown_8416217:: @ 8416217
.string "-------$"
gUnknown_841621F:: @ 841621F
gText_MaleSymbol:: @ 841621F
.string "♂$"
gUnknown_8416221:: @ 8416221
gText_FemaleSymbol:: @ 8416221
.string "♀$"
gText_Lv:: @ 8416223
@ -804,85 +804,85 @@ gText_TurnedOverItemsWorthYen:: @ 8416959
gText_PokedollarVar1:: @ 841697A
.string "¥{STR_VAR_1}$"
gUnknown_841697E:: @ 0x841697E
gText_Shift:: @ 0x841697E
.string "SHIFT$"
gUnknown_8416984:: @ 0x8416984
gText_SendOut:: @ 0x8416984
.string "SEND OUT$"
gUnknown_841698D:: @ 0x841698D
gText_Switch2:: @ 0x841698D
.string "SWITCH$"
gUnknown_8416994:: @ 0x8416994
gText_Summary5:: @ 0x8416994
.string "SUMMARY$"
gUnknown_841699C:: @ 0x841699C
.string "つかえるわざ$"
gUnknown_84169A3:: @ 0x84169A3
gText_Enter:: @ 0x84169A3
.string "ENTER$"
gUnknown_84169A9:: @ 0x84169A9
gText_NoEntry:: @ 0x84169A9
.string "NO ENTRY$"
gUnknown_84169B2:: @ 0x84169B2
gText_Take2:: @ 0x84169B2
.string "TAKE$"
gUnknown_84169B7:: @ 0x84169B7
gText_Read2:: @ 0x84169B7
.string "READ$"
gUnknown_84169BC:: @ 0x84169BC
gText_Trade4:: @ 0x84169BC
.string "TRADE$"
gUnknown_84169C2:: @ 84169C2
gText_HP3:: @ 84169C2
.string "HP$"
gUnknown_84169C5:: @ 84169C5
gText_SpAtk3:: @ 84169C5
.string "SP. ATK$"
gUnknown_84169CD:: @ 84169CD
gText_SpDef3:: @ 84169CD
.string "SP. DEF$"
gUnknown_84169D5:: @ 84169D5
gMenuText_Confirm:: @ 84169D5
.string "OK$"
gUnknown_84169D8:: @ 0x84169D8
.string "$"
gUnknown_84169D9:: @ 84169D9
gText_PauseUntilPress:: @ 84169D9
.string "{PAUSE_UNTIL_PRESS}$"
gUnknown_84169DC:: @ 84169DC
gText_WontHaveEffect:: @ 84169DC
.string "It won't have any effect.{PAUSE_UNTIL_PRESS}$"
gUnknown_84169F8:: @ 84169F8
.string "This can't be used on\n"
.string "that POKéMON.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A1E:: @ 8416A1E
gText_PkmnCantSwitchOut:: @ 8416A1E
.string "{STR_VAR_1} can't be switched\n"
.string "out!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A3A:: @ 8416A3A
gText_PkmnAlreadyInBattle:: @ 8416A3A
.string "{STR_VAR_1} is already\n"
.string "in battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A55:: @ 8416A55
gText_PkmnAlreadySelected:: @ 8416A55
.string "{STR_VAR_1} has already been\n"
.string "selected.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A75:: @ 8416A75
gText_PkmnHasNoEnergy:: @ 8416A75
.string "{STR_VAR_1} has no energy\n"
.string "left to battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A98:: @ 8416A98
gText_CantSwitchWithAlly:: @ 8416A98
.string "You can't switch {STR_VAR_1}'s\n"
.string "POKéMON with one of yours!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416ACB:: @ 8416ACB
gText_EggCantBattle:: @ 8416ACB
.string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416AE2:: @ 8416AE2
gText_CantUseUntilNewBadge:: @ 8416AE2
.string "This can't be used until a new\n"
.string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$"
@ -894,73 +894,73 @@ gUnknown_8416B3E:: @ 8416B3E
.string "No more than two POKéMON\n"
.string "may enter.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416B64:: @ 8416B64
gText_SendMailToPC:: @ 8416B64
.string "Send the removed MAIL to\n"
.string "your PC?$"
gUnknown_8416B86:: @ 8416B86
gText_MailSentToPC:: @ 8416B86
.string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416BA6:: @ 8416BA6
gText_PCMailboxFull:: @ 8416BA6
.string "Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416BC3:: @ 8416BC3
gText_MailMessageWillBeLost:: @ 8416BC3
.string "If the MAIL is removed, the\n"
.string "message will be lost. Okay?$"
gUnknown_8416BFB:: @ 8416BFB
gText_RemoveMailBeforeItem:: @ 8416BFB
.string "MAIL must be removed before\n"
.string "holding an item.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C2A:: @ 8416C2A
gText_PkmnWasGivenItem:: @ 8416C2A
.string "{STR_VAR_1} was given the\n"
.string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C49:: @ 8416C49
gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49
.string "{STR_VAR_1} is already holding\n"
.string "one {STR_VAR_2}.\p"
.string "Would you like to switch the\n"
.string "two items?$"
gUnknown_8416C8F:: @ 8416C8F
gText_PkmnNotHolding:: @ 8416C8F
.string "{STR_VAR_1} isn't holding\n"
.string "anything.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CAC:: @ 8416CAC
gText_ReceivedItemFromPkmn:: @ 8416CAC
.string "Received the {STR_VAR_2}\n"
.string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CC7:: @ 8416CC7
gText_MailTakenFromPkmn:: @ 8416CC7
.string "MAIL was taken from the\n"
.string "POKéMON.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CEA:: @ 8416CEA
gText_SwitchedPkmnItem:: @ 8416CEA
.string "The {STR_VAR_2} was taken and\n"
.string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D17:: @ 8416D17
gText_PkmnHoldingItemCantHoldMail:: @ 8416D17
.string "This POKéMON is holding an\n"
.string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D4F:: @ 8416D4F
gText_MailTransferredFromMailbox:: @ 8416D4F
.string "MAIL was transferred from\n"
.string "the MAILBOX.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D78:: @ 8416D78
gText_BagFullCouldNotRemoveItem:: @ 8416D78
.string "The {STR_VAR_1} is full. The POKéMON's\n"
.string "item could not be removed.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DB3:: @ 8416DB3
gText_PkmnLearnedMove3:: @ 8416DB3
.string "{STR_VAR_1} learned\n"
.string "{STR_VAR_2}!$"
gUnknown_8416DC2:: @ 8416DC2
gText_PkmnCantLearnMove:: @ 8416DC2
.string "{STR_VAR_1} and {STR_VAR_2}\n"
.string "are not compatible.\p"
.string "{STR_VAR_2} can't be\n"
.string "learned.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DF7:: @ 8416DF7
gText_PkmnNeedsToReplaceMove:: @ 8416DF7
.string "{STR_VAR_1} wants to learn the\n"
.string "move {STR_VAR_2}.\p"
.string "However, {STR_VAR_1} already\n"
@ -968,74 +968,74 @@ gUnknown_8416DF7:: @ 8416DF7
.string "Should a move be deleted and\n"
.string "replaced with {STR_VAR_2}?$"
gUnknown_8416E6B:: @ 8416E6B
gText_StopLearningMove2:: @ 8416E6B
.string "Stop trying to teach\n"
.string "{STR_VAR_2}?$"
gUnknown_8416E84:: @ 8416E84
gText_MoveNotLearned:: @ 8416E84
.string "{STR_VAR_1} did not learn the\n"
.string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EA4:: @ 8416EA4
gText_WhichMoveToForget:: @ 8416EA4
.string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EC6:: @ 8416EC6
gText_12PoofForgotMove:: @ 8416EC6
.string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p"
.string "{STR_VAR_1} forgot how to\n"
.string "use {STR_VAR_2}.\p"
.string "And...{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F10:: @ 8416F10
gText_PkmnAlreadyKnows:: @ 8416F10
.string "{STR_VAR_1} already knows\n"
.string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F27:: @ 8416F27
gText_PkmnHPRestoredByVar2:: @ 8416F27
.string "{STR_VAR_1}'s HP was restored\n"
.string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F4E:: @ 8416F4E
gText_PkmnCuredOfPoison:: @ 8416F4E
.string "{STR_VAR_1} was cured of its\n"
.string "poisoning.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F6F:: @ 8416F6F
gText_PkmnCuredOfParalysis:: @ 8416F6F
.string "{STR_VAR_1} was cured of\n"
.string "paralysis.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F8C:: @ 8416F8C
gText_PkmnWokeUp2:: @ 8416F8C
.string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F9A:: @ 8416F9A
gText_PkmnBurnHealed:: @ 8416F9A
.string "{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FB2:: @ 8416FB2
gText_PkmnThawedOut:: @ 8416FB2
.string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FC7:: @ 8416FC7
gText_PPWasRestored:: @ 8416FC7
.string "PP was restored.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FDA:: @ 0x8416FDA
.string "{STR_VAR_1}は\n"
.string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FED:: @ 8416FED
gText_PkmnBecameHealthy:: @ 8416FED
.string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417002:: @ 8417002
gText_MovesPPIncreased:: @ 8417002
.string "{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417017:: @ 8417017
gText_PkmnElevatedToLvVar2:: @ 8417017
.string "{STR_VAR_1} was elevated to\n"
.string "Lv. {STR_VAR_2}.$"
gUnknown_8417032:: @ 8417032
gText_PkmnBaseVar2StatIncreased:: @ 8417032
.string "{STR_VAR_1}'s base {STR_VAR_2}\n"
.string "stat was raised.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417052:: @ 8417052
gText_PkmnSnappedOutOfConfusion:: @ 8417052
.string "{STR_VAR_1} snapped out of its\n"
.string "confusion.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417075:: @ 8417075
gText_PkmnGotOverInfatuation:: @ 8417075
.string "{STR_VAR_1} got over its\n"
.string "infatuation.{PAUSE_UNTIL_PRESS}$"
@ -1044,144 +1044,144 @@ gUnknown_8417094:: @ 0x8417094
.string "POKéMON for battle.$"
.align 2
gUnknown_84170BC:: @ 84170BC
gText_PkmnCantBeTradedNow:: @ 84170BC
.string "That POKéMON can't be traded\n"
.string "now.$"
.align 2
gUnknown_84170E0:: @ 84170E0
gText_EggCantBeTradedNow:: @ 84170E0
.string "An EGG can't be traded now.$"
.align 2
gUnknown_84170FC:: @ 0x84170FC
gText_OtherTrainersPkmnCantBeTraded:: @ 0x84170FC
.string "The other TRAINER's POKéMON\n"
.string "can't be traded now.$"
.align 2
gUnknown_8417130:: @ 0x8417130
gText_OtherTrainerCantAcceptPkmn:: @ 0x8417130
.string "The other TRAINER can't accept\n"
.string "that POKéMON now.$"
.align 2
gUnknown_8417164:: @ 0x8417164
gText_CantTradeWithTrainer:: @ 0x8417164
.string "You can't trade with that\n"
.string "TRAINER now.$"
.align 2
gUnknown_841718C:: @ 0x841718C
gText_NotPkmnOtherTrainerWants:: @ 0x841718C
.string "That isn't the type of POKéMON\n"
.string "that the other TRAINER wants.$"
.align 2
gUnknown_84171CC:: @ 0x84171CC
gText_ThatIsntAnEgg:: @ 0x84171CC
.string "That isn't an EGG.$"
gUnknown_84171DF:: @ 0x84171DF
gText_ChoosePokemon:: @ 0x84171DF
.string "Choose a POKéMON.$"
gUnknown_84171F1:: @ 0x84171F1
gText_MoveToWhere:: @ 0x84171F1
.string "Move to where?$"
gUnknown_8417200:: @ 0x8417200
gText_TeachWhichPokemon:: @ 0x8417200
.string "Teach which POKéMON?$"
gUnknown_8417215:: @ 0x8417215
gText_UseOnWhichPokemon:: @ 0x8417215
.string "Use on which POKéMON?$"
gUnknown_841722B:: @ 0x841722B
gText_GiveToWhichPokemon:: @ 0x841722B
.string "Give to which POKéMON?$"
gUnknown_8417242:: @ 0x8417242
gText_DoWhatWithPokemon:: @ 0x8417242
.string "Do what with this {PKMN}?$"
gUnknown_8417258:: @ 0x8417258
gText_NothingToCut:: @ 0x8417258
.string "There's nothing to CUT.$"
gUnknown_8417270:: @ 0x8417270
gText_CantSurfHere:: @ 0x8417270
.string "No SURFING here!$"
gUnknown_8417281:: @ 0x8417281
gText_AlreadySurfing:: @ 0x8417281
.string "You're already SURFING.$"
gUnknown_8417299:: @ 0x8417299
gText_CantUseHere:: @ 0x8417299
.string "Can't use that here.$"
gUnknown_84172AE:: @ 0x84172AE
gText_RestoreWhichMove:: @ 0x84172AE
.string "Restore which move?$"
gUnknown_84172C2:: @ 0x84172C2
gText_BoostPp:: @ 0x84172C2
.string "Boost PP of which?$"
gUnknown_84172D5:: @ 0x84172D5
gText_DoWhatWithItem:: @ 0x84172D5
.string "Do what with an item?$"
gUnknown_84172EB:: @ 0x84172EB
gText_NoPokemonForBattle:: @ 0x84172EB
.string "No battling this way!$"
gUnknown_8417301:: @ 0x8417301
gText_ChoosePokemon2:: @ 0x8417301
.string "Choose a POKéMON.$"
gUnknown_8417313:: @ 0x8417313
gText_NotEnoughHp:: @ 0x8417313
.string "Not enough HP‥$"
gUnknown_8417322:: @ 0x8417322
gText_ThreePkmnAreNeeded:: @ 0x8417322
.string "Three {PKMN} are needed.$"
gUnknown_8417337:: @ 0x8417337
gText_PokemonCantBeSame:: @ 0x8417337
.string "{PKMN} can't be the same.$"
gUnknown_841734D:: @ 0x841734D
gText_NoIdenticalHoldItems:: @ 0x841734D
.string "No same hold items!$"
gUnknown_8417361:: @ 0x8417361
gText_CurrentIsTooFast:: @ 0x8417361
.string "The current is much too fast!$"
gUnknown_841737F:: @ 0x841737F
gText_DoWhatWithMail:: @ 0x841737F
.string "Do what with the MAIL?$"
gUnknown_8417396:: @ 0x8417396
gText_ChoosePokemonCancel:: @ 0x8417396
.string "Choose POKéMON or CANCEL.$"
gUnknown_84173B0:: @ 0x84173B0
gText_ChoosePokemonConfirm:: @ 0x84173B0
.string "Choose POKéMON and confirm.$"
gUnknown_84173CC:: @ 0x84173CC
gText_TwoPokemonAreNeeded:: @ 0x84173CC
.string "Two POKéMON are needed.$"
gUnknown_84173E4:: @ 0x84173E4
gText_EnjoyCycling:: @ 0x84173E4
.string "Let's enjoy cycling!$"
gUnknown_84173F9:: @ 0x84173F9
gText_InUseAlready_PM:: @ 0x84173F9
.string "This is in use already.$"
gUnknown_8417411:: @ 0x8417411
gText_NoUse:: @ 0x8417411
.string "No use.$"
gUnknown_8417419:: @ 0x8417419
gText_Able:: @ 0x8417419
.string "ABLE$"
gUnknown_841741E:: @ 0x841741E
gText_First_PM:: @ 0x841741E
.string "FIRST$"
gUnknown_8417424:: @ 0x8417424
gText_Second_PM:: @ 0x8417424
.string "SECOND$"
gUnknown_841742B:: @ 0x841742B
gText_Third_PM:: @ 0x841742B
.string "THIRD$"
gUnknown_8417431:: @ 0x8417431
gText_Able2:: @ 0x8417431
.string "ABLE$"
gUnknown_8417436:: @ 0x8417436
gText_NotAble:: @ 0x8417436
.string "NOT ABLE$"
gUnknown_841743F:: @ 0x841743F
gText_Able3:: @ 0x841743F
.string "ABLE!$"
gUnknown_8417445:: @ 0x8417445
gText_NotAble2:: @ 0x8417445
.string "NOT ABLE!$"
gUnknown_841744F:: @ 0x841744F
gText_Learned:: @ 0x841744F
.string "LEARNED$"
gUnknown_8417457:: @ 8417457
@ -1197,54 +1197,54 @@ gUnknown_8417494:: @ 8417494
.string "You also choose POKéMON here if\n"
.string "you want to use an item on one.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417533:: @ 0x8417533
gText_CutATreeOrGrass:: @ 0x8417533
.string "Cut a tree or grass.$"
gUnknown_8417548:: @ 0x8417548
gText_FlyToAKnownTown:: @ 0x8417548
.string "Fly to a known town.$"
gUnknown_841755D:: @ 0x841755D
gText_TravelOnWater:: @ 0x841755D
.string "Travel on water.$"
gUnknown_841756E:: @ 0x841756E
gText_MoveHeavyBoulders:: @ 0x841756E
.string "Move heavy boulders.$"
gUnknown_8417583:: @ 0x8417583
gText_LightUpDarkness:: @ 0x8417583
.string "Light up darkness.$"
gUnknown_8417596:: @ 0x8417596
gText_ShatterACrackedRock:: @ 0x8417596
.string "Shatter a cracked rock.$"
gUnknown_84175AE:: @ 0x84175AE
gText_ClimbAWaterfall:: @ 0x84175AE
.string "Climb a waterfall.$"
gUnknown_84175C1:: @ 0x84175C1
.string "すいちゅうに もぐる$"
gUnknown_84175CC:: @ 0x84175CC
gText_EscapeFromHere:: @ 0x84175CC
.string "Escape from here.$"
gUnknown_84175DE:: @ 0x84175DE
gText_LureWildPokemon:: @ 0x84175DE
.string "Lure wild POKéMON.$"
gUnknown_84175F1:: @ 0x84175F1
gText_ShareHp:: @ 0x84175F1
.string "Share HP.$"
gUnknown_84175FB:: @ 0x84175FB
gText_ReturnToAHealingSpot:: @ 0x84175FB
.string "Return to a healing spot.$"
gUnknown_8417615:: @ 8417615
gText_EscapeFromHereAndReturnTo:: @ 8417615
.string "Want to escape from here and return\n"
.string "to {STR_VAR_1}?$"
gUnknown_8417640:: @ 8417640
gText_ReturnToHealingSpot:: @ 8417640
.string "Want to return to the healing spot\n"
.string "used last in {STR_VAR_1}?$"
gUnknown_8417674:: @ 8417674
gText_Attack3:: @ 8417674
.string "ATTACK$"
gUnknown_841767B:: @ 841767B
gText_Defense3:: @ 841767B
.string "DEFENSE$"
gUnknown_8417683:: @ 0x8417683
@ -1253,16 +1253,16 @@ gUnknown_8417683:: @ 0x8417683
gUnknown_8417688:: @ 0x8417688
.string "とくぼう$"
gUnknown_841768D:: @ 841768D
gText_Speed2:: @ 841768D
.string "SPEED$"
gUnknown_8417693:: @ 0x8417693
.string "HP$"
gUnknown_8417696:: @ 8417696
gText_PkmnCantParticipate:: @ 8417696
.string "That POKéMON can't participate.{PAUSE_UNTIL_PRESS}$"
gUnknown_84176B8:: @ 84176B8
gText_CancelParticipation:: @ 84176B8
.string "Cancel participation?$"
gUnknown_84176CE:: @ 0x84176CE
@ -3266,7 +3266,7 @@ gText_Badges:: @ 841B6EC
gTextJPDummy_Ko:: @ 841B6F3
.string "$"
gUnknown_841B6F4:: @ 0x841B6F4
gText_Register:: @ 0x841B6F4
.string "REGISTER$"
gText_HatchedFromEgg:: @ 841B6FD

19
graphics/interface/hold_icons.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
57 205 106
255 255 255
213 213 255
148 148 180
255 246 156
222 222 115
246 82 41
164 90 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
98 98 98

BIN
graphics/interface/hold_icons.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 B

BIN
graphics/interface/party_menu_cancel_button.bin Normal file
View File

Binary file not shown.

BIN
graphics/interface/party_menu_confirm_button.bin Normal file
View File

Binary file not shown.

19
graphics/pokemon_special_anim/unk_8459868.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
230 230 255
213 213 255
197 197 255
180 180 255
164 164 255
148 148 255
131 131 255
115 115 255
98 98 255
82 82 255
65 65 255
49 49 255
32 32 255
16 16 255

19
graphics/pokemon_special_anim/unk_84598A4.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
98 90 8
197 189 24
246 246 0
148 139 16
246 238 32
222 213 0
213 197 0
180 164 0
49 41 0
172 148 32
189 164 49
0 0 0
0 0 0
0 0 0
0 0 0

19
graphics/pokemon_special_anim/unk_8459940.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
65 106 255
255 255 255
230 230 230
213 213 213
197 197 197
180 180 180
164 164 164
148 148 148
131 131 131
115 115 115
98 98 98
82 82 82
65 65 65
49 49 49
32 32 32
16 16 16

5
include/battle.h
View File

@ -24,8 +24,7 @@
#define TRAINER_OPPONENT_3FE 0x3FE
#define TRAINER_OPPONENT_C00 0xC00
#define TRAINER_OPPONENT_800 0x800
#define STEVEN_PARTNER_ID 0xC03
#define TRAINER_LINK_OPPONENT 0x800
#define SECRET_BASE_OPPONENT 0x400
#define B_ACTION_USE_MOVE 0
@ -712,7 +711,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
extern u8 gBattleTerrain;
extern struct UnknownPokemonStruct4 gUnknown_2022B58[3];
extern struct UnknownPokemonStruct4 gMultiPartnerParty[3];
extern u16 *gUnknown_2022BC0;
extern u16 gRandomTurnNumber;

10
include/battle_message.h
View File

@ -51,13 +51,9 @@
#define B_TXT_DEF_PREFIX2 0x2B
#define B_TXT_ATK_PREFIX3 0x2C
#define B_TXT_DEF_PREFIX3 0x2D
#define B_TXT_TRAINER2_CLASS 0x2E
#define B_TXT_TRAINER2_NAME 0x2F
#define B_TXT_TRAINER2_LOSE_TEXT 0x30
#define B_TXT_TRAINER2_WIN_TEXT 0x31
#define B_TXT_PARTNER_CLASS 0x32
#define B_TXT_PARTNER_NAME 0x33
#define B_TXT_BUFF3 0x34
#define B_TXT_TRAINER2_LOSE_TEXT 0x2E
#define B_TXT_TRAINER2_WIN_TEXT 0x2F
#define B_TXT_BUFF3 0x30
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3

2
include/battle_string_ids.h
View File

@ -387,6 +387,6 @@
#define STRINGID_TRAINER1MON2COMEBACK 384
#define STRINGID_TRAINER1MON1AND2COMEBACK 385
#define BATTLESTRINGS_COUNT 386
#define BATTLESTRINGS_COUNT 374
#endif // GUARD_BATTLE_STRING_IDS_H

7
include/battle_tower.h
View File

@ -25,11 +25,18 @@ struct BattleTowerPokemonTemplate
u8 nature;
};
extern const u16 gBattleTowerBannedSpecies[];
u16 sub_8164FCC(u8, u8);
void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *);
void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
void CopyEReaderTrainerName5(u8 *dest);
void sub_815DC40(u8 *dest, u8 opponentIdx);
void sub_815DBF4(u8 *dest, u8 opponentIdx);
void GetBattleTowerTrainerName(u8 *text);
u8 GetEreaderTrainerClassId(void);
u8 GetBattleTowerTrainerClassNameId(void);
#endif //GUARD_BATTLE_TOWER_H

22
include/constants/easy_chat.h
View File

@ -1,6 +1,28 @@
#ifndef GUARD_CONSTANTS_EASY_CHAT_H
#define GUARD_CONSTANTS_EASY_CHAT_H
#define EASY_CHAT_TYPE_PROFILE 0
#define EASY_CHAT_TYPE_BATTLE_START 1
#define EASY_CHAT_TYPE_BATTLE_WON 2
#define EASY_CHAT_TYPE_BATTLE_LOST 3
#define EASY_CHAT_TYPE_MAIL 4
#define EASY_CHAT_TYPE_INTERVIEW 5
#define EASY_CHAT_TYPE_BARD_SONG 6
#define EASY_CHAT_TYPE_FAN_CLUB 7
#define EASY_CHAT_TYPE_UNK_8 8
#define EASY_CHAT_TYPE_TRENDY_PHRASE 9
#define EASY_CHAT_TYPE_GABBY_AND_TY 10
#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11
#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12
#define EASY_CHAT_TYPE_GOOD_SAYING 13
#define EASY_CHAT_TYPE_FAN_QUESTION 14
#define EASY_CHAT_TYPE_QUIZ_ANSWER 15
#define EASY_CHAT_TYPE_QUIZ_QUESTION 16
#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17
#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18
#define EASY_CHAT_TYPE_APPRENTICE 19
#define EASY_CHAT_TYPE_QUESTIONNAIRE 20
#define EC_GROUP_POKEMON_2 0x0
#define EC_GROUP_TRAINER 0x1
#define EC_GROUP_STATUS 0x2

2
include/constants/global.h
View File

@ -80,4 +80,6 @@ enum
#define NUM_BAG_POCKETS 5
#define MULTI_PARTY_SIZE PARTY_SIZE / 2
#endif //GUARD_CONSTANTS_GLOBAL_H

118
include/constants/party_menu.h Normal file
View File

@ -0,0 +1,118 @@
#ifndef GUARD_CONSTANTS_PARTY_MENU_H
#define GUARD_CONSTANTS_PARTY_MENU_H
#define AILMENT_NONE 0
#define AILMENT_PSN 1
#define AILMENT_PRZ 2
#define AILMENT_SLP 3
#define AILMENT_FRZ 4
#define AILMENT_BRN 5
#define AILMENT_PKRS 6
#define AILMENT_FNT 7
#define TUTOR_MOVE_MEGA_PUNCH 0
#define TUTOR_MOVE_SWORDS_DANCE 1
#define TUTOR_MOVE_MEGA_KICK 2
#define TUTOR_MOVE_BODY_SLAM 3
#define TUTOR_MOVE_DOUBLE_EDGE 4
#define TUTOR_MOVE_COUNTER 5
#define TUTOR_MOVE_SEISMIC_TOSS 6
#define TUTOR_MOVE_MIMIC 7
#define TUTOR_MOVE_METRONOME 8
#define TUTOR_MOVE_SOFT_BOILED 9
#define TUTOR_MOVE_DREAM_EATER 10
#define TUTOR_MOVE_THUNDER_WAVE 11
#define TUTOR_MOVE_EXPLOSION 12
#define TUTOR_MOVE_ROCK_SLIDE 13
#define TUTOR_MOVE_SUBSTITUTE 14
#define TUTOR_MOVE_COUNT 15 // regular tutor move count
#define TUTOR_MOVE_FRENZY_PLANT 15
#define TUTOR_MOVE_BLAST_BURN 16
#define TUTOR_MOVE_HYDRO_CANNON 17
#define PARTY_LAYOUT_SINGLE 0
#define PARTY_LAYOUT_DOUBLE 1
#define PARTY_LAYOUT_MULTI 2
#define PARTY_LAYOUT_MULTI_SHOWCASE 3 // The layout during the screen that appears just before a multi battle
#define PARTY_LAYOUT_COUNT 4
#define KEEP_PARTY_LAYOUT 0xFF
#define PARTY_MENU_TYPE_FIELD 0
#define PARTY_MENU_TYPE_IN_BATTLE 1
#define PARTY_MENU_TYPE_CONTEST 2
#define PARTY_MENU_TYPE_CHOOSE_MON 3
#define PARTY_MENU_TYPE_CHOOSE_HALF 4 // multi battles, eReader battles, and some battle facilities
#define PARTY_MENU_TYPE_MULTI_SHOWCASE 5
#define PARTY_MENU_TYPE_DAYCARE 6
#define PARTY_MENU_TYPE_MOVE_RELEARNER 7
#define PARTY_MENU_TYPE_UNION_ROOM_REGISTER 8 // trading board
#define PARTY_MENU_TYPE_UNION_ROOM_TRADE 9 // trading board
#define PARTY_MENU_TYPE_SPIN_TRADE 10 // Unused beta for Gen IV's Spin Trade
#define PARTY_MENU_TYPE_MINIGAME 11
#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS 12
#define PARTY_ACTION_CHOOSE_MON 0
#define PARTY_ACTION_SEND_OUT 1
#define PARTY_ACTION_CANT_SWITCH 2
#define PARTY_ACTION_USE_ITEM 3
#define PARTY_ACTION_ABILITY_PREVENTS 4
#define PARTY_ACTION_GIVE_ITEM 5
#define PARTY_ACTION_GIVE_PC_ITEM 6 // TODO: rename this one if necessary. Used for quest log.
#define PARTY_ACTION_GIVE_MAILBOX_MAIL 7
#define PARTY_ACTION_SWITCH 8
#define PARTY_ACTION_SWITCHING 9
#define PARTY_ACTION_SOFTBOILED 10
#define PARTY_ACTION_CHOOSE_AND_CLOSE 11
#define PARTY_ACTION_MOVE_TUTOR 12
#define PARTY_ACTION_MINIGAME 13
#define PARTY_ACTION_REUSABLE_ITEM 14
// IDs for DisplayPartyMenuStdMessage, to display the message at the bottom of the party menu
#define PARTY_MSG_CHOOSE_MON 0
#define PARTY_MSG_CHOOSE_MON_OR_CANCEL 1
#define PARTY_MSG_CHOOSE_MON_AND_CONFIRM 2
#define PARTY_MSG_MOVE_TO_WHERE 3
#define PARTY_MSG_TEACH_WHICH_MON 4
#define PARTY_MSG_USE_ON_WHICH_MON 5
#define PARTY_MSG_GIVE_TO_WHICH_MON 6
#define PARTY_MSG_NOTHING_TO_CUT 7
#define PARTY_MSG_CANT_SURF_HERE 8
#define PARTY_MSG_ALREADY_SURFING 9
#define PARTY_MSG_CURRENT_TOO_FAST 10
#define PARTY_MSG_ENJOY_CYCLING 11
#define PARTY_MSG_ALREADY_IN_USE 12
#define PARTY_MSG_CANT_USE_HERE 13
#define PARTY_MSG_NO_MON_FOR_BATTLE 14
#define PARTY_MSG_CHOOSE_MON_2 15
#define PARTY_MSG_NOT_ENOUGH_HP 16
#define PARTY_MSG_THREE_MONS_ARE_NEEDED 17
#define PARTY_MSG_TWO_MONS_ARE_NEEDED 18
#define PARTY_MSG_MONS_CANT_BE_SAME 19
#define PARTY_MSG_NO_SAME_HOLD_ITEMS 20
#define PARTY_MSG_UNUSED 21
#define PARTY_MSG_DO_WHAT_WITH_MON 22
#define PARTY_MSG_RESTORE_WHICH_MOVE 23
#define PARTY_MSG_BOOST_PP_WHICH_MOVE 24
#define PARTY_MSG_DO_WHAT_WITH_ITEM 25
#define PARTY_MSG_DO_WHAT_WITH_MAIL 26
#define PARTY_MSG_NONE 127
// IDs for DisplayPartyPokemonDescriptionText, to display a message in the party pokemon's box
#define PARTYBOX_DESC_NO_USE 0
#define PARTYBOX_DESC_ABLE_3 1
#define PARTYBOX_DESC_FIRST 2
#define PARTYBOX_DESC_SECOND 3
#define PARTYBOX_DESC_THIRD 4
#define PARTYBOX_DESC_ABLE 5
#define PARTYBOX_DESC_NOT_ABLE 6
#define PARTYBOX_DESC_ABLE_2 7
#define PARTYBOX_DESC_NOT_ABLE_2 8
#define PARTYBOX_DESC_LEARNED 9
#define SELECTWINDOW_ACTIONS 0
#define SELECTWINDOW_ITEM 1
#define SELECTWINDOW_MAIL 2
#define SELECTWINDOW_MOVES 3
#endif // GUARD_CONSTANTS_PARTY_MENU_H

118
include/constants/trade.h Normal file
View File

@ -0,0 +1,118 @@
#ifndef GUARD_CONSTANTS_TRADE_H
#define GUARD_CONSTANTS_TRADE_H
// TODO: document trade.c and trade_scene.c with corresponding macros
// and examine if these are correct
#define TRADE_PLAYER 0
#define TRADE_PARTNER 1
#define LINK_TRADE_TIMEOUT 300
// In-game Trade IDs
#define INGAME_TRADE_SEEDOT 0
#define INGAME_TRADE_PLUSLE 1
#define INGAME_TRADE_HORSEA 2
#define INGAME_TRADE_MEOWTH 3
// Flag IDs for sending link data
#define INITIATE_TRADE 1
#define CANCEL_TRADE 2
#define WANTS_TO_TRADE 1
#define WANTS_TO_CANCEL 2
#define READY_FINISH_TRADE 1
#define FINISH_TRADE 2
// Return values for CanTradeSelectedMon and CanSpinTradeMon
#define CAN_TRADE_MON 0
#define CANT_TRADE_LAST_MON 1
#define CANT_TRADE_NATIONAL 2
#define CANT_TRADE_EGG_YET 3
#define CANT_TRADE_INVALID_MON 4
#define CANT_TRADE_EGG_YET2 5
// Return values for CheckValidityOfTradeMons
#define PLAYER_MON_INVALID 0
#define BOTH_MONS_VALID 1
#define PARTNER_MON_INVALID 2
// Return values for GetGameProgressForLinkTrade
#define TRADE_BOTH_PLAYERS_READY 0
#define TRADE_PLAYER_NOT_READY 1
#define TRADE_PARTNER_NOT_READY 2
// Indexes for sTradeActionTexts
#define TRADE_TEXT_CANCEL 0
#define TRADE_TEXT_CHOOSE_MON 1
#define TRADE_TEXT_SUMMARY 2
#define TRADE_TEXT_TRADE 3
#define TRADE_TEXT_CANCEL_TRADE 4
#define TRADE_TEXT_JP_QUIT 5
// Checked to confirm DrawTradeMenuParty has reached final state
#define DRAW_PARTY_FINISH 5
// Message indexes for sTradeMessages
#define TRADE_MSG_STANDBY 0
#define TRADE_MSG_CANCELED 1
#define TRADE_MSG_ONLY_MON1 2
#define TRADE_MSG_ONLY_MON2 3
#define TRADE_MSG_WAITING_FOR_FRIEND 4
#define TRADE_MSG_FRIEND_WANTS_TO_TRADE 5
#define TRADE_MSG_MON_CANT_BE_TRADED 6
#define TRADE_MSG_EGG_CANT_BE_TRADED 7
#define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8
// IDs for QueueAction
#define QUEUE_SEND_DATA 0
#define QUEUE_STANDBY 1
#define QUEUE_ONLY_MON1 2
#define QUEUE_ONLY_MON2 3
#define QUEUE_UNUSED1 4
#define QUEUE_UNUSED2 5
#define QUEUE_MON_CANT_BE_TRADED 6
#define QUEUE_EGG_CANT_BE_TRADED 7
#define QUEUE_FRIENDS_MON_CANT_BE_TRADED 8
#define QUEUE_DELAY_MSG 3
#define QUEUE_DELAY_DATA 5
// IDs for CallTradeMenuFunc
#define TRADEMENUFUNC_MAIN_MENU 0
#define TRADEMENUFUNC_SELECTED_MON 1
#define TRADEMENUFUNC_SHOW_MON_SUMMARY 2
#define TRADEMENUFUNC_CONFIRM_OR_CANCEL_TRADE 3
#define TRADEMENUFUNC_CANCEL_TRADE_PROMPT 4
#define TRADEMENUFUNC_UNUSED_5 5
#define TRADEMENUFUNC_BOTH_MONS_SELECTED 6
#define TRADEMENUFUNC_CONFIRM_TRADE_PROMPT 7
#define TRADEMENUFUNC_REDRAW_MAIN_MENU 8
#define TRADEMENUFUNC_LINK_TRADE_FADE_OUT 9
#define TRADEMENUFUNC_LINK_TRADE_WAIT_FADE 10
#define TRADEMENUFUNC_CANCEL_TRADE_1 11
#define TRADEMENUFUNC_CANCEL_TRADE_2 12
#define TRADEMENUFUNC_START_LINK_TRADE 13
#define TRADEMENUFUNC_DELAY_TRADE_CONFIRM 14
#define TRADEMENUFUNC_UNUSED_15 15
#define TRADEMENUFUNC_LINK_TRADE_WAIT_QUEUE 16
#define TRADEMENUFUNC_PARTNER_MON_INVALID 17
#define TRADEMENUFUNC_STANDBY 100
// Message indexes for sUnionRoomTradeMessages
#define UR_TRADE_MSG_NONE 0
#define UR_TRADE_MSG_NOT_MON_PARTNER_WANTS 1
#define UR_TRADE_MSG_NOT_EGG 2
#define UR_TRADE_MSG_MON_CANT_BE_TRADED_1 3
#define UR_TRADE_MSG_MON_CANT_BE_TRADED_2 4
#define UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED 5
#define UR_TRADE_MSG_EGG_CANT_BE_TRADED 6
#define UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON 7
#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 8
#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 9
// Return values for CanRegisterMonForTradingBoard
#define CAN_REGISTER_MON 0
#define CANT_REGISTER_MON 1
#define CANT_REGISTER_EGG 2
#endif //GUARD_CONSTANTS_TRADE_H

149
include/constants/trainers.h
View File

@ -170,155 +170,6 @@
#define F_TRAINER_FEMALE (1 << 7)
#define TRAINER_PIC_AQUA_LEADER_ARCHIE 0
#define TRAINER_PIC_AQUA_GRUNT_M 1
#define TRAINER_PIC_AQUA_GRUNT_F 2
#define TRAINER_PIC_RS_AROMA_LADY 3
#define TRAINER_PIC_RS_RUIN_MANIAC 4
#define TRAINER_PIC_INTERVIEWER 5
#define TRAINER_PIC_RS_TUBER_F 6
#define TRAINER_PIC_TUBER_M 7
#define TRAINER_PIC_RS_COOLTRAINER_M 8
#define TRAINER_PIC_RS_COOLTRAINER_F 9
#define TRAINER_PIC_HEX_MANIAC 10
#define TRAINER_PIC_RS_LADY 11
#define TRAINER_PIC_RS_BEAUTY 12
#define TRAINER_PIC_RICH_BOY 13
#define TRAINER_PIC_RS_POKEMANIAC 14
#define TRAINER_PIC_RS_SWIMMER_M 15
#define TRAINER_PIC_RS_BLACK_BELT 16
#define TRAINER_PIC_GUITARIST 17
#define TRAINER_PIC_KINDLER 18
#define TRAINER_PIC_RS_CAMPER 19
#define TRAINER_PIC_BUG_MANIAC 20
#define TRAINER_PIC_RS_PSYCHIC_M 21
#define TRAINER_PIC_RS_PSYCHIC_F 22
#define TRAINER_PIC_RS_GENTLEMAN 23
#define TRAINER_PIC_ELITE_FOUR_SIDNEY 24
#define TRAINER_PIC_ELITE_FOUR_PHOEBE 25
#define TRAINER_PIC_LEADER_ROXANNE 26
#define TRAINER_PIC_LEADER_BRAWLY 27
#define TRAINER_PIC_LEADER_TATE_AND_LIZA 28
#define TRAINER_PIC_SCHOOL_KID_M 29
#define TRAINER_PIC_SCHOOL_KID_F 30
#define TRAINER_PIC_SR_AND_JR 31
#define TRAINER_PIC_POKEFAN_M 32
#define TRAINER_PIC_POKEFAN_F 33
#define TRAINER_PIC_EXPERT_M 34
#define TRAINER_PIC_EXPERT_F 35
#define TRAINER_PIC_RS_YOUNGSTER 36
#define TRAINER_PIC_CHAMPION_STEVEN 37
#define TRAINER_PIC_RS_FISHERMAN 38
#define TRAINER_PIC_CYCLING_TRIATHLETE_M 39
#define TRAINER_PIC_CYCLING_TRIATHLETE_F 40
#define TRAINER_PIC_RUNNING_TRIATHLETE_M 41
#define TRAINER_PIC_RUNNING_TRIATHLETE_F 42
#define TRAINER_PIC_SWIMMING_TRIATHLETE_M 43
#define TRAINER_PIC_SWIMMING_TRIATHLETE_F 44
#define TRAINER_PIC_DRAGON_TAMER 45
#define TRAINER_PIC_RS_BIRD_KEEPER 46
#define TRAINER_PIC_NINJA_BOY 47
#define TRAINER_PIC_BATTLE_GIRL 48
#define TRAINER_PIC_PARASOL_LADY 49
#define TRAINER_PIC_RS_SWIMMER_F 50
#define TRAINER_PIC_RS_PICNICKER 51
#define TRAINER_PIC_RS_TWINS 52
#define TRAINER_PIC_RS_SAILOR 53
#define TRAINER_PIC_COLLECTOR 54
#define TRAINER_PIC_WALLY 55
#define TRAINER_PIC_RS_BRENDAN_1 56
#define TRAINER_PIC_RS_MAY_1 57
#define TRAINER_PIC_POKEMON_BREEDER_M 58
#define TRAINER_PIC_RS_POKEMON_BREEDER_F 59
#define TRAINER_PIC_RS_POKEMON_RANGER_M 60
#define TRAINER_PIC_RS_POKEMON_RANGER_F 61
#define TRAINER_PIC_MAGMA_LEADER_MAXIE 62
#define TRAINER_PIC_MAGMA_GRUNT_M 63
#define TRAINER_PIC_MAGMA_GRUNT_F 64
#define TRAINER_PIC_RS_LASS 65
#define TRAINER_PIC_RS_BUG_CATCHER 66
#define TRAINER_PIC_RS_HIKER 67
#define TRAINER_PIC_RS_YOUNG_COUPLE 68
#define TRAINER_PIC_OLD_COUPLE 69
#define TRAINER_PIC_RS_SIS_AND_BRO 70
#define TRAINER_PIC_AQUA_ADMIN_M 71
#define TRAINER_PIC_AQUA_ADMIN_F 72
#define TRAINER_PIC_MAGMA_ADMIN_M 73
#define TRAINER_PIC_MAGMA_ADMIN_F 74
#define TRAINER_PIC_LEADER_WATTSON 75
#define TRAINER_PIC_LEADER_FLANNERY 76
#define TRAINER_PIC_LEADER_NORMAN 77
#define TRAINER_PIC_LEADER_WINONA 78
#define TRAINER_PIC_LEADER_WALLACE 79
#define TRAINER_PIC_ELITE_FOUR_GLACIA 80
#define TRAINER_PIC_ELITE_FOUR_DRAKE 81
#define TRAINER_PIC_YOUNGSTER 82
#define TRAINER_PIC_BUG_CATCHER 83
#define TRAINER_PIC_LASS 84
#define TRAINER_PIC_SAILOR 85
#define TRAINER_PIC_CAMPER 86
#define TRAINER_PIC_PICNICKER 87
#define TRAINER_PIC_POKEMANIAC 88
#define TRAINER_PIC_SUPER_NERD 89
#define TRAINER_PIC_HIKER 90
#define TRAINER_PIC_BIKER 91
#define TRAINER_PIC_BURGLAR 92
#define TRAINER_PIC_ENGINEER 93
#define TRAINER_PIC_FISHERMAN 94
#define TRAINER_PIC_SWIMMER_M 95
#define TRAINER_PIC_CUE_BALL 96
#define TRAINER_PIC_GAMER 97
#define TRAINER_PIC_BEAUTY 98
#define TRAINER_PIC_SWIMMER_F 99
#define TRAINER_PIC_PSYCHIC_M 100
#define TRAINER_PIC_ROCKER 101
#define TRAINER_PIC_JUGGLER 102
#define TRAINER_PIC_TAMER 103
#define TRAINER_PIC_BIRD_KEEPER 104
#define TRAINER_PIC_BLACK_BELT 105
#define TRAINER_PIC_RIVAL_1 106
#define TRAINER_PIC_SCIENTIST 107
#define TRAINER_PIC_LEADER_GIOVANNI 108
#define TRAINER_PIC_ROCKET_GRUNT_M 109
#define TRAINER_PIC_COOLTRAINER_M 110
#define TRAINER_PIC_COOLTRAINER_F 111
#define TRAINER_PIC_ELITE_FOUR_LORELEI 112
#define TRAINER_PIC_ELITE_FOUR_BRUNO 113
#define TRAINER_PIC_ELITE_FOUR_AGATHA 114
#define TRAINER_PIC_ELITE_FOUR_LANCE 115
#define TRAINER_PIC_LEADER_BROCK 116
#define TRAINER_PIC_LEADER_MISTY 117
#define TRAINER_PIC_LEADER_LT_SURGE 118
#define TRAINER_PIC_LEADER_ERIKA 119
#define TRAINER_PIC_LEADER_KOGA 120
#define TRAINER_PIC_LEADER_BLAINE 121
#define TRAINER_PIC_LEADER_SABRINA 122
#define TRAINER_PIC_GENTLEMAN 123
#define TRAINER_PIC_RIVAL_2 124
#define TRAINER_PIC_CHAMPION_RIVAL 125
#define TRAINER_PIC_CHANNELER 126
#define TRAINER_PIC_TWINS 127
#define TRAINER_PIC_COOL_COUPLE 128
#define TRAINER_PIC_YOUNG_COUPLE 129
#define TRAINER_PIC_CRUSH_KIN 130
#define TRAINER_PIC_SIS_AND_BRO 131
#define TRAINER_PIC_PROFESSOR_OAK 132
#define TRAINER_PIC_RS_BRENDAN_2 133
#define TRAINER_PIC_RS_MAY_2 134
#define TRAINER_PIC_RED 135
#define TRAINER_PIC_LEAF 136
#define TRAINER_PIC_ROCKET_GRUNT_F 137
#define TRAINER_PIC_PSYCHIC_F 138
#define TRAINER_PIC_CRUSH_GIRL 139
#define TRAINER_PIC_TUBER_F 140
#define TRAINER_PIC_POKEMON_BREEDER_F 141
#define TRAINER_PIC_POKEMON_RANGER_M 142
#define TRAINER_PIC_POKEMON_RANGER_F 143
#define TRAINER_PIC_AROMA_LADY 144
#define TRAINER_PIC_RUIN_MANIAC 145
#define TRAINER_PIC_LADY 146
#define TRAINER_PIC_PAINTER 147
#define TRAINER_NONE 0
#define TRAINER_AQUA_LEADER_1 1
#define TRAINER_TEAM_AQUA_1 2

2
include/data.h
View File

@ -22,6 +22,8 @@ extern const u16 gUnknown_8251FEE[];
extern const u16 gUnknown_8252324[];
extern const u16 gUnknown_82539D4[];
extern const u8 gTrainerClassNames[][13];
extern const struct MonCoords gMonFrontPicCoords[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonBackPicCoords[];

1
include/easy_chat.h
View File

@ -45,5 +45,6 @@ u16 GetDisplayedWordByIndex(u16 index);
u16 GetNumDisplayedWords(void);
const u8 *GetEasyChatWordGroupName(u8);
u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback); // TODO: currently in link_rfu.s. further file split needed?
#endif // GUARD_EASYCHAT_H

6
include/event_scripts.h
View File

@ -1188,4 +1188,10 @@ extern const u8 Text_1BCAF2[];
extern const u8 EventScript_RepelWoreOff[];
// battle_message
extern const u8 Text_1A5CF1[];
extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
#endif //GUARD_EVENT_SCRIPTS_H

2
include/field_player_avatar.h
View File

@ -33,5 +33,7 @@ void sub_805DC04(void);
void sub_805DAB0(void);
bool32 sub_805DAD0(void);
bool32 sub_805DC24(void);
bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerSurfingNorth(void);
#endif //GUARD_FIELD_PLAYER_AVATAR_H

1
include/field_screen_effect.h
View File

@ -9,5 +9,6 @@ void sub_80B0244(void);
void sub_807E3EC(void);
void sub_807F114(void);
void sub_807F204(u8 taskId);
void sub_807DC00(void);
#endif // GUARD_FIELD_SCREEN_EFFECT_H

2
include/field_weather.h
View File

@ -13,7 +13,7 @@ void DoCurrentWeather(void);
void SetSav1WeatherFromCurrMapHeader(void);
void sub_807B0C4(u16 *, u16 *, u32);
void PlayRainStoppingSoundEffect(void);
bool8 field_weather_is_fade_finished(void);
bool8 IsWeatherNotFadingIn(void);
void SetWeatherScreenFadeOut(void);
void sub_807B070(void);
u8 GetCurrentWeather(void);

9
include/fldeff.h
View File

@ -7,7 +7,6 @@
gTasks[taskId].data[8] = (u32)func >> 16; \
gTasks[taskId].data[9] = (u32)func;
extern u8 *gUnknown_203AAB0;
extern struct MapPosition gPlayerFacingPosition;
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
@ -16,8 +15,10 @@ u8 oei_task_add(void);
// flash
u8 sub_80C9DCC(u8 lightLevel, u8 mapType);
u8 sub_80C9D7C(u8 mapType1, u8 mapType2);
bool8 SetUpFieldMove_Flash(void);
// cut
bool8 SetUpFieldMove_Cut(void);
// dig
bool8 SetUpFieldMove_Dig(void);
@ -43,9 +44,9 @@ bool8 SetUpFieldMove_Teleport(void);
bool8 FldEff_UseTeleport(void);
// softboiled
bool8 hm_prepare_dive_probably(void);
void sub_80E56DC(u8 taskId);
void sub_80E5724(u8 taskId);
bool8 SetUpFieldMove_SoftBoiled(void);
void ChooseMonForSoftboiled(u8 taskId);
void Task_TryUseSoftboiledOnPartyMon(u8 taskId);
// sweetscent
bool8 SetUpFieldMove_SweetScent(void);

22
include/global.h
View File

@ -206,26 +206,6 @@ struct LinkBattleRecords
#include "global.berry.h"
#include "pokemon.h"
struct UnknownSaveBlock2Struct
{
u8 field_0;
u8 field_1;
u8 field_2[2];
u8 field_4[8];
u8 field_C[16];
u16 field_1C[6];
u16 field_28[6];
u8 field_34[176];
u8 field_E4;
u8 field_E5;
u8 field_E6;
u8 field_E7;
u8 field_E8;
u8 field_E9;
u8 field_EA;
u8 field_EB;
}; // sizeof = 0xEC
struct BattleTowerRecord // record mixing
{
/*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100
@ -742,7 +722,7 @@ struct SaveBlock1
/*0x000C*/ struct WarpData warp1;
/*0x0014*/ struct WarpData warp2;
/*0x001C*/ struct WarpData lastHealLocation;
/*0x0024*/ struct WarpData warp4;
/*0x0024*/ struct WarpData escapeWarp;
/*0x002C*/ u16 savedMusic;
/*0x002E*/ u8 weather;
/*0x002F*/ u8 filler_2F;

13
include/graphics.h
View File

@ -3740,6 +3740,16 @@ extern const u8 gWeatherFog1Tiles[];
extern const u32 gBattleAnimFogTilemap[];
extern const u16 gUnknown_83C2CE0[];
// party_menu
extern const u32 gPartyMenuPokeball_Gfx[];
extern const u32 gPartyMenuPokeball_Pal[];
extern const u32 gPartyMenuPokeballSmall_Gfx[];
extern const u32 gStatusGfx_Icons[];
extern const u32 gStatusPal_Icons[];
extern const u32 gPartyMenuBg_Gfx[];
extern const u32 gPartyMenuBg_Tilemap[];
extern const u32 gPartyMenuBg_Pal[];
// credits
extern const u32 gCreditsPokeballBgGfxTiles[];
extern const u32 gCreditsPokeballBgGfxMap[];
@ -4239,4 +4249,7 @@ extern const u16 gUnknown_8E97DDC[];
extern const u32 gUnknown_8E97DFC[];
extern const u32 gUnknown_8E97EC4[];
// battle_message
extern const u16 gUnknown_8D2FBB4[];
#endif //GUARD_GRAPHICS_H

3
include/item.h
View File

@ -43,7 +43,6 @@ void ClearItemSlots(struct ItemSlot *itemSlots, u8 b);
u8 CountUsedPCItemSlots(void);
bool8 CheckPCHasItem(u16 itemId, u16 count);
bool8 AddPCItem(u16 itemId, u16 count);
void RemovePCItem(u8 index, u16 count);
void SwapRegisteredBike(void);
const u8 *ItemId_GetName(u16 itemId);
u16 ItemId_GetId(u16 itemId);
@ -75,7 +74,7 @@ u16 GetPcItemQuantity(u16 *);
void SetBagPocketsPointers(void);
void ItemPcCompaction(void);
void RemoveItemFromPC(u16 itemId, u16 quantity);
void RemovePCItem(u16 itemId, u16 quantity);
void SortAndCompactBagPocket(struct BagPocket * pocket);
u8 CountItemsInPC(void);
void ApplyNewEncryptionKeyToBagItems_(u32 newKey);

4
include/item_menu.h
View File

@ -25,7 +25,7 @@ extern u16 gSpecialVar_ItemId;
// Exported ROM declarations
void sub_81AAC50(void);
void sub_81AAC70(void);
void sub_8108CF0(void);
void CB2_SetUpReshowBattleScreenAfterMenu(void);
void sub_81089BC(void);
void sub_810B108(u8);
void CB2_BagMenuFromStartMenu(void);
@ -39,6 +39,6 @@ void sub_8107ECC(void);
void sub_810AF74(void);
void sub_8108DC8(u8 pocketId);
void sub_81089F4(u8 pocketId);
void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback);
void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
#endif //GUARD_ITEM_MENU_H

1
include/item_use.h
View File

@ -40,5 +40,6 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId);
void ItemUseOutOfBattle_Itemfinder(u8 taskId);
void sub_80A1C44(u8 taskId);
u8 CanUseEscapeRopeOnCurrMap(void);
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
#endif //GUARD_ITEM_USE_H

4
include/link_rfu.h
View File

@ -1,6 +1,9 @@
#ifndef GUARD_LINK_RFU_H
#define GUARD_LINK_RFU_H
#include "global.h"
#include "librfu.h"
struct Padded_U8
{
u8 value;
@ -42,6 +45,7 @@ void sub_80F8DC0(void);
void sub_80FBB20(void);
bool8 sub_80FA484(bool32 a0);
void var_800D_set_xB(void);
struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void);
#include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];

12
include/list_menu.h
View File

@ -53,8 +53,8 @@ struct ListMenuTemplate
struct ListMenu
{
struct ListMenuTemplate template;
u16 scrollOffset;
u16 selectedRow;
u16 cursorPos;
u16 itemsAbove;
u8 unk_1C;
u8 unk_1D;
u8 taskId;
@ -73,12 +73,12 @@ struct ListMenuWindowRect
extern struct ListMenuTemplate gMultiuseListMenuTemplate;
s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 arg2, u16 tileNum, u16 palNum);
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 scrollOffset, u16 selectedRow);
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 cursorPos, u16 itemsAbove);
u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 cursorPos, u16 itemsAbove);
s32 ListMenu_ProcessInput(u8 listTaskId);
void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
void DestroyListMenuTask(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
void RedrawListMenu(u8 listTaskId);
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);

7
include/menu_helpers.h
View File

@ -5,6 +5,9 @@
#include "task.h"
#include "window.h"
#define MENU_L_PRESSED 1
#define MENU_R_PRESSED 2
struct YesNoFuncTable
{
TaskFunc yesFunc;
@ -22,9 +25,9 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
u8 GetLRKeysState(void);
u8 sub_80BF66C(void);
u8 GetLRKeysPressedAndHeld(void);
bool8 itemid_link_can_give_berry(u16 itemId);
bool8 itemid_80BF6D8_mail_related(u16 itemId);
void ClearVramOamPltt(void);
void ResetVramOamAndBgCntRegs(void);
#endif //GUARD_MENU_HELPERS_H

4
include/new_menu_helpers.h
View File

@ -15,8 +15,8 @@ void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 o
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
void * MallocAndDecompress(const void * src, u32 * size);
void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height);
void ResetBgPositions(void);
void InitStandardTextBoxWindows(void);
void FreeAllOverworldWindowBuffers(void);

4
include/overworld.h
View File

@ -72,7 +72,7 @@ void Overworld_ChangeMusicTo(u16);
bool32 IsUpdateLinkStateCBActive(void);
void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16);
const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
void CB2_ReturnToField(void);
@ -140,7 +140,7 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd
bool32 sub_8058318(void);
void CB2_ReturnToStartMenu(void);
void CB2_ReturnToFieldWithOpenMenu(void);
void CB2_WhiteOut(void);
void c2_8056854(void);
void sub_8054F38(u32 newKey);

149
include/party_menu.h
View File

@ -3,92 +3,85 @@
#include "main.h"
#include "task.h"
#include "constants/party_menu.h"
enum {
AILMENT_NONE,
AILMENT_PSN,
AILMENT_PRZ,
AILMENT_SLP,
AILMENT_FRZ,
AILMENT_BRN,
AILMENT_PKRS,
AILMENT_FNT
};
enum
{
PARTY_CHOOSE_MON,
PARTY_MUST_CHOOSE_MON,
PARTY_CANT_SWITCH,
PARTY_USE_ITEM_ON,
PARTY_ABILITY_PREVENTS,
PARTY_GIVE_ITEM,
};
struct Struct203B0A0
struct PartyMenu
{
MainCallback exitCallback;
TaskFunc unk4;
u8 unk8_0:4;
u8 mode:2;
u8 unk8_2:2;
s8 unk9;
s8 unkA;
u8 unkB;
u16 unkC;
s16 unkE;
s16 unk10;
TaskFunc task;
u8 menuType:4;
u8 layout:2;
u8 unk_8_6:2;
s8 slotId;
s8 slotId2;
u8 action;
u16 bagItem;
s16 data1; // used variously as a moveId, counter, moveSlotId, or cursorPos
s16 learnMoveState;
};
extern struct Struct203B0A0 gUnknown_203B0A0;
extern u8 gUnknown_203B0C0;
extern u8 gUnknown_203B0C1;
extern u8 gUnknown_203B0DC[3];
extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
extern struct PartyMenu gPartyMenu;
extern bool8 gPartyMenuUseExitCallback;
extern u8 gSelectedMonPartyId;
extern MainCallback gPostMenuFieldCallback;
extern u8 gSelectedOrderFromParty[3];
extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 MonKnowsMove(struct Pokemon *, u16);
void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void);
u8 pokemon_ailments_get_primary(u32 status);
u16 ItemIdToBattleMoveId(u16 itemId);
void sub_8125B40(u8 taskId, TaskFunc func);
void sub_8124C8C(void);
void sub_8126EDC(void);
void c2_8123744(void);
u8 GetCursorSelectionMonId(void);
void sub_8128370(void);
void sub_811F818(u8 monId, u8 a1);
void sub_8121D0C(u8);
void sub_811FB28(u8 taskId);
void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
void GetMonNickname(const struct Pokemon * mon, u8 * dest);
void sub_81202F8(const u8 * src, u8 a1);
bool8 sub_8120370(void);
void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc);
void dp05_pp_up(u8 taskId, TaskFunc followUpFunc);
void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
void sub_8126894(u8 taskId, TaskFunc followUpFunc);
void sub_81279E0(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
u8 GetItemEffectType(u16 itemId);
u8 pokemon_order_func(u8);
void sub_8127CAC(void);
void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
void OpenPartyMenuInBattle(u8 arg);
void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
extern void (*gItemUseCB)(u8, TaskFunc);
void InitPartyMenu(u8 menuType, u8 layout, u8 partyAction, bool8 keepCursorPos, u8 messageId, TaskFunc task, MainCallback callback);
void AnimatePartySlot(u8 slot, u8 animNum);
bool8 IsMultiBattle(void);
void sub_8126EDC(void);
void sub_812256C(u8 *partyCount, u8 (*icons)[6], u8 side);
void PartyMenuInit_FromPlayerPc(void);
void CB2_PartyMenuFromStartMenu(void);
void sub_8128198(void);
void sub_8127FF4(u8 slot, u8 slot2);
u8 GetCursorSelectionMonId(void);
u8 GetPartyMenuType(void);
void Task_HandleChooseMonInput(u8 taskId);
u8 *GetMonNickname(struct Pokemon *mon, u8 *dest);
u8 DisplayPartyMenuMessage(const u8 *str, bool8 keepOpen);
bool8 IsPartyMenuTextPrinterActive(void);
void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 hpDifference, TaskFunc task);
u8 GetAilmentFromStatus(u32 status);
u8 GetMonAilment(struct Pokemon *mon);
void DisplayPartyMenuStdMessage(u32 stringId);
void LoadHeldItemIcons(void);
void sub_8127968(void);
void DrawHeldItemIconsForTrade(u8 *partyCounts, u8 *partySpriteIds, u8 whichParty);
void SpriteCB_BounceConfirmCancelButton(u8 spriteId, u8 spriteId2, u8 animNum);
void CB2_SelectBagItemToGive(void);
void CB2_GiveHoldItem(void);
bool8 FieldCallback_PrepareFadeInFromMenu(void);
void CB2_ReturnToPartyMenuFromFlyMap(void);
void sub_8124C1C(const u8 *healLocCtrlData);
void CB2_ShowPartyMenuForItemUse(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc func);
void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func);
void ItemUseCB_PPRecovery(u8 taskId, UNUSED TaskFunc func);
void ItemUseCB_PPUp(u8 taskId, UNUSED TaskFunc func);
u16 ItemIdToBattleMoveId(u16 item);
bool8 IsMoveHm(u16 move);
bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
void ItemUseCB_TMHM(u8 taskId, UNUSED TaskFunc func);
void ItemUseCB_RareCandy(u8 taskId, TaskFunc func);
void ItemUseCB_SacredAsh(u8 taskId, UNUSED TaskFunc func);
void ItemUseCB_EvolutionStone(u8 taskId, TaskFunc func);
u8 GetItemEffectType(u16 item);
void CB2_PartyMenuFromStartMenu(void);
void CB2_ChooseMonToGiveItem(void);
void ChooseMonToGiveMailFromMailbox(void);
void InitChooseHalfPartyForBattle(u8 a1);
void ClearSelectedPartyOrder(void);
void sub_81277F4(u8 menuType, MainCallback callback);
void ChooseMonForMoveTutor(void);
void ChooseMonForWirelessMinigame(void);
void OpenPartyMenuInTutorialBattle(u8 partyAction);
void OpenPartyMenuInBattle(void);
void ChooseMonForInBattleItem(void);
void sub_81279E0(void);
void BufferBattlePartyCurrentOrder(void);
void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 flankId);
void SwitchPartyOrderLinkMulti(u8 battlerId, u8 slot, u8 slot2);
void SwitchPartyMonSlots(u8 slot, u8 slot2);
u8 GetPartyIdFromBattlePartyId(u8 battlePartyId);
void ShowPartyMenuToShowcaseMultiBattleParty(void);
void ChooseMonForDaycare(void);
void ChoosePartyMonByMenuType(u8 menuType);
#endif // GUARD_PARTY_MENU_H

5
include/player_pc.h
View File

@ -8,8 +8,8 @@
struct PlayerPCItemPageStruct
{
u16 selectedRow;
u16 scrollOffset;
u16 cursorPos;
u16 itemsAbove;
u8 pageItems;
u8 count;
u8 filler_6[3];
@ -25,5 +25,6 @@ extern struct PlayerPCItemPageStruct gPlayerPcMenuManager;
void sub_816B060(u8 taskId);
void NewGameInitPCItems(void);
void Mailbox_ReturnToMailListAfterDeposit(void);
#endif //GUARD_PLAYER_PC_H

4
include/pokemon.h
View File

@ -582,7 +582,7 @@ void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex);
void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex);
bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e);
bool8 PokemonUseItemEffects2(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
bool8 PokemonItemUseNoEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit);
const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId);
u8 GetNature(struct Pokemon *mon);
@ -593,7 +593,7 @@ u16 HoennToNationalOrder(u16 hoennNum);
u16 SpeciesToCryId(u16 species);
void DrawSpindaSpots(u16 species, u32 personality, u8 *dest, u8 a4);
void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
bool8 sub_80435E0(void);
bool8 GetPlayerFlankId(void);
bool16 GetLinkTrainerFlankId(u8 linkPlayerId);
s32 GetBattlerMultiplayerId(u16 a1);
u8 GetTrainerEncounterMusicId(u16 trainer);

2
include/pokemon_icon.h
View File

@ -22,6 +22,6 @@ u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subprior
u8 UpdateMonIconFrame(struct Sprite * sprite);
void LoadMonIconPalette(u16 iconId);
void FreeMonIconPalette(u16 iconId);
void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum);
void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum);
#endif // GUARD_POKEMON_ICON_H

1
include/pokemon_jump.h
View File

@ -4,5 +4,6 @@
#include "main.h"
void ResetPokeJumpResults(void);
bool32 IsSpeciesAllowedInPokemonJump(u16 species);
#endif // GUARD_POKEMON_JUMP_H

6
include/pokemon_special_anim.h
View File

@ -5,8 +5,12 @@
void sub_811E5B8(u16, u16, u16, u16, u16, u16);
bool8 sub_811E680(void);
void GetMonLevelUpWindowStats(struct Pokemon *mon, u16 *currStats);
void BufferMonStatsToTaskData(struct Pokemon *mon, u16 *currStats);
void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bgClr, u8 fgClr, u8 shadowClr);
void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 shadowClr);
void sub_811C540(u8 slotId, u16 itemId, MainCallback callback);
void sub_811C5AC(u8 slotId, u16 itemId, MainCallback callback);
u32 sub_811D178(void);
void sub_811C568(u8 slotId, u16 itemId, u16 moveId, MainCallback callback);
#endif // GUARD_POKEMON_SPECIAL_ANIM_H

2
include/pokemon_summary_screen.h
View File

@ -32,7 +32,7 @@ enum PokemonSummaryScreenPage
PSS_PAGE_CONTEST_MOVES,
};
s32 sub_8138B20(void);
s32 GetLastViewedMonIndex(void);
void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H

3
include/quest_log.h
View File

@ -47,7 +47,6 @@ void sub_81139BC(void);
void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx);
void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value);
void sub_8110840(void *oldSave);
extern u8 gUnknown_203ADFA;
void sub_8112F18(u8 windowId);
#endif //GUARD_QUEST_LOG_H

3
include/region_map.h
View File

@ -94,7 +94,8 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y);
void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
u8 *GetMapName(u8 *, u16, u16);
bool32 sub_8124668(u8 mapSecId);
void sub_80C4DF8(u8 *, u8);
void GetMapNameGeneric(u8 *, u8);
void sub_80BFF50(u8 a0, void (*a1)(void));
void MCB2_FlyMap(void);
#endif //GUARD_REGION_MAP_H

154
include/strings.h
View File

@ -181,19 +181,19 @@ extern const u8 gUnknown_8416644[];
extern const u8 gUnknown_841665C[];
extern const u8 gUnknown_8416690[];
extern const u8 gUnknown_84166A7[];
extern const u8 gUnknown_84169DC[];
extern const u8 gText_WontHaveEffect[];
extern const u8 gUnknown_841623D[];
extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[];
// pokemon
extern const u8 BattleText_Rose[];
extern const u8 BattleText_UnknownString3[];
extern const u8 BattleText_GetPumped[];
extern const u8 BattleText_MistShroud[];
extern const u8 gBattleText_Rose[];
extern const u8 gBattleText_UnknownString3[];
extern const u8 gBattleText_GetPumped[];
extern const u8 gBattleText_MistShroud[];
extern const u8 gText_BadEgg[];
extern const u8 gText_PkmnsXPreventsSwitching[];
extern u8 *gUnknown_83FD5D0[];
extern const u8 *const gStatNamesTable[];
// diploma
extern const u8 gUnknown_841B60E[];
@ -265,6 +265,140 @@ extern const u8 gUnknown_81C6787[];
extern const u8 gUnknown_81C684B[];
extern const u8 gUnknown_81C686C[];
// party_menu
extern const u8 gText_ChoosePokemon[];
extern const u8 gText_ChoosePokemonCancel[];
extern const u8 gText_ChoosePokemonConfirm[];
extern const u8 gText_MoveToWhere[];
extern const u8 gText_TeachWhichPokemon[];
extern const u8 gText_UseOnWhichPokemon[];
extern const u8 gText_GiveToWhichPokemon[];
extern const u8 gText_NothingToCut[];
extern const u8 gText_CantSurfHere[];
extern const u8 gText_AlreadySurfing[];
extern const u8 gText_CurrentIsTooFast[];
extern const u8 gText_EnjoyCycling[];
extern const u8 gText_InUseAlready_PM[];
extern const u8 gText_CantUseHere[];
extern const u8 gText_NoPokemonForBattle[];
extern const u8 gText_ChoosePokemon2[];
extern const u8 gText_NotEnoughHp[];
extern const u8 gText_ThreePkmnAreNeeded[];
extern const u8 gText_TwoPokemonAreNeeded[];
extern const u8 gText_PokemonCantBeSame[];
extern const u8 gText_NoIdenticalHoldItems[];
extern const u8 gString_Dummy[];
extern const u8 gText_DoWhatWithPokemon[];
extern const u8 gText_RestoreWhichMove[];
extern const u8 gText_BoostPp[];
extern const u8 gText_DoWhatWithItem[];
extern const u8 gText_DoWhatWithMail[];
extern const u8 gText_NoUse[];
extern const u8 gText_Able[];
extern const u8 gText_First_PM[];
extern const u8 gText_Second_PM[];
extern const u8 gText_Third_PM[];
extern const u8 gText_NotAble[];
extern const u8 gText_Able3[];
extern const u8 gText_NotAble2[];
extern const u8 gText_Learned[];
extern const u8 gText_Able2[];
extern const u8 gText_CutATreeOrGrass[];
extern const u8 gText_FlyToAKnownTown[];
extern const u8 gText_TravelOnWater[];
extern const u8 gText_MoveHeavyBoulders[];
extern const u8 gText_LightUpDarkness[];
extern const u8 gText_ShatterACrackedRock[];
extern const u8 gText_ClimbAWaterfall[];
extern const u8 gText_EscapeFromHere[];
extern const u8 gText_LureWildPokemon[];
extern const u8 gText_ShareHp[];
extern const u8 gText_ReturnToAHealingSpot[];
extern const u8 gText_Summary5[];
extern const u8 gText_Switch2[];
extern const u8 gText_Item[];
extern const u8 gText_Take[];
extern const u8 gText_Mail[];
extern const u8 gText_Take2[];
extern const u8 gText_Read2[];
extern const u8 gText_Shift[];
extern const u8 gText_SendOut[];
extern const u8 gText_Enter[];
extern const u8 gText_NoEntry[];
extern const u8 gText_Store[];
extern const u8 gText_Register[];
extern const u8 gText_Trade4[];
extern const u8 gText_NotPkmnOtherTrainerWants[];
extern const u8 gText_ThatIsntAnEgg[];
extern const u8 gText_PkmnCantBeTradedNow[];
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainerCantAcceptPkmn[];
extern const u8 gText_CantTradeWithTrainer[];
extern const u8 gUnknown_84176CF[];
extern const u8 gText_PkmnWasGivenItem[];
extern const u8 gText_ReceivedItemFromPkmn[];
extern const u8 gText_PkmnAlreadyHoldingItemSwitch[];
extern const u8 gText_SwitchedPkmnItem[];
extern const u8 gText_BagFullCouldNotRemoveItem[];
extern const u8 gText_PkmnCantParticipate[];
extern const u8 gText_CancelParticipation[];
extern const u8 gUnknown_8417494[];
extern const u8 gMenuText_Confirm[];
extern const u8 gText_Lv[];
extern const u8 gText_MaleSymbol[];
extern const u8 gText_FemaleSymbol[];
extern const u8 gText_Slash[];
extern const u8 gUnknown_8417457[];
extern const u8 gText_PkmnNotHolding[];
extern const u8 gText_PCMailboxFull[];
extern const u8 gText_MailSentToPC[];
extern const u8 gText_MailMessageWillBeLost[];
extern const u8 gText_SendMailToPC[];
extern const u8 gText_MailTakenFromPkmn[];
extern const u8 gUnknown_8416B3E[];
extern const u8 gUnknown_8416B16[];
extern const u8 gText_PauseUntilPress[];
extern const u8 gText_CantUseUntilNewBadge[];
extern const u8 gText_ReturnToHealingSpot[];
extern const u8 gText_EscapeFromHereAndReturnTo[];
extern const u8 gText_PkmnCuredOfPoison[];
extern const u8 gText_PkmnWokeUp2[];
extern const u8 gText_PkmnBurnHealed[];
extern const u8 gText_PkmnThawedOut[];
extern const u8 gText_PkmnCuredOfParalysis[];
extern const u8 gText_PkmnSnappedOutOfConfusion[];
extern const u8 gText_PkmnGotOverInfatuation[];
extern const u8 gText_PkmnBecameHealthy[];
extern const u8 gText_HP3[];
extern const u8 gText_Attack3[];
extern const u8 gText_Defense3[];
extern const u8 gText_Speed2[];
extern const u8 gText_SpAtk3[];
extern const u8 gText_SpDef3[];
extern const u8 gText_PkmnBaseVar2StatIncreased[];
extern const u8 gText_MovesPPIncreased[];
extern const u8 gText_PPWasRestored[];
extern const u8 gText_PkmnHPRestoredByVar2[];
extern const u8 gText_PkmnNeedsToReplaceMove[];
extern const u8 gText_PkmnCantLearnMove[];
extern const u8 gText_PkmnAlreadyKnows[];
extern const u8 gText_PkmnLearnedMove3[];
extern const u8 gText_WhichMoveToForget[];
extern const u8 gText_12PoofForgotMove[];
extern const u8 gText_StopLearningMove2[];
extern const u8 gText_MoveNotLearned[];
extern const u8 gText_PkmnElevatedToLvVar2[];
extern const u8 gText_PkmnHoldingItemCantHoldMail[];
extern const u8 gText_MailTransferredFromMailbox[];
extern const u8 gText_RemoveMailBeforeItem[];
extern const u8 gText_CantSwitchWithAlly[];
extern const u8 gText_PkmnHasNoEnergy[];
extern const u8 gText_PkmnAlreadyInBattle[];
extern const u8 gText_EggCantBattle[];
extern const u8 gText_PkmnAlreadySelected[];
extern const u8 gText_PkmnCantSwitchOut[];
// credits
extern const u8 gString_Dummy[];
extern const u8 gString_PokemonFireRed_Staff[]; // FR
@ -390,7 +524,7 @@ extern const u8 gText_Pokedex[];
extern const u8 gTextJPDummy_Hiki[];
extern const u8 gText_Badges[];
extern const u8 gTextJPDummy_Ko[];
extern const u8 gUnknown_841B6F4[];
extern const u8 gText_Register[];
// mystery_gift_menu
extern const u8 gText_PickOKExit[];
@ -703,9 +837,9 @@ extern const u8 gUnknown_841E16B[];
extern const u8 gUnknown_8417094[];
extern const u8 gUnknown_841E199[];
extern const u8 gUnknown_841E1C5[];
extern const u8 gUnknown_84170BC[];
extern const u8 gUnknown_84170E0[];
extern const u8 gUnknown_84170FC[];
extern const u8 gText_PkmnCantBeTradedNow[];
extern const u8 gText_EggCantBeTradedNow[];
extern const u8 gText_OtherTrainersPkmnCantBeTraded[];
extern const u8 gUnknown_841E09F[];
extern const u8 gEasyChatGroupName_Pokemon[];

6
include/trade.h
View File

@ -1,11 +1,17 @@
#ifndef GUARD_TRADE_H
#define GUARD_TRADE_H
#include "global.h"
#include "librfu.h"
#include "constants/trade.h"
extern struct MailStruct gLinkPartnerMail[6];
extern u8 gSelectedTradeMonPositions[2];
extern const u16 gUnknown_826601C[];
void CB2_ReturnFromLinkTrade(void);
s32 sub_804FB34(void);
s32 CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, u16 species2, u16 species, u8 isObedientBitSet); // TODO: currently in link_rfu_2.s. further file split needed?
s32 GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct rfuPlayer, struct UnkLinkRfuStruct_02022B14Substruct rfuPartner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, u8 isObedientBitSet);
#endif //GUARD_TRADE_H

2
include/trainer_tower.h
View File

@ -6,5 +6,7 @@ void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
void ResetTrainerTowerResults(void);
void sub_815DA28(u8 *text);
u8 sub_815DA10(void);
#endif //GUARD_TRAINER_TOWER_H

7
include/union_room.h
View File

@ -1,6 +1,9 @@
#ifndef GUARD_UNION_ROOM_H
#define GUARD_UNION_ROOM_H
#include "global.h"
#include "librfu.h"
struct UnkStruct_Shared
{
struct UnkLinkRfuStruct_02022B14 field_0;
@ -146,4 +149,8 @@ struct TradeUnkStruct
u32 personality;
};
extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_203B064;
extern u16 gUnionRoomOfferedSpecies;
extern u8 gUnionRoomRequestedMonType;
#endif //GUARD_UNION_ROOM_H

8
ld_script.txt
View File

@ -195,7 +195,7 @@ SECTIONS {
src/fldeff_strength.o(.text);
src/battle_transition.o(.text);
src/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/battle_message.o(.text);
src/math_util.o(.text);
src/roulette_util.o(.text);
src/cable_car_util.o(.text);
@ -239,7 +239,7 @@ SECTIONS {
src/quest_log.o(.text);
asm/link_rfu_3.o(.text);
asm/pokemon_special_anim.o(.text);
asm/party_menu.o(.text);
src/party_menu.o(.text);
asm/union_room_chat.o(.text);
src/help_system_812B1E0.o(.text);
src/quest_log_battle.o(.text);
@ -477,7 +477,7 @@ SECTIONS {
src/evolution_scene.o(.rodata);
src/battle_transition.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
data/battle_message.o(.rodata);
src/battle_message.o(.rodata);
src/save.o(.rodata);
data/field_effect_helpers.o(.rodata);
src/battle_controller_safari.o(.rodata);
@ -516,7 +516,7 @@ SECTIONS {
src/quest_log.o(.rodata);
data/link_rfu_3.o(.rodata);
data/pokemon_special_anim.o(.rodata);
data/party_menu.o(.rodata);
src/party_menu.o(.rodata);
data/union_room_chat.o(.rodata);
src/help_system_812B1E0.o(.rodata);
src/fame_checker.o(.rodata);

10
src/battle_controller_oak_old_man.c
View File

@ -355,7 +355,7 @@ static void OpenPartyMenuToChooseMon(void)
caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers();
OpenPartyMenuInBattle(caseId);
OpenPartyMenuInTutorialBattle(caseId);
}
}
@ -363,8 +363,8 @@ static void WaitForMonSelection(void)
{
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{
if (gUnknown_203B0C0 == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gSelectedMonPartyId, gBattlePartyCurrentOrder);
else
BtlController_EmitChosenMonReturnValue(1, 6, NULL);
OakOldManBufferExecCompleted();
@ -1879,7 +1879,7 @@ static void OakOldManHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
}
static void OakOldManHandleChoosePokemon(void)
@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;

10
src/battle_controller_player.c
View File

@ -1305,7 +1305,7 @@ static void OpenPartyMenuToChooseMon(void)
caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers();
OpenPartyMenuInBattle(caseId);
OpenPartyMenuInTutorialBattle(caseId);
}
}
@ -1313,8 +1313,8 @@ static void WaitForMonSelection(void)
{
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{
if (gUnknown_203B0C0 == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gSelectedMonPartyId, gBattlePartyCurrentOrder);
else
BtlController_EmitChosenMonReturnValue(1, 6, NULL);
if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
@ -2462,7 +2462,7 @@ static void PlayerHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][1 + i];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][1 + i];
}
static void PlayerHandleChoosePokemon(void)
@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;

10
src/battle_controller_pokedude.c
View File

@ -706,7 +706,7 @@ static void OpenPartyMenuToChooseMon(void)
gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection;
DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers();
sub_8127968();
OpenPartyMenuInBattle();
}
}
@ -714,8 +714,8 @@ static void WaitForMonSelection(void)
{
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{
if (gUnknown_203B0C0 == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gSelectedMonPartyId, gBattlePartyCurrentOrder);
else
BtlController_EmitChosenMonReturnValue(1, 6, NULL);
PokedudeBufferExecCompleted();
@ -1985,7 +1985,7 @@ static void PokedudeHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
}
static void PokedudeHandleChoosePokemon(void)
@ -1998,7 +1998,7 @@ static void PokedudeHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][4 + i];
gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i];
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler;

6
src/battle_controllers.c
View File

@ -75,7 +75,7 @@ void sub_800D30C(void)
SetBattlePartyIds();
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
for (i = 0; i < gBattlersCount; ++i)
sub_8127DA8(i, 0);
BufferBattlePartyCurrentOrderBySide(i, 0);
}
static void InitSinglePlayerBtlControllers(void)
@ -199,11 +199,11 @@ static void InitLinkBtlControllers(void)
{
case 0:
case 3:
sub_8127DA8(gLinkPlayers[i].id, 0);
BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
sub_8127DA8(gLinkPlayers[i].id, 1);
BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
break;
}
if (i == multiplayerId)

6
src/battle_gfx_sfx_util.c
View File

@ -620,7 +620,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId)
break;
case 6:
LoadAndCreateEnemyShadowSprites();
sub_8127CAC();
BufferBattlePartyCurrentOrder();
retVal = TRUE;
break;
}
@ -859,8 +859,8 @@ void HandleBattleLowHpMusicChange(void)
{
u8 playerBattler1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
u8 playerBattler2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
u8 battler1PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler1]);
u8 battler2PartyId = pokemon_order_func(gBattlerPartyIndexes[playerBattler2]);
u8 battler1PartyId = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[playerBattler1]);
u8 battler2PartyId = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[playerBattler2]);
if (GetMonData(&gPlayerParty[battler1PartyId], MON_DATA_HP) != 0)
HandleLowHpMusicChange(&gPlayerParty[battler1PartyId], playerBattler1);

52
src/battle_main.c
View File

@ -144,7 +144,7 @@ static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0};
EWRAM_DATA u32 gBattleTypeFlags = 0;
EWRAM_DATA u8 gBattleTerrain = 0;
EWRAM_DATA u32 gUnknown_2022B54 = 0;
EWRAM_DATA struct UnknownPokemonStruct4 gUnknown_2022B58[3] = {0};
EWRAM_DATA struct UnknownPokemonStruct4 gMultiPartnerParty[3] = {0};
EWRAM_DATA u8 *gUnknown_2022BB8 = NULL;
EWRAM_DATA u8 *gUnknown_2022BBC = NULL;
EWRAM_DATA u16 *gUnknown_2022BC0 = NULL;
@ -1078,16 +1078,16 @@ static void sub_80108C4(void)
for (i = 0; i < 3; ++i)
{
gUnknown_2022B58[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
gUnknown_2022B58[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
nick = gUnknown_2022B58[i].nickname;
gMultiPartnerParty[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
gMultiPartnerParty[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
nick = gMultiPartnerParty[i].nickname;
GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick);
gUnknown_2022B58[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
gUnknown_2022B58[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
gUnknown_2022B58[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
gUnknown_2022B58[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
gUnknown_2022B58[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
gUnknown_2022B58[i].gender = GetMonGender(&gPlayerParty[i]);
gMultiPartnerParty[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
gMultiPartnerParty[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
gMultiPartnerParty[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
gMultiPartnerParty[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
gMultiPartnerParty[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
gMultiPartnerParty[i].gender = GetMonGender(&gPlayerParty[i]);
StripExtCtrlCodes(nick);
if (GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
{
@ -1098,7 +1098,7 @@ static void sub_80108C4(void)
cur[j] = EOS;
}
}
memcpy(&gBattleStruct->field_184, gUnknown_2022B58, sizeof(gUnknown_2022B58));
memcpy(&gBattleStruct->field_184, gMultiPartnerParty, sizeof(gMultiPartnerParty));
}
static void CB2_PreInitMultiBattle(void)
@ -1123,7 +1123,7 @@ static void CB2_PreInitMultiBattle(void)
if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
{
sub_80108C4();
SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gUnknown_2022B58));
SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gMultiPartnerParty));
++gBattleCommunication[MULTIUSE_STATE];
}
break;
@ -1137,13 +1137,13 @@ static void CB2_PreInitMultiBattle(void)
continue;
if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1))
|| (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1))
memcpy(gUnknown_2022B58, gBlockRecvBuffer[i], sizeof(gUnknown_2022B58));
memcpy(gMultiPartnerParty, gBlockRecvBuffer[i], sizeof(gMultiPartnerParty));
}
++gBattleCommunication[MULTIUSE_STATE];
*savedCallback = gMain.savedCallback;
*savedBattleTypeFlags = gBattleTypeFlags;
gMain.savedCallback = CB2_PreInitMultiBattle;
sub_8128198();
ShowPartyMenuToShowcaseMultiBattleParty();
}
break;
case 2:
@ -3004,22 +3004,22 @@ void sub_8013F6C(u8 battler)
u8 r4, r1;
for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60));
r4 = pokemon_order_func(gBattlerPartyIndexes[battler]);
r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler));
sub_8127FF4(r4, r1);
gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60));
r4 = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[battler]);
r1 = GetPartyIdFromBattlePartyId(*(gBattleStruct->monToSwitchIntoId + battler));
SwitchPartyMonSlots(r4, r1);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
for (i = 0; i < 3; ++i)
{
*(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
*(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
*(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
*(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
}
}
else
{
for (i = 0; i < 3; ++i)
*(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i];
*(battler * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
}
}
@ -3137,7 +3137,7 @@ static void HandleTurnActionSelectionState(void)
*(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION) || gStatuses3[gActiveBattler] & STATUS3_ROOTED)
{
BtlController_EmitChoosePokemon(0, PARTY_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, PARTY_ACTION_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
}
else if ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG))
|| ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP))
@ -3146,16 +3146,16 @@ static void HandleTurnActionSelectionState(void)
|| ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0))
&& IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL)))
{
BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->field_60[gActiveBattler]);
}
else
{
if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH)
BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH)
BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
else
BtlController_EmitChoosePokemon(0, PARTY_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->field_60[gActiveBattler]);
}
MarkBattlerForControllerExec(gActiveBattler);
break;

2515
src/battle_message.c Normal file
View File

File diff suppressed because it is too large Load Diff

14
src/battle_script_commands.c
View File

@ -4504,7 +4504,7 @@ static void atk4F_jumpifcantswitch(void)
static void sub_8024398(u8 arg0)
{
*(gBattleStruct->field_58 + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler];
BtlController_EmitChoosePokemon(0, PARTY_MUST_CHOOSE_MON, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
BtlController_EmitChoosePokemon(0, PARTY_ACTION_SEND_OUT, arg0, 0, gBattleStruct->field_60[gActiveBattler]);
MarkBattlerForControllerExec(gActiveBattler);
}
@ -4739,9 +4739,9 @@ static void atk50_openpartyscreen(void)
else
{
if (gBattlescriptCurrInstr[1] & OPEN_PARTY_ALLOW_CANCEL)
hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function.
hitmarkerFaintBits = PARTY_ACTION_CHOOSE_MON; // Used here as the caseId for the EmitChoose function.
else
hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON;
hitmarkerFaintBits = PARTY_ACTION_SEND_OUT;
battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL));
if (gSpecialStatuses[battlerId].flag40)
{
@ -5831,7 +5831,7 @@ static void DrawLevelUpWindow1(void)
{
u16 currStats[NUM_STATS];
GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
BufferMonStatsToTaskData(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
DrawLevelUpWindowPg1(12, gBattleResources->beforeLvlUp->stats, currStats, 0xE, 0xD, 0xF);
}
@ -5839,7 +5839,7 @@ static void DrawLevelUpWindow2(void)
{
u16 currStats[NUM_STATS];
GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
BufferMonStatsToTaskData(&gPlayerParty[gBattleStruct->expGetterMonId], currStats);
DrawLevelUpWindowPg2(12, currStats, 0xE, 0xD, 0xF);
}
@ -7140,8 +7140,8 @@ static void atk8F_forcerandomswitch(void)
*(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
if (!IsMultiBattle())
sub_8013F6C(gBattlerTarget);
sub_8127EC4(gBattlerTarget, i, 0);
sub_8127EC4(gBattlerTarget ^ 2, i, 1);
SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0);
SwitchPartyOrderLinkMulti(gBattlerTarget ^ 2, i, 1);
}
}
else

6
src/berry_pouch.c
View File

@ -765,7 +765,7 @@ static void PrintSelectedBerryDescription(s32 itemIdx)
static void SetDescriptionWindowBorderPalette(s32 pal)
{
SetBgRectPal(1, 0, 16, 30, 4, pal + 1);
SetBgTilemapPalette(1, 0, 16, 30, 4, pal + 1);
ScheduleBgCopyTilemapToVram(1);
}
@ -1194,7 +1194,7 @@ static void Task_BerryPouch_Give(u8 taskId)
Task_Give_PrintThereIsNoPokemon(taskId);
else
{
sResources->exitCallback = sub_8126EDC;
sResources->exitCallback = CB2_ChooseMonToGiveItem;
gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
}
}
@ -1251,7 +1251,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId)
}
else
{
sResources->exitCallback = c2_8123744;
sResources->exitCallback = CB2_GiveHoldItem;
gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
}
}

1316
src/data/party_menu.h Normal file
View File

File diff suppressed because it is too large Load Diff

2813
src/data/pokemon/tutor_learnsets.h Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/daycare.c
View File

@ -1582,7 +1582,7 @@ void ShowDaycareLevelMenu(void)
void ChooseSendDaycareMon(void)
{
sub_8128370();
ChooseMonForDaycare();
gMain.savedCallback = CB2_ReturnToField;
}

2
src/field_fadetransition.c
View File

@ -522,7 +522,7 @@ static bool32 sub_807E40C(void)
bool32 sub_807E418(void)
{
if (field_weather_is_fade_finished() == TRUE && sub_80F83B0())
if (IsWeatherNotFadingIn() == TRUE && sub_80F83B0())
return TRUE;
else
return FALSE;

4
src/field_poison.c
View File

@ -43,7 +43,7 @@ static void FaintFromFieldPoison(u8 partyIdx)
static bool32 MonFaintedFromPoison(u8 partyIdx)
{
struct Pokemon *pokemon = gPlayerParty + partyIdx;
if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
if (IsMonValidSpecies(pokemon) && !GetMonData(pokemon, MON_DATA_HP) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
return TRUE;
return FALSE;
}
@ -97,7 +97,7 @@ s32 DoPoisonFieldEffect(void)
u32 numFainted = 0;
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && pokemon_ailments_get_primary(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && GetAilmentFromStatus(GetMonData(pokemon, MON_DATA_STATUS)) == AILMENT_PSN)
{
hp = GetMonData(pokemon, MON_DATA_HP);
if (hp == 0 || --hp == 0)

4
src/field_specials.c
View File

@ -1863,7 +1863,7 @@ void sub_80CC59C(void)
{
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE22) && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22) || gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE23)))
{
sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22))
sp0.unk1 = r5;
else
@ -1875,7 +1875,7 @@ void sub_80CC59C(void)
}
if (gSaveBlock1Ptr->location.mapGroup == sInsideOutsidePairs[r5].grp2 && gSaveBlock1Ptr->location.mapNum == sInsideOutsidePairs[r5].num2)
{
sp0.unk0 = get_mapheader_by_bank_and_number(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
sp0.unk0 = Overworld_GetMapHeaderByGroupAndId(sInsideOutsidePairs[r5].grp, sInsideOutsidePairs[r5].num)->regionMapSectionId;
sp0.unk1 = r5;
if (r5 == 22)
{

2
src/fieldmap.c
View File

@ -60,7 +60,7 @@ const u8 gUnknown_8352F10[] = {
const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection)
{
return get_mapheader_by_bank_and_number(connection->mapGroup, connection->mapNum);
return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
}
void not_trainer_hill_battle_pyramid(void)

60
src/fldeff_softboiled.c
View File

@ -13,9 +13,9 @@ static void sub_80E58A0(u8 taskId);
static void sub_80E5934(u8 taskId);
extern const u8 gUnknown_84169F8[];
extern const u8 gUnknown_8416F27[];
extern const u8 gText_PkmnHPRestoredByVar2[];
bool8 hm_prepare_dive_probably(void)
bool8 SetUpFieldMove_SoftBoiled(void)
{
u16 maxHp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_MAX_HP);
u16 curHp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_HP);
@ -26,27 +26,27 @@ bool8 hm_prepare_dive_probably(void)
return FALSE;
}
void sub_80E56DC(u8 taskId)
void ChooseMonForSoftboiled(u8 taskId)
{
gUnknown_203B0A0.unkB = 10;
gUnknown_203B0A0.unkA = gUnknown_203B0A0.unk9;
sub_811F818(GetCursorSelectionMonId(), 1);
sub_8121D0C(5);
gTasks[taskId].func = sub_811FB28;
gPartyMenu.action = 10;
gPartyMenu.slotId2 = gPartyMenu.slotId;
AnimatePartySlot(GetCursorSelectionMonId(), 1);
DisplayPartyMenuStdMessage(5);
gTasks[taskId].func = Task_HandleChooseMonInput;
}
void sub_80E5724(u8 taskId)
void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
{
u8 r8 = gUnknown_203B0A0.unk9;
u8 r5 = gUnknown_203B0A0.unkA;
u8 r8 = gPartyMenu.slotId;
u8 r5 = gPartyMenu.slotId2;
u16 curHp;
s16 delta;
if (r5 > 6)
{
gUnknown_203B0A0.unkB = 0;
sub_8121D0C(0);
gTasks[taskId].func = sub_811FB28;
gPartyMenu.action = 0;
DisplayPartyMenuStdMessage(0);
gTasks[taskId].func = Task_HandleChooseMonInput;
}
else
{
@ -58,7 +58,7 @@ void sub_80E5724(u8 taskId)
else
{
PlaySE(SE_KAIFUKU);
sub_8120760(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
}
}
}
@ -66,46 +66,46 @@ void sub_80E5724(u8 taskId)
static void sub_80E57E8(u8 taskId)
{
PlaySE(SE_KAIFUKU);
sub_8120760(taskId, gUnknown_203B0A0.unkA, 1, GetMonData(&gPlayerParty[gUnknown_203B0A0.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C);
PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP) / 5, sub_80E583C);
}
static void sub_80E583C(u8 taskId)
{
GetMonNickname(&gPlayerParty[gUnknown_203B0A0.unkA], gStringVar1);
StringExpandPlaceholders(gStringVar4, gUnknown_8416F27);
sub_81202F8(gStringVar4, 0);
GetMonNickname(&gPlayerParty[gPartyMenu.slotId2], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
DisplayPartyMenuMessage(gStringVar4, 0);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = sub_80E58A0;
}
static void sub_80E58A0(u8 taskId)
{
if (sub_8120370() != TRUE)
if (IsPartyMenuTextPrinterActive() != TRUE)
{
gUnknown_203B0A0.unkB = 0;
sub_811F818(gUnknown_203B0A0.unk9, 0);
gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA;
sub_811F818(gUnknown_203B0A0.unkA, 1);
gPartyMenu.action = 0;
AnimatePartySlot(gPartyMenu.slotId, 0);
gPartyMenu.slotId = gPartyMenu.slotId2;
AnimatePartySlot(gPartyMenu.slotId2, 1);
ClearStdWindowAndFrameToTransparent(6, 0);
ClearWindowTilemap(6);
sub_8121D0C(0);
gTasks[taskId].func = sub_811FB28;
DisplayPartyMenuStdMessage(0);
gTasks[taskId].func = Task_HandleChooseMonInput;
}
}
static void sub_80E5900(u8 taskId)
{
if (sub_8120370() != TRUE)
if (IsPartyMenuTextPrinterActive() != TRUE)
{
sub_8121D0C(5);
gTasks[taskId].func = sub_811FB28;
DisplayPartyMenuStdMessage(5);
gTasks[taskId].func = Task_HandleChooseMonInput;
}
}
static void sub_80E5934(u8 taskId)
{
PlaySE(SE_SELECT);
sub_81202F8(gUnknown_84169F8, 0);
DisplayPartyMenuMessage(gUnknown_84169F8, 0);
ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = sub_80E5900;
}

4
src/fldeff_sweetscent.c
View File

@ -13,6 +13,8 @@
#include "wild_encounter.h"
#include "constants/songs.h"
static EWRAM_DATA u8 *gUnknown_203AAB0 = NULL;
static void FieldCallback_SweetScent(void);
static void StartSweetScentFieldEffect(void);
static void TrySweetScentEncounter(u8 taskId);
@ -20,7 +22,7 @@ static void FailSweetScentEncounter(u8 taskId);
static void Unused_StartSweetscentFldeff(void)
{
gUnknown_203B0A0.unk9 = 0;
gPartyMenu.slotId = 0;
FieldCallback_SweetScent();
}

2
src/item.c
View File

@ -412,7 +412,7 @@ bool8 AddPCItem(u16 itemId, u16 count)
return TRUE;
}
void RemoveItemFromPC(u16 itemId, u16 count)
void RemovePCItem(u16 itemId, u16 count)
{
u32 i;
u16 quantity;

8
src/item_pc.c
View File

@ -709,7 +709,7 @@ static void ItemPc_SetScrollPosition(void)
static void ItemPc_SetMessageWindowPalette(int a0)
{
SetBgRectPal(1, 0, 14, 30, 6, a0 + 1);
SetBgTilemapPalette(1, 0, 14, 30, 6, a0 + 1);
ScheduleBgCopyTilemapToVram(1);
}
@ -926,7 +926,7 @@ static void Task_ItemPcWaitButtonAndFinishWithdrawMultiple(u8 taskId)
{
PlaySE(SE_SELECT);
itemId = ItemPc_GetItemIdBySlotId(data[1]);
RemoveItemFromPC(itemId, data[8]);
RemovePCItem(itemId, data[8]);
ItemPcCompaction();
Task_ItemPcCleanUpWithdraw(taskId);
}
@ -1029,8 +1029,8 @@ static void Task_ItemPcGive(u8 taskId)
static void ItemPc_CB2_SwitchToPartyMenu(void)
{
PartyMenuInit(0, 0, 6, 0, 6, sub_811FB28, ItemPc_CB2_ReturnFromPartyMenu);
gUnknown_203B0A0.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition());
InitPartyMenu(0, 0, 6, 0, 6, Task_HandleChooseMonInput, ItemPc_CB2_ReturnFromPartyMenu);
gPartyMenu.bagItem = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition());
}
static void ItemPc_CB2_ReturnFromPartyMenu(void)

161
src/item_use.c
View File

@ -44,37 +44,36 @@
#include "constants/songs.h"
#include "constants/map_types.h"
EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;
void sub_80A1084(void);
void sub_80A109C(u8 taskId);
void sub_80A112C(u8 taskId);
void sub_80A11C0(u8 taskId);
bool8 sub_80A1194(void);
void sub_80A1208(void);
void ItemUseOnFieldCB_Bicycle(u8 taskId);
bool8 ItemUseCheckFunc_Rod(void);
void ItemUseOnFieldCB_Rod(u8 taskId);
void FieldUseFunc_EvoItem(u8 taskId);
void sub_80A1648(u8 taskId);
void sub_80A1674(u8 taskId);
void InitTMCaseFromBag(void);
void Task_InitTMCaseFromField(u8 taskId);
void InitBerryPouchFromBag(void);
void Task_InitBerryPouchFromField(u8 taskId);
void InitBerryPouchFromBattle(void);
void InitTeachyTvFromBag(void);
void Task_InitTeachyTvFromField(u8 taskId);
void sub_80A19E8(u8 taskId);
void sub_80A1A44(void);
void sub_80A1B48(u8 taskId);
void sub_80A1C08(u8 taskId);
void sub_80A1CAC(void);
void sub_80A1CC0(u8 taskId);
void sub_80A1D58(void);
void sub_80A1D68(u8 taskId);
void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId);
void Task_BattleUse_StatBooster_WaitButton_ReturnToBattle(u8 taskId);
static void sub_80A1084(void);
static void sub_80A109C(u8 taskId);
static void sub_80A112C(u8 taskId);
static void sub_80A11C0(u8 taskId);
static bool8 sub_80A1194(void);
static void sub_80A1208(void);
static void ItemUseOnFieldCB_Bicycle(u8 taskId);
static bool8 ItemUseCheckFunc_Rod(void);
static void ItemUseOnFieldCB_Rod(u8 taskId);
static void sub_80A1648(u8 taskId);
static void sub_80A1674(u8 taskId);
static void InitTMCaseFromBag(void);
static void Task_InitTMCaseFromField(u8 taskId);
static void InitBerryPouchFromBag(void);
static void Task_InitBerryPouchFromField(u8 taskId);
static void InitBerryPouchFromBattle(void);
static void InitTeachyTvFromBag(void);
static void Task_InitTeachyTvFromField(u8 taskId);
static void sub_80A19E8(u8 taskId);
static void sub_80A1A44(void);
static void sub_80A1B48(u8 taskId);
static void sub_80A1C08(u8 taskId);
static void sub_80A1CAC(void);
static void sub_80A1CC0(u8 taskId);
static void sub_80A1D58(void);
static void sub_80A1D68(u8 taskId);
static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId);
static void Task_BattleUse_StatBooster_WaitButton_ReturnToBattle(u8 taskId);
// No clue what this is
static const u8 sUnref_83E27B4[] = {
@ -132,14 +131,14 @@ static const u8 sUnref_83E27B4[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
void (*const gUnknown_83E2954[])(void) = {
sub_8124C8C,
static void (*const gUnknown_83E2954[])(void) = {
CB2_ShowPartyMenuForItemUse,
CB2_ReturnToField,
NULL,
NULL
};
void sub_80A0FBC(u8 taskId)
static void sub_80A0FBC(u8 taskId)
{
u8 itemType;
if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY)
@ -160,7 +159,7 @@ void sub_80A0FBC(u8 taskId)
}
}
void sub_80A103C(u8 taskId)
static void sub_80A103C(u8 taskId)
{
if (gTasks[taskId].data[3] != 1)
{
@ -171,21 +170,21 @@ void sub_80A103C(u8 taskId)
sItemUseOnFieldCB(taskId);
}
void sub_80A1084(void)
static void sub_80A1084(void)
{
sub_807DC00();
CreateTask(sub_80A109C, 8);
}
void sub_80A109C(u8 taskId)
static void sub_80A109C(u8 taskId)
{
if (field_weather_is_fade_finished() == TRUE)
if (IsWeatherNotFadingIn() == TRUE)
{
sItemUseOnFieldCB(taskId);
}
}
void sub_80A10C4(u8 taskId, bool8 a1, u8 a2, const u8 * str)
static void sub_80A10C4(u8 taskId, bool8 a1, u8 a2, const u8 * str)
{
StringExpandPlaceholders(gStringVar4, str);
if (a1 == FALSE)
@ -194,12 +193,12 @@ void sub_80A10C4(u8 taskId, bool8 a1, u8 a2, const u8 * str)
DisplayItemMessageOnField(taskId, a2, gStringVar4, sub_80A112C);
}
void sub_80A1110(u8 taskId, bool8 a1)
static void sub_80A1110(u8 taskId, bool8 a1)
{
sub_80A10C4(taskId, a1, 4, gUnknown_8416425);
}
void sub_80A112C(u8 taskId)
static void sub_80A112C(u8 taskId)
{
ClearDialogWindowAndFrame(0, 1);
DestroyTask(taskId);
@ -207,7 +206,7 @@ void sub_80A112C(u8 taskId)
ScriptContext2_Disable();
}
u8 GetItemCompatibilityRule(u16 itemId)
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId)
{
if (ItemId_GetPocket(itemId) == POCKET_TM_CASE)
return 1;
@ -217,12 +216,12 @@ u8 GetItemCompatibilityRule(u16 itemId)
return 0;
}
void sub_80A1184(void)
static void sub_80A1184(void)
{
gFieldCallback2 = sub_80A1194;
}
bool8 sub_80A1194(void)
static bool8 sub_80A1194(void)
{
FreezeEventObjects();
ScriptContext2_Enable();
@ -232,9 +231,9 @@ bool8 sub_80A1194(void)
return TRUE;
}
void sub_80A11C0(u8 taskId)
static void sub_80A11C0(u8 taskId)
{
if (field_weather_is_fade_finished() == TRUE)
if (IsWeatherNotFadingIn() == TRUE)
{
UnfreezeMapObjects();
ScriptContext2_Disable();
@ -248,7 +247,7 @@ void FieldUseFunc_OrangeMail(u8 taskId)
ItemMenu_StartFadeToExitCallback(taskId);
}
void sub_80A1208(void)
static void sub_80A1208(void)
{
struct MailStruct mail;
@ -279,7 +278,7 @@ void FieldUseFunc_MachBike(u8 taskId)
sub_80A1110(taskId, gTasks[taskId].data[3]);
}
void ItemUseOnFieldCB_Bicycle(u8 taskId)
static void ItemUseOnFieldCB_Bicycle(u8 taskId)
{
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
PlaySE(SE_JITENSYA);
@ -300,7 +299,7 @@ void FieldUseFunc_OldRod(u8 taskId)
sub_80A1110(taskId, gTasks[taskId].data[3]);
}
bool8 ItemUseCheckFunc_Rod(void)
static bool8 ItemUseCheckFunc_Rod(void)
{
s16 x, y;
u16 behavior;
@ -327,7 +326,7 @@ bool8 ItemUseCheckFunc_Rod(void)
return FALSE;
}
void ItemUseOnFieldCB_Rod(u8 taskId)
static void ItemUseOnFieldCB_Rod(u8 taskId)
{
sub_805D2C0(ItemId_GetSecondaryId(gSpecialVar_ItemId));
DestroyTask(taskId);
@ -391,13 +390,13 @@ void FieldUseFunc_PokeFlute(u8 taskId)
}
}
void sub_80A1648(u8 taskId)
static void sub_80A1648(u8 taskId)
{
PlayFanfareByFanfareNum(FANFARE_POKEFLUTE);
gTasks[taskId].func = sub_80A1674;
}
void sub_80A1674(u8 taskId)
static void sub_80A1674(u8 taskId)
{
if (WaitFanfare(FALSE))
{
@ -408,44 +407,44 @@ void sub_80A1674(u8 taskId)
}
}
void sub_80A16D0(u8 taskId)
static void sub_80A16D0(u8 taskId)
{
sub_80A0FBC(taskId);
}
void FieldUseFunc_Medicine(u8 taskId)
{
gUnknown_3005E98 = sub_81252D0;
gItemUseCB = ItemUseCB_Medicine;
sub_80A16D0(taskId);
}
void FieldUseFunc_Ether(u8 taskId)
{
gUnknown_3005E98 = ItemUseCB_PpRestore;
gItemUseCB = ItemUseCB_PPRecovery;
sub_80A16D0(taskId);
}
void FieldUseFunc_PpUp(u8 taskId)
{
gUnknown_3005E98 = dp05_pp_up;
gItemUseCB = ItemUseCB_PPUp;
sub_80A16D0(taskId);
}
void FieldUseFunc_RareCandy(u8 taskId)
{
gUnknown_3005E98 = dp05_rare_candy;
gItemUseCB = ItemUseCB_RareCandy;
sub_80A16D0(taskId);
}
void FieldUseFunc_EvoItem(u8 taskId)
{
gUnknown_3005E98 = sub_8126B60;
gItemUseCB = ItemUseCB_EvolutionStone;
sub_80A16D0(taskId);
}
void FieldUseFunc_SacredAsh(u8 taskId)
{
gUnknown_3005E98 = sub_8126894;
gItemUseCB = ItemUseCB_SacredAsh;
sub_80A0FBC(taskId);
}
@ -464,12 +463,12 @@ void FieldUseFunc_TmCase(u8 taskId)
}
}
void InitTMCaseFromBag(void)
static void InitTMCaseFromBag(void)
{
InitTMCase(0, CB2_BagMenuFromStartMenu, 0);
}
void Task_InitTMCaseFromField(u8 taskId)
static void Task_InitTMCaseFromField(u8 taskId)
{
if (!gPaletteFade.active)
{
@ -495,12 +494,12 @@ void FieldUseFunc_BerryPouch(u8 taskId)
}
}
void InitBerryPouchFromBag(void)
static void InitBerryPouchFromBag(void)
{
InitBerryPouch(BERRYPOUCH_FROMFIELD, CB2_BagMenuFromStartMenu, 0);
}
void Task_InitBerryPouchFromField(u8 taskId)
static void Task_InitBerryPouchFromField(u8 taskId)
{
if (!gPaletteFade.active)
{
@ -517,7 +516,7 @@ void BattleUseFunc_BerryPouch(u8 taskId)
ItemMenu_StartFadeToExitCallback(taskId);
}
void InitBerryPouchFromBattle(void)
static void InitBerryPouchFromBattle(void)
{
InitBerryPouch(BERRYPOUCH_FROMBATTLE, sub_8107ECC, 0);
}
@ -538,12 +537,12 @@ void FieldUseFunc_TeachyTv(u8 taskId)
}
}
void InitTeachyTvFromBag(void)
static void InitTeachyTvFromBag(void)
{
InitTeachyTvController(0, CB2_BagMenuFromStartMenu);
}
void Task_InitTeachyTvFromField(u8 taskId)
static void Task_InitTeachyTvFromField(u8 taskId)
{
if (!gPaletteFade.active)
{
@ -566,7 +565,7 @@ void FieldUseFunc_SuperRepel(u8 taskId)
DisplayItemMessageInBag(taskId, 2, gUnknown_841659E, sub_810A1F8);
}
void sub_80A19E8(u8 taskId)
static void sub_80A19E8(u8 taskId)
{
if (!IsSEPlaying())
{
@ -577,7 +576,7 @@ void sub_80A19E8(u8 taskId)
}
}
void sub_80A1A44(void)
static void sub_80A1A44(void)
{
RemoveBagItem(gSpecialVar_ItemId, 1);
sub_8108DC8(ItemId_GetPocket(gSpecialVar_ItemId));
@ -609,7 +608,7 @@ void FieldUseFunc_BlackFlute(u8 taskId)
}
}
void sub_80A1B48(u8 taskId)
static void sub_80A1B48(u8 taskId)
{
if (++gTasks[taskId].data[8] > 7)
{
@ -638,7 +637,7 @@ void ItemUseOutOfBattle_EscapeRope(u8 taskId)
sub_80A1110(taskId, gTasks[taskId].data[3]);
}
void sub_80A1C08(u8 taskId)
static void sub_80A1C08(u8 taskId)
{
Overworld_ResetStateAfterDigEscRope();
sub_80A1A44();
@ -668,12 +667,12 @@ void FieldUseFunc_TownMap(u8 taskId)
}
}
void sub_80A1CAC(void)
static void sub_80A1CAC(void)
{
sub_80BFF50(0, CB2_BagMenuFromStartMenu);
}
void sub_80A1CC0(u8 taskId)
static void sub_80A1CC0(u8 taskId)
{
if (!gPaletteFade.active)
{
@ -700,12 +699,12 @@ void FieldUseFunc_FameChecker(u8 taskId)
}
}
void sub_80A1D58(void)
static void sub_80A1D58(void)
{
UseFameChecker(CB2_BagMenuFromStartMenu);
}
void sub_80A1D68(u8 taskId)
static void sub_80A1D68(u8 taskId)
{
if (!gPaletteFade.active)
{
@ -765,7 +764,7 @@ void BattleUseFunc_GuardSpec(u8 taskId)
{
if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0))
{
DisplayItemMessageInBag(taskId, 2, gUnknown_84169DC, sub_810A1F8);
DisplayItemMessageInBag(taskId, 2, gText_WontHaveEffect, sub_810A1F8);
}
else
{
@ -774,7 +773,7 @@ void BattleUseFunc_GuardSpec(u8 taskId)
}
}
void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId)
static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId)
{
s16 * data = gTasks[taskId].data;
@ -787,7 +786,7 @@ void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId)
}
}
void Task_BattleUse_StatBooster_WaitButton_ReturnToBattle(u8 taskId)
static void Task_BattleUse_StatBooster_WaitButton_ReturnToBattle(u8 taskId)
{
if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{
@ -796,7 +795,7 @@ void Task_BattleUse_StatBooster_WaitButton_ReturnToBattle(u8 taskId)
}
}
void ItemUse_SwitchToPartyMenuInBattle(u8 taskId)
static void ItemUse_SwitchToPartyMenuInBattle(u8 taskId)
{
if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH)
{
@ -812,19 +811,19 @@ void ItemUse_SwitchToPartyMenuInBattle(u8 taskId)
void BattleUseFunc_Medicine(u8 taskId)
{
gUnknown_3005E98 = ItemUseCB_Medicine;
gItemUseCB = ItemUseCB_MedicineStep;
ItemUse_SwitchToPartyMenuInBattle(taskId);
}
void sub_80A1FD8(u8 taskId)
static void sub_80A1FD8(u8 taskId)
{
gUnknown_3005E98 = sub_8126894;
gItemUseCB = ItemUseCB_SacredAsh;
ItemUse_SwitchToPartyMenuInBattle(taskId);
}
void BattleUseFunc_Ether(u8 taskId)
{
gUnknown_3005E98 = ItemUseCB_PpRestore;
gItemUseCB = ItemUseCB_PPRecovery;
ItemUse_SwitchToPartyMenuInBattle(taskId);
}

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