dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

document some symbols

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-20 11:23:34 +08:00
parent 548490c675
commit a4e7a35960
56 changed files with 3088 additions and 3091 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_control_avatar.s
+1 -1
View File
@@ -2572,7 +2572,7 @@ _0806DC78:
bl sub_805550C bl sub_805550C
ldrb r0, [r4, 0x7] ldrb r0, [r4, 0x7]
ldrb r1, [r4, 0x6] ldrb r1, [r4, 0x6]
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
ldr r1, [r1, 0x8] ldr r1, [r1, 0x8]
asm/field_effect.s
+5 -5
View File
@@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
ldrsh r6, [r4, r0] ldrsh r6, [r4, r0]
cmp r6, 0 cmp r6, 0
bne _08084350 bne _08084350
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08084376 beq _08084376
@@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
sub_8084564: @ 8084564 sub_8084564: @ 8084564
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08084578 beq _08084578
@@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
adds r6, r2, 0 adds r6, r2, 0
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080852B4 beq _080852B4
@@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
sub_8085A54: @ 8085A54 sub_8085A54: @ 8085A54
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08085A78 beq _08085A78
@@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
sub_8085E0C: @ 8085E0C sub_8085E0C: @ 8085E0C
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08085E82 beq _08085E82
asm/field_map_obj.s
+2 -2
View File
@@ -376,7 +376,7 @@ sub_805E080: @ 805E080
str r0, [sp, 0x8] str r0, [sp, 0x8]
adds r0, r6, 0 adds r0, r6, 0
adds r1, r7, 0 adds r1, r7, 0
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
lsls r0, r4, 1 lsls r0, r4, 1
adds r0, r4 adds r0, r4
@@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader
_0805FD94: _0805FD94:
adds r0, r2, 0 adds r0, r2, 0
adds r1, r3, 0 adds r1, r3, 0
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldr r0, [r0, 0x4] ldr r0, [r0, 0x4]
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
_0805FDA0: _0805FDA0:
asm/field_weather.s
+3 -3
View File
@@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
_0807AA6C: .4byte 0x000006cb _0807AA6C: .4byte 0x000006cb
thumb_func_end FieldWeather_StartFadingOutCreditsMap thumb_func_end FieldWeather_StartFadingOutCreditsMap
thumb_func_start field_weather_is_fade_finished thumb_func_start IsWeatherNotFadingIn
field_weather_is_fade_finished: @ 807AA70 IsWeatherNotFadingIn: @ 807AA70
ldr r0, _0807AA84 @ =gUnknown_2037F34 ldr r0, _0807AA84 @ =gUnknown_2037F34
ldr r1, _0807AA88 @ =0x000006c6 ldr r1, _0807AA88 @ =0x000006c6
adds r0, r1 adds r0, r1
@@ -1904,7 +1904,7 @@ field_weather_is_fade_finished: @ 807AA70
.align 2, 0 .align 2, 0
_0807AA84: .4byte gUnknown_2037F34 _0807AA84: .4byte gUnknown_2037F34
_0807AA88: .4byte 0x000006c6 _0807AA88: .4byte 0x000006c6
thumb_func_end field_weather_is_fade_finished thumb_func_end IsWeatherNotFadingIn
thumb_func_start sub_807AA8C thumb_func_start sub_807AA8C
sub_807AA8C: @ 807AA8C sub_807AA8C: @ 807AA8C
asm/item_menu.s
+19 -19
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_8107DB4 thumb_func_start GoToBagMenu
sub_8107DB4: @ 8107DB4 GoToBagMenu: @ 8107DB4
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -136,7 +136,7 @@ _08107EA8: .4byte gSpecialVar_ItemId
_08107EAC: .4byte sub_8107F10 _08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10 _08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC _08107EB4: .4byte gUnknown_203ACFC
thumb_func_end sub_8107DB4 thumb_func_end GoToBagMenu
thumb_func_start CB2_BagMenuFromStartMenu thumb_func_start CB2_BagMenuFromStartMenu
CB2_BagMenuFromStartMenu: @ 8107EB8 CB2_BagMenuFromStartMenu: @ 8107EB8
@@ -144,7 +144,7 @@ CB2_BagMenuFromStartMenu: @ 8107EB8
ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
movs r0, 0 movs r0, 0
movs r1, 0x3 movs r1, 0x3
bl sub_8107DB4 bl GoToBagMenu
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -157,7 +157,7 @@ sub_8107ECC: @ 8107ECC
ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2 ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x5 movs r0, 0x5
movs r1, 0x3 movs r1, 0x3
bl sub_8107DB4 bl GoToBagMenu
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -1934,15 +1934,15 @@ _08108CE8: .4byte 0x0000fff0
_08108CEC: .4byte gUnknown_203ACFC _08108CEC: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CB4 thumb_func_end sub_8108CB4
thumb_func_start sub_8108CF0 thumb_func_start CB2_SetUpReshowBattleScreenAfterMenu
sub_8108CF0: @ 8108CF0 CB2_SetUpReshowBattleScreenAfterMenu: @ 8108CF0
ldr r1, _08108CF8 @ =gUnknown_203ACFC ldr r1, _08108CF8 @ =gUnknown_203ACFC
movs r0, 0 movs r0, 0
strb r0, [r1, 0x5] strb r0, [r1, 0x5]
bx lr bx lr
.align 2, 0 .align 2, 0
_08108CF8: .4byte gUnknown_203ACFC _08108CF8: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CF0 thumb_func_end CB2_SetUpReshowBattleScreenAfterMenu
thumb_func_start sub_8108CFC thumb_func_start sub_8108CFC
sub_8108CFC: @ 8108CFC sub_8108CFC: @ 8108CFC
@@ -4399,7 +4399,7 @@ _0810A120:
_0810A13E: _0810A13E:
ldr r0, _0810A154 @ =gUnknown_203AD10 ldr r0, _0810A154 @ =gUnknown_203AD10
ldr r1, [r0] ldr r1, [r0]
ldr r0, _0810A158 @ =sub_8126EDC ldr r0, _0810A158 @ =CB2_ChooseMonToGiveItem
str r0, [r1] str r0, [r1]
mov r0, r8 mov r0, r8
subs r0, 0x8 subs r0, 0x8
@@ -4409,7 +4409,7 @@ _0810A13E:
b _0810A166 b _0810A166
.align 2, 0 .align 2, 0
_0810A154: .4byte gUnknown_203AD10 _0810A154: .4byte gUnknown_203AD10
_0810A158: .4byte sub_8126EDC _0810A158: .4byte CB2_ChooseMonToGiveItem
_0810A15C: .4byte ItemMenu_StartFadeToExitCallback _0810A15C: .4byte ItemMenu_StartFadeToExitCallback
_0810A160: _0810A160:
adds r0, r7, 0 adds r0, r7, 0
@@ -4786,7 +4786,7 @@ _0810A458: .4byte sub_810A45C
thumb_func_start sub_810A45C thumb_func_start sub_810A45C
sub_810A45C: @ 810A45C sub_810A45C: @ 810A45C
push {lr} push {lr}
bl sub_8123730 bl CB2_SelectBagItemToGive
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_810A45C thumb_func_end sub_810A45C
@@ -4918,7 +4918,7 @@ sub_810A554: @ 810A554
ldr r2, _0810A564 @ =sub_808CE60 ldr r2, _0810A564 @ =sub_808CE60
movs r0, 0x4 movs r0, 0x4
movs r1, 0x3 movs r1, 0x3
bl sub_8107DB4 bl GoToBagMenu
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -5063,7 +5063,7 @@ sub_810A67C: @ 810A67C
ldr r2, _0810A68C @ =CB2_ReturnToField ldr r2, _0810A68C @ =CB2_ReturnToField
movs r0, 0x2 movs r0, 0x2
movs r1, 0x3 movs r1, 0x3
bl sub_8107DB4 bl GoToBagMenu
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -6127,7 +6127,7 @@ sub_810AF74: @ 810AF74
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2 ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x6 movs r0, 0x6
movs r1, 0 movs r1, 0
bl sub_8107DB4 bl GoToBagMenu
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -6358,7 +6358,7 @@ _0810B16C:
movs r0, 0x8 movs r0, 0x8
_0810B170: _0810B170:
movs r1, 0 movs r1, 0
bl sub_8107DB4 bl GoToBagMenu
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -6856,10 +6856,10 @@ _0810B564:
movs r2, 0 movs r2, 0
bl DestroyListMenuTask bl DestroyListMenuTask
bl sub_810AECC bl sub_810AECC
ldr r1, _0810B5B0 @ =gUnknown_3005E98 ldr r1, _0810B5B0 @ =gItemUseCB
ldr r0, _0810B5B4 @ =ItemUseCB_Medicine ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
str r0, [r1] str r0, [r1]
ldr r0, _0810B5B8 @ =sub_81279A4 ldr r0, _0810B5B8 @ =ChooseMonForInBattleItem
bl ItemMenu_SetExitCallback bl ItemMenu_SetExitCallback
mov r0, r9 mov r0, r9
subs r0, 0x8 subs r0, 0x8
@@ -6868,9 +6868,9 @@ _0810B564:
str r1, [r0] str r1, [r0]
b _0810B5C6 b _0810B5C6
.align 2, 0 .align 2, 0
_0810B5B0: .4byte gUnknown_3005E98 _0810B5B0: .4byte gItemUseCB
_0810B5B4: .4byte ItemUseCB_Medicine _0810B5B4: .4byte ItemUseCB_Medicine
_0810B5B8: .4byte sub_81279A4 _0810B5B8: .4byte ChooseMonForInBattleItem
_0810B5BC: .4byte sub_810B070 _0810B5BC: .4byte sub_810B070
_0810B5C0: _0810B5C0:
ldrh r0, [r5, 0x10] ldrh r0, [r5, 0x10]
asm/link_rfu.s
+4 -4
View File
@@ -3172,8 +3172,8 @@ _080FEBA6:
bx r0 bx r0
thumb_func_end sub_80FEB3C thumb_func_end sub_80FEB3C
thumb_func_start sub_80FEBAC thumb_func_start DoEasyChatScreen
sub_80FEBAC: @ 80FEBAC DoEasyChatScreen: @ 80FEBAC
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC
_080FEC00: .4byte sub_80FEC54 _080FEC00: .4byte sub_80FEC54
_080FEC04: .4byte gTasks _080FEC04: .4byte gTasks
_080FEC08: .4byte sub_80FEC0C _080FEC08: .4byte sub_80FEC0C
thumb_func_end sub_80FEBAC thumb_func_end DoEasyChatScreen
thumb_func_start sub_80FEC0C thumb_func_start sub_80FEC0C
sub_80FEC0C: @ 80FEC0C sub_80FEC0C: @ 80FEC0C
@@ -3588,7 +3588,7 @@ _080FEF08:
ldr r0, _080FEF24 @ =gSpecialVar_0x8004 ldr r0, _080FEF24 @ =gSpecialVar_0x8004
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, _080FEF28 @ =sub_80568C4 ldr r2, _080FEF28 @ =sub_80568C4
bl sub_80FEBAC bl DoEasyChatScreen
_080FEF12: _080FEF12:
pop {r0} pop {r0}
bx r0 bx r0
asm/link_rfu_3.s
+9 -9
View File
@@ -3650,7 +3650,7 @@ _08117784:
ldr r0, _0811779C @ =sub_811C1C8 ldr r0, _0811779C @ =sub_811C1C8
str r0, [r1, 0x8] str r0, [r1, 0x8]
movs r0, 0x2 movs r0, 0x2
bl sub_81274A8 bl InitChooseHalfPartyForBattle
b _081178E0 b _081178E0
.align 2, 0 .align 2, 0
_08117798: .4byte gMain _08117798: .4byte gMain
@@ -5602,12 +5602,12 @@ _0811887C:
_081188C4: .4byte gUnknown_203B06C _081188C4: .4byte gUnknown_203B06C
_081188C8: .4byte gSpecialVar_Result _081188C8: .4byte gSpecialVar_Result
_081188CC: _081188CC:
bl sub_811FB18 bl GetPartyMenuType
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x8 cmp r0, 0x8
beq _081188E4 beq _081188E4
bl sub_811FB18 bl GetPartyMenuType
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x9 cmp r0, 0x9
@@ -7006,7 +7006,7 @@ _08119512:
str r0, [r1] str r0, [r1]
ldr r1, _08119538 @ =CB2_ReturnToField ldr r1, _08119538 @ =CB2_ReturnToField
movs r0, 0x8 movs r0, 0x8
bl sub_81277F4 bl ChooseMonForMoveTutor
b _081198DC b _081198DC
.align 2, 0 .align 2, 0
_08119528: .4byte gPaletteFade _08119528: .4byte gPaletteFade
@@ -7335,7 +7335,7 @@ _081197CA:
adds r0, r1 adds r0, r1
ldr r0, [r0] ldr r0, [r0]
str r0, [r2] str r0, [r2]
ldr r2, _0811982C @ =gUnknown_203B06A ldr r2, _0811982C @ =gUnionRoomRequestedMonType
ldr r1, [r6] ldr r1, [r6]
movs r3, 0x2 movs r3, 0x2
ldrsh r0, [r7, r3] ldrsh r0, [r7, r3]
@@ -7344,7 +7344,7 @@ _081197CA:
ldrb r0, [r1, 0x9] ldrb r0, [r1, 0x9]
lsrs r0, 2 lsrs r0, 2
strb r0, [r2] strb r0, [r2]
ldr r2, _08119830 @ =gUnknown_203B068 ldr r2, _08119830 @ =gUnionRoomOfferedSpecies
ldr r1, [r6] ldr r1, [r6]
movs r3, 0x2 movs r3, 0x2
ldrsh r0, [r7, r3] ldrsh r0, [r7, r3]
@@ -7359,7 +7359,7 @@ _081197CA:
str r0, [r1] str r0, [r1]
ldr r1, _0811983C @ =CB2_ReturnToField ldr r1, _0811983C @ =CB2_ReturnToField
movs r0, 0x9 movs r0, 0x9
bl sub_81277F4 bl ChooseMonForMoveTutor
adds r0, r6, 0 adds r0, r6, 0
bl sub_81186B0 bl sub_81186B0
ldrh r0, [r7, 0x2] ldrh r0, [r7, 0x2]
@@ -7369,8 +7369,8 @@ _081197CA:
_08119820: .4byte gUnknown_8458D1C _08119820: .4byte gUnknown_8458D1C
_08119824: .4byte gUnknown_203B06C _08119824: .4byte gUnknown_203B06C
_08119828: .4byte gUnknown_203B064 _08119828: .4byte gUnknown_203B064
_0811982C: .4byte gUnknown_203B06A _0811982C: .4byte gUnionRoomRequestedMonType
_08119830: .4byte gUnknown_203B068 _08119830: .4byte gUnionRoomOfferedSpecies
_08119834: .4byte gFieldCallback _08119834: .4byte gFieldCallback
_08119838: .4byte sub_807DCE4 _08119838: .4byte sub_807DCE4
_0811983C: .4byte CB2_ReturnToField _0811983C: .4byte CB2_ReturnToField
asm/naming_screen.s
+4 -4
View File
@@ -3623,7 +3623,7 @@ sub_809F5C4: @ 809F5C4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x10 sub sp, 0x10
movs r4, 0 movs r4, 0
ldr r1, _0809F61C @ =gUnknown_841621F ldr r1, _0809F61C @ =gText_MaleSymbol
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
ldr r5, _0809F620 @ =gUnknown_203998C ldr r5, _0809F620 @ =gUnknown_203998C
@@ -3635,7 +3635,7 @@ sub_809F5C4: @ 809F5C4
beq _0809F614 beq _0809F614
cmp r0, 0xFE cmp r0, 0xFE
bne _0809F5EE bne _0809F5EE
ldr r1, _0809F628 @ =gUnknown_8416221 ldr r1, _0809F628 @ =gText_FemaleSymbol
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
movs r4, 0x1 movs r4, 0x1
@@ -3664,10 +3664,10 @@ _0809F614:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809F61C: .4byte gUnknown_841621F _0809F61C: .4byte gText_MaleSymbol
_0809F620: .4byte gUnknown_203998C _0809F620: .4byte gUnknown_203998C
_0809F624: .4byte 0x00001e36 _0809F624: .4byte 0x00001e36
_0809F628: .4byte gUnknown_8416221 _0809F628: .4byte gText_FemaleSymbol
_0809F62C: .4byte 0x00001e13 _0809F62C: .4byte 0x00001e13
_0809F630: .4byte gUnknown_83E2428 _0809F630: .4byte gUnknown_83E2428
thumb_func_end sub_809F5C4 thumb_func_end sub_809F5C4
asm/overworld.s
+13 -13
View File
@@ -473,7 +473,7 @@ _08054F8A:
str r2, [sp, 0x4] str r2, [sp, 0x4]
adds r0, r2, 0 adds r0, r2, 0
adds r1, r5, 0 adds r1, r5, 0
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
mov r6, r10 mov r6, r10
ldr r1, [r6] ldr r1, [r6]
mov r2, r8 mov r2, r8
@@ -821,8 +821,8 @@ _08055232:
bx r1 bx r1
thumb_func_end warp_data_is_not_neg_1 thumb_func_end warp_data_is_not_neg_1
thumb_func_start get_mapheader_by_bank_and_number thumb_func_start Overworld_GetMapHeaderByGroupAndId
get_mapheader_by_bank_and_number: @ 8055238 Overworld_GetMapHeaderByGroupAndId: @ 8055238
lsls r0, 16 lsls r0, 16
lsls r1, 16 lsls r1, 16
ldr r2, _0805524C @ =gMapGroups ldr r2, _0805524C @ =gMapGroups
@@ -835,7 +835,7 @@ get_mapheader_by_bank_and_number: @ 8055238
bx lr bx lr
.align 2, 0 .align 2, 0
_0805524C: .4byte gMapGroups _0805524C: .4byte gMapGroups
thumb_func_end get_mapheader_by_bank_and_number thumb_func_end Overworld_GetMapHeaderByGroupAndId
thumb_func_start warp1_get_mapheader thumb_func_start warp1_get_mapheader
warp1_get_mapheader: @ 8055250 warp1_get_mapheader: @ 8055250
@@ -850,7 +850,7 @@ warp1_get_mapheader: @ 8055250
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
@@ -872,7 +872,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0 adds r1, r4, 0
ldm r0!, {r2,r3,r6} ldm r0!, {r2,r3,r6}
stm r1!, {r2,r3,r6} stm r1!, {r2,r3,r6}
@@ -908,7 +908,7 @@ set_current_map_header_from_sav1: @ 80552BC
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0 adds r1, r4, 0
ldm r0!, {r2,r3,r5} ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5} stm r1!, {r2,r3,r5}
@@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrh r0, [r0, 0x10] ldrh r0, [r0, 0x10]
pop {r1} pop {r1}
bx r1 bx r1
@@ -2863,7 +2863,7 @@ get_map_light_level_by_bank_and_number: @ 8056158
lsls r1, 24 lsls r1, 24
asrs r1, 8 asrs r1, 8
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x17] ldrb r0, [r0, 0x17]
pop {r1} pop {r1}
bx r1 bx r1
@@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
pop {r1} pop {r1}
bx r1 bx r1
@@ -3014,7 +3014,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
pop {r1} pop {r1}
bx r1 bx r1
@@ -3036,7 +3036,7 @@ GetCurrentRegionMapSectionId: @ 8056260
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
pop {r1} pop {r1}
bx r1 bx r1
@@ -3058,7 +3058,7 @@ sav1_map_get_battletype: @ 8056288
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x1B] ldrb r0, [r0, 0x1B]
pop {r1} pop {r1}
bx r1 bx r1
asm/party_menu.s
+2726 -2726
View File
File diff suppressed because it is too large Load Diff
asm/pokemon_storage_system.s
+2 -2
View File
@@ -1455,7 +1455,7 @@ _0808C3E0:
.align 2, 0 .align 2, 0
_0808C444: .4byte gUnknown_83CDA20 _0808C444: .4byte gUnknown_83CDA20
_0808C448: _0808C448:
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0808C454 bne _0808C454
@@ -6591,7 +6591,7 @@ _0808EEE8:
ldr r2, _0808EF08 @ =sub_808CE60 ldr r2, _0808EF08 @ =sub_808CE60
movs r0, 0x4 movs r0, 0x4
movs r1, 0 movs r1, 0
bl sub_8107DB4 bl GoToBagMenu
_0808EEF6: _0808EEF6:
adds r0, r7, 0 adds r0, r7, 0
bl DestroyTask bl DestroyTask
asm/pokemon_summary_screen.s
+9 -9
View File
@@ -3448,7 +3448,7 @@ _08136168:
ldr r0, [r6] ldr r0, [r6]
ldr r3, _08136208 @ =0x00003084 ldr r3, _08136208 @ =0x00003084
adds r0, r3 adds r0, r3
ldr r1, _0813620C @ =gUnknown_8416221 ldr r1, _0813620C @ =gText_FemaleSymbol
bl StringCopy bl StringCopy
b _08136238 b _08136238
.align 2, 0 .align 2, 0
@@ -3459,19 +3459,19 @@ _081361FC: .4byte 0x00003220
_08136200: .4byte 0x00003221 _08136200: .4byte 0x00003221
_08136204: .4byte 0x00003034 _08136204: .4byte 0x00003034
_08136208: .4byte 0x00003084 _08136208: .4byte 0x00003084
_0813620C: .4byte gUnknown_8416221 _0813620C: .4byte gText_FemaleSymbol
_08136210: _08136210:
cmp r7, 0 cmp r7, 0
bne _0813622C bne _0813622C
ldr r0, [r6] ldr r0, [r6]
ldr r1, _08136224 @ =0x00003084 ldr r1, _08136224 @ =0x00003084
adds r0, r1 adds r0, r1
ldr r1, _08136228 @ =gUnknown_841621F ldr r1, _08136228 @ =gText_MaleSymbol
bl StringCopy bl StringCopy
b _08136238 b _08136238
.align 2, 0 .align 2, 0
_08136224: .4byte 0x00003084 _08136224: .4byte 0x00003084
_08136228: .4byte gUnknown_841621F _08136228: .4byte gText_MaleSymbol
_0813622C: _0813622C:
ldr r0, [r6] ldr r0, [r6]
ldr r2, _08136308 @ =0x00003084 ldr r2, _08136308 @ =0x00003084
@@ -3622,7 +3622,7 @@ sub_8136350: @ 8136350
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, r4 adds r0, r4
ldr r1, _08136504 @ =gUnknown_841620C ldr r1, _08136504 @ =gText_Slash
bl StringAppend bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, r7 adds r0, r7
@@ -3794,7 +3794,7 @@ _081363E6:
_081364F8: .4byte gUnknown_203B140 _081364F8: .4byte gUnknown_203B140
_081364FC: .4byte 0x00003290 _081364FC: .4byte 0x00003290
_08136500: .4byte 0x00003090 _08136500: .4byte 0x00003090
_08136504: .4byte gUnknown_841620C _08136504: .4byte gText_Slash
_08136508: .4byte gUnknown_203B144 _08136508: .4byte gUnknown_203B144
_0813650C: .4byte 0x000032f8 _0813650C: .4byte 0x000032f8
_08136510: .4byte sub_804CF14 _08136510: .4byte sub_804CF14
@@ -5618,7 +5618,7 @@ _081373EA:
str r6, [sp] str r6, [sp]
mov r7, r9 mov r7, r9
str r7, [sp, 0x4] str r7, [sp, 0x4]
ldr r1, _081374E0 @ =gUnknown_841620C ldr r1, _081374E0 @ =gText_Slash
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0x2 movs r1, 0x2
movs r2, 0x3A movs r2, 0x3A
@@ -5663,7 +5663,7 @@ _081374D0: .4byte gUnknown_8416238
_081374D4: .4byte gUnknown_203B144 _081374D4: .4byte gUnknown_203B144
_081374D8: .4byte 0x000030b8 _081374D8: .4byte 0x000030b8
_081374DC: .4byte 0x00003258 _081374DC: .4byte 0x00003258
_081374E0: .4byte gUnknown_841620C _081374E0: .4byte gText_Slash
_081374E4: .4byte 0x000030f0 _081374E4: .4byte 0x000030f0
thumb_func_end sub_81372E4 thumb_func_end sub_81372E4
@@ -9489,7 +9489,7 @@ sub_8139388: @ 8139388
bl sub_8138BEC bl sub_8138BEC
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl sub_8125A90 bl IsMoveHm
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/region_map.s
+11 -11
View File
@@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14] ldrb r0, [r0, 0x14]
pop {r1} pop {r1}
bx r1 bx r1
@@ -7477,7 +7477,7 @@ _080C3BAC:
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0 adds r2, r0, 0
ldr r0, _080C3BEC @ =gUnknown_20399E4 ldr r0, _080C3BEC @ =gUnknown_20399E4
ldr r1, [r0] ldr r1, [r0]
@@ -7506,7 +7506,7 @@ _080C3BF0:
asrs r1, 24 asrs r1, 24
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0 adds r2, r0, 0
ldr r0, _080C3C28 @ =gUnknown_20399E4 ldr r0, _080C3C28 @ =gUnknown_20399E4
ldr r1, [r0] ldr r1, [r0]
@@ -7543,7 +7543,7 @@ _080C3C2C:
ldrsb r1, [r5, r1] ldrsb r1, [r5, r1]
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0 adds r2, r0, 0
b _080C3C8E b _080C3C8E
.align 2, 0 .align 2, 0
@@ -7564,7 +7564,7 @@ _080C3C68:
ldrsb r1, [r5, r1] ldrsb r1, [r5, r1]
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl get_mapheader_by_bank_and_number bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0 adds r2, r0, 0
ldr r1, [r4] ldr r1, [r4]
ldrb r0, [r2, 0x14] ldrb r0, [r2, 0x14]
@@ -9761,8 +9761,8 @@ _080C4DF2:
bx r1 bx r1
thumb_func_end GetMapName thumb_func_end GetMapName
thumb_func_start sub_80C4DF8 thumb_func_start GetMapNameGeneric
sub_80C4DF8: @ 80C4DF8 GetMapNameGeneric: @ 80C4DF8
push {lr} push {lr}
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -9770,14 +9770,14 @@ sub_80C4DF8: @ 80C4DF8
bl GetMapName bl GetMapName
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80C4DF8 thumb_func_end GetMapNameGeneric
thumb_func_start sub_80C4E08 thumb_func_start sub_80C4E08
sub_80C4E08: @ 80C4E08 sub_80C4E08: @ 80C4E08
push {lr} push {lr}
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl sub_80C4DF8 bl GetMapNameGeneric
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80C4E08 thumb_func_end sub_80C4E08
@@ -10283,7 +10283,7 @@ _080C5220:
_080C5250: .4byte gUnknown_20399FC _080C5250: .4byte gUnknown_20399FC
_080C5254: .4byte CB2_ReturnToField _080C5254: .4byte CB2_ReturnToField
_080C5258: _080C5258:
ldr r0, _080C5274 @ =sub_8124AB0 ldr r0, _080C5274 @ =CB2_ReturnToPartyMenuFromFlyMap
bl SetMainCallback2 bl SetMainCallback2
_080C525E: _080C525E:
ldr r4, _080C5278 @ =gUnknown_20399FC ldr r4, _080C5278 @ =gUnknown_20399FC
@@ -10298,7 +10298,7 @@ _080C526E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080C5274: .4byte sub_8124AB0 _080C5274: .4byte CB2_ReturnToPartyMenuFromFlyMap
_080C5278: .4byte gUnknown_20399FC _080C5278: .4byte gUnknown_20399FC
thumb_func_end sub_80C5208 thumb_func_end sub_80C5208
asm/script_pokemon_util_80A0058.s
+2 -2
View File
@@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334
ldr r0, _080A034C @ =sub_80A0350 ldr r0, _080A034C @ =sub_80A0350
str r0, [r1, 0x8] str r0, [r1, 0x8]
movs r0, 0 movs r0, 0
bl sub_81274A8 bl InitChooseHalfPartyForBattle
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
@@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380
ldr r0, _080A0398 @ =sub_80A039C ldr r0, _080A0398 @ =sub_80A039C
str r0, [r1, 0x8] str r0, [r1, 0x8]
movs r0, 0x1 movs r0, 0x1
bl sub_81274A8 bl InitChooseHalfPartyForBattle
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
asm/script_pokemon_util_80BF8FC.s
+1 -1
View File
@@ -88,7 +88,7 @@ sub_80BF97C: @ 80BF97C
lsls r0, 3 lsls r0, 3
adds r0, r1 adds r0, r1
ldrb r0, [r0, 0x8] ldrb r0, [r0, 0x8]
bl sub_81283A8 bl ChoosePartyMonByMenuType
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
_080BF9AC: _080BF9AC:
asm/shop.s
+2 -2
View File
@@ -291,7 +291,7 @@ sub_809ACD4: @ 809ACD4
ldr r2, _0809ACEC @ =CB2_ReturnToField ldr r2, _0809ACEC @ =CB2_ReturnToField
movs r0, 0x2 movs r0, 0x2
movs r1, 0x3 movs r1, 0x3
bl sub_8107DB4 bl GoToBagMenu
ldr r1, _0809ACF0 @ =gFieldCallback ldr r1, _0809ACF0 @ =gFieldCallback
ldr r0, _0809ACF4 @ =sub_809AD74 ldr r0, _0809ACF4 @ =sub_809AD74
str r0, [r1] str r0, [r1]
@@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl field_weather_is_fade_finished bl IsWeatherNotFadingIn
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
data/event_scripts.s
+2 -2
View File
@@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A
goto_if eq, EventScript_1BC2A6 goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059 msgbox gUnknown_81BD059
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special sub_8127888 special ChooseMonForWirelessMinigame
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F goto_if ge, EventScript_1BB83F
@@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184
goto_if eq, EventScript_1BC2A6 goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059 msgbox gUnknown_81BD059
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special sub_8127888 special ChooseMonForWirelessMinigame
waitstate waitstate
compare_var_to_value VAR_0x8004, 6 compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F goto_if ge, EventScript_1BB83F
data/graphics.s
+3 -3
View File
@@ -13892,15 +13892,15 @@ gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8
.incbin "graphics/battle_anims/sprites/188.gbapal.lz" .incbin "graphics/battle_anims/sprites/188.gbapal.lz"
.align 2 .align 2
gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700 gPartyMenuBg_Gfx:: @ 8E82700
.incbin "graphics/interface/party_menu_misc.4bpp.lz" .incbin "graphics/interface/party_menu_misc.4bpp.lz"
.align 2 .align 2
gUnknown_8E829C8:: @ 8E829C8 gPartyMenuBg_Pal:: @ 8E829C8
.incbin "baserom.gba", 0xE829C8, 0xE8 .incbin "baserom.gba", 0xE829C8, 0xE8
.align 2 .align 2
gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0 gPartyMenuBg_Tilemap:: @ 8E82AB0
.incbin "graphics/interface/party_menu_misc.bin.lz" .incbin "graphics/interface/party_menu_misc.bin.lz"
.align 2 .align 2
data/party_menu.s
+46 -49
View File
@@ -23,7 +23,7 @@ gMoveTutorMoves:: @ 8459B60
.2byte MOVE_ROCK_SLIDE .2byte MOVE_ROCK_SLIDE
.2byte MOVE_SUBSTITUTE .2byte MOVE_SUBSTITUTE
gMoveTutorMoveCompatibilityTable:: @ 8459B7E sTutorLearnsets:: @ 8459B7E
.2byte 0x0000 .2byte 0x0000
.2byte 0x409a .2byte 0x409a
.2byte 0x409a .2byte 0x409a
@@ -438,16 +438,13 @@ gMoveTutorMoveCompatibilityTable:: @ 8459B7E
.2byte 0x4490 .2byte 0x4490
.align 2 .align 2
gUnknown_8459EB8:: @ 8459EB8 sPartyMenuBgTemplates:: @ 8459EB8
.incbin "baserom.gba", 0x459EB8, 0xC .incbin "baserom.gba", 0x459EB8, 0xC
gUnknown_8459EC4:: @ 8459EC4 sPartyBoxInfoRects:: @ 8459EC4
.incbin "baserom.gba", 0x459EC4, 0x20 .incbin "baserom.gba", 0x459EC4, 0x40
gUnknown_8459EE4:: @ 8459EE4 sPartyMenuSpriteCoords:: @ 8459F04
.incbin "baserom.gba", 0x459EE4, 0x20
gUnknown_8459F04:: @ 8459F04
.incbin "baserom.gba", 0x459F04, 0xC0 .incbin "baserom.gba", 0x459F04, 0xC0
gUnknown_8459FC4:: @ 8459FC4 gUnknown_8459FC4:: @ 8459FC4
@@ -456,31 +453,31 @@ gUnknown_8459FC4:: @ 8459FC4
gUnknown_8459FE0:: @ 8459FE0 gUnknown_8459FE0:: @ 8459FE0
.incbin "baserom.gba", 0x459FE0, 0x1C .incbin "baserom.gba", 0x459FE0, 0x1C
gUnknown_8459FFC:: @ 8459FFC sFontColorTable:: @ 8459FFC
.incbin "baserom.gba", 0x459FFC, 0xF .incbin "baserom.gba", 0x459FFC, 0xF
gUnknown_845A00B:: @ 845A00B gUnknown_845A00B:: @ 845A00B
.incbin "baserom.gba", 0x45A00B, 0x5 .incbin "baserom.gba", 0x45A00B, 0x5
gUnknown_845A010:: @ 845A010 sSinglePartyMenuWindowTemplate:: @ 845A010
.incbin "baserom.gba", 0x45A010, 0x40 .incbin "baserom.gba", 0x45A010, 0x40
gUnknown_845A050:: @ 845A050 sDoublePartyMenuWindowTemplate:: @ 845A050
.incbin "baserom.gba", 0x45A050, 0x40 .incbin "baserom.gba", 0x45A050, 0x40
gUnknown_845A090:: @ 845A090 sMultiPartyMenuWindowTemplate:: @ 845A090
.incbin "baserom.gba", 0x45A090, 0x40 .incbin "baserom.gba", 0x45A090, 0x40
gUnknown_845A0D0:: @ 845A0D0 sShowcaseMultiPartyMenuWindowTemplate:: @ 845A0D0
.incbin "baserom.gba", 0x45A0D0, 0x38 .incbin "baserom.gba", 0x45A0D0, 0x38
gUnknown_845A108:: @ 845A108 sCancelButtonWindowTemplate:: @ 845A108
.incbin "baserom.gba", 0x45A108, 0x8 .incbin "baserom.gba", 0x45A108, 0x8
gUnknown_845A110:: @ 845A110 sMultiCancelButtonWindowTemplate:: @ 845A110
.incbin "baserom.gba", 0x45A110, 0x8 .incbin "baserom.gba", 0x45A110, 0x8
gUnknown_845A118:: @ 845A118 sConfirmButtonWindowTemplate:: @ 845A118
.incbin "baserom.gba", 0x45A118, 0x8 .incbin "baserom.gba", 0x45A118, 0x8
gUnknown_845A120:: @ 845A120 gUnknown_845A120:: @ 845A120
@@ -498,19 +495,19 @@ gUnknown_845A138:: @ 845A138
gUnknown_845A140:: @ 845A140 gUnknown_845A140:: @ 845A140
.incbin "baserom.gba", 0x45A140, 0x8 .incbin "baserom.gba", 0x45A140, 0x8
gUnknown_845A148:: @ 845A148 sItemGiveTakeWindowTemplate:: @ 845A148
.incbin "baserom.gba", 0x45A148, 0x8 .incbin "baserom.gba", 0x45A148, 0x8
gUnknown_845A150:: @ 845A150 sMailReadTakeWindowTemplate:: @ 845A150
.incbin "baserom.gba", 0x45A150, 0x8 .incbin "baserom.gba", 0x45A150, 0x8
gUnknown_845A158:: @ 845A158 sMoveSelectWindowTemplate:: @ 845A158
.incbin "baserom.gba", 0x45A158, 0x8 .incbin "baserom.gba", 0x45A158, 0x8
gUnknown_845A160:: @ 845A160 sPartyMenuYesNoWindowTemplate:: @ 845A160
.incbin "baserom.gba", 0x45A160, 0x8 .incbin "baserom.gba", 0x45A160, 0x8
gUnknown_845A168:: @ 845A168 sLevelUpStatsWindowTemplate:: @ 845A168
.incbin "baserom.gba", 0x45A168, 0x8 .incbin "baserom.gba", 0x45A168, 0x8
gUnknown_845A170:: @ 845A170 gUnknown_845A170:: @ 845A170
@@ -519,22 +516,22 @@ gUnknown_845A170:: @ 845A170
gUnknown_845A178:: @ 845A178 gUnknown_845A178:: @ 845A178
.incbin "baserom.gba", 0x45A178, 0x8 .incbin "baserom.gba", 0x45A178, 0x8
gUnknown_845A180:: @ 845A180 sMainSlotTileNums:: @ 845A180
.incbin "baserom.gba", 0x45A180, 0x46 .incbin "baserom.gba", 0x45A180, 0x46
gUnknown_845A1C6:: @ 845A1C6 sMainSlotTileNums_Egg:: @ 845A1C6
.incbin "baserom.gba", 0x45A1C6, 0x46 .incbin "baserom.gba", 0x45A1C6, 0x46
gUnknown_845A20C:: @ 845A20C sOtherSlotTileNums:: @ 845A20C
.incbin "baserom.gba", 0x45A20C, 0x36 .incbin "baserom.gba", 0x45A20C, 0x36
gUnknown_845A242:: @ 845A242 sOtherSlotTileNums_Egg:: @ 845A242
.incbin "baserom.gba", 0x45A242, 0x36 .incbin "baserom.gba", 0x45A242, 0x36
gUnknown_845A278:: @ 845A278 gUnknown_845A278:: @ 845A278
.incbin "baserom.gba", 0x45A278, 0x36 .incbin "baserom.gba", 0x45A278, 0x36
gUnknown_845A2AE:: @ 845A2AE sGenderPalOffsets:: @ 845A2AE
.incbin "baserom.gba", 0x45A2AE, 0x2 .incbin "baserom.gba", 0x45A2AE, 0x2
gUnknown_845A2B0:: @ 845A2B0 gUnknown_845A2B0:: @ 845A2B0
@@ -546,10 +543,10 @@ gUnknown_845A2B2:: @ 845A2B2
gUnknown_845A2B5:: @ 845A2B5 gUnknown_845A2B5:: @ 845A2B5
.incbin "baserom.gba", 0x45A2B5, 0x3 .incbin "baserom.gba", 0x45A2B5, 0x3
gUnknown_845A2B8:: @ 845A2B8 sGenderMalePalIds:: @ 845A2B8
.incbin "baserom.gba", 0x45A2B8, 0x2 .incbin "baserom.gba", 0x45A2B8, 0x2
gUnknown_845A2BA:: @ 845A2BA sGenderFemalePalIds:: @ 845A2BA
.incbin "baserom.gba", 0x45A2BA, 0x2 .incbin "baserom.gba", 0x45A2BA, 0x2
gUnknown_845A2BC:: @ 845A2BC gUnknown_845A2BC:: @ 845A2BC
@@ -597,67 +594,67 @@ gUnknown_845A2E0:: @ 845A2E0
gUnknown_845A2E3:: @ 845A2E3 gUnknown_845A2E3:: @ 845A2E3
.incbin "baserom.gba", 0x45A2E3, 0x5 .incbin "baserom.gba", 0x45A2E3, 0x5
gUnknown_845A2E8:: @ 845A2E8 sActionStringTable:: @ 845A2E8
.incbin "baserom.gba", 0x45A2E8, 0x6C .incbin "baserom.gba", 0x45A2E8, 0x6C
gUnknown_845A354:: @ 845A354 sDescriptionStringTable:: @ 845A354
.incbin "baserom.gba", 0x45A354, 0x28 .incbin "baserom.gba", 0x45A354, 0x28
gUnknown_845A37C:: @ 845A37C gUnknown_845A37C:: @ 845A37C
.incbin "baserom.gba", 0x45A37C, 0xB0 .incbin "baserom.gba", 0x45A37C, 0xB0
gUnknown_845A42C:: @ 845A42C sSpriteSheet_HeldItem:: @ 845A42C
.incbin "baserom.gba", 0x45A42C, 0x8 .incbin "baserom.gba", 0x45A42C, 0x8
gUnknown_845A434:: @ 845A434 sSpritePalette_HeldItem:: @ 845A434
.incbin "baserom.gba", 0x45A434, 0x8 .incbin "baserom.gba", 0x45A434, 0x8
gUnknown_845A43C:: @ 845A43C sSpriteTemplate_HeldItem:: @ 845A43C
.incbin "baserom.gba", 0x45A43C, 0x38 .incbin "baserom.gba", 0x45A43C, 0x38
gUnknown_845A474:: @ 845A474 sSpriteSheet_MenuPokeball:: @ 845A474
.incbin "baserom.gba", 0x45A474, 0x8 .incbin "baserom.gba", 0x45A474, 0x8
gUnknown_845A47C:: @ 845A47C sSpritePalette_MenuPokeball:: @ 845A47C
.incbin "baserom.gba", 0x45A47C, 0x8 .incbin "baserom.gba", 0x45A47C, 0x8
gUnknown_845A484:: @ 845A484 sSpriteTemplate_MenuPokeball:: @ 845A484
.incbin "baserom.gba", 0x45A484, 0x68 .incbin "baserom.gba", 0x45A484, 0x68
gUnknown_845A4EC:: @ 845A4EC sSpriteSheet_MenuPokeballSmall:: @ 845A4EC
.incbin "baserom.gba", 0x45A4EC, 0x8 .incbin "baserom.gba", 0x45A4EC, 0x8
gUnknown_845A4F4:: @ 845A4F4 sSpriteTemplate_MenuPokeballSmall:: @ 845A4F4
.incbin "baserom.gba", 0x45A4F4, 0x80 .incbin "baserom.gba", 0x45A4F4, 0x80
gUnknown_845A574:: @ 845A574 sSpriteSheet_StatusIcons:: @ 845A574
.incbin "baserom.gba", 0x45A574, 0x8 .incbin "baserom.gba", 0x45A574, 0x8
gUnknown_845A57C:: @ 845A57C sSpritePalette_StatusIcons:: @ 845A57C
.incbin "baserom.gba", 0x45A57C, 0x8 .incbin "baserom.gba", 0x45A57C, 0x8
gUnknown_845A584:: @ 845A584 sSpriteTemplate_StatusIcons:: @ 845A584
.incbin "baserom.gba", 0x45A584, 0x18 .incbin "baserom.gba", 0x45A584, 0x18
gUnknown_845A59C:: @ 845A59C sMultiBattlePartnersPartyMask:: @ 845A59C
.incbin "baserom.gba", 0x45A59C, 0x7C .incbin "baserom.gba", 0x45A59C, 0x7C
gUnknown_845A618:: @ 845A618 sCursorOptions:: @ 845A618
.incbin "baserom.gba", 0x45A618, 0x114 .incbin "baserom.gba", 0x45A618, 0x114
gUnknown_845A72C:: @ 845A72C sPartyMenuActions:: @ 845A72C
.incbin "baserom.gba", 0x45A72C, 0x34 .incbin "baserom.gba", 0x45A72C, 0x34
gUnknown_845A760:: @ 845A760 sPartyMenuActionCounts:: @ 845A760
.incbin "baserom.gba", 0x45A760, 0xE .incbin "baserom.gba", 0x45A760, 0xE
gUnknown_845A76E:: @ 845A76E sFieldMoves:: @ 845A76E
.incbin "baserom.gba", 0x45A76E, 0x1A .incbin "baserom.gba", 0x45A76E, 0x1A
gUnknown_845A788:: @ 845A788 sFieldMoveCursorCallbacks:: @ 845A788
.incbin "baserom.gba", 0x45A788, 0x60 .incbin "baserom.gba", 0x45A788, 0x60
gUnknown_845A7E8:: @ 845A7E8 sUnionRoomTradeMessages:: @ 845A7E8
.4byte gUnknown_841718C @ Not what other player wants .4byte gUnknown_841718C @ Not what other player wants
.4byte gUnknown_84171CC @ Not an egg .4byte gUnknown_84171CC @ Not an egg
.4byte gUnknown_84170BC @ Mon can't be traded .4byte gUnknown_84170BC @ Mon can't be traded
@@ -668,5 +665,5 @@ gUnknown_845A7E8:: @ 845A7E8
.4byte gUnknown_8417164 @ Can't trade with trainer now .4byte gUnknown_8417164 @ Can't trade with trainer now
.4byte gUnknown_8417164 @ Can't trade with trainer now .4byte gUnknown_8417164 @ Can't trade with trainer now
gUnknown_845A80C:: @ 845A80C sTMHMMoves:: @ 845A80C
.incbin "baserom.gba", 0x45A80C, 0x74 .incbin "baserom.gba", 0x45A80C, 0x74
data/specials.inc
+1 -1
View File
@@ -406,7 +406,7 @@ gSpecials:: @ 815FD60
def_special Special_OpenMuseumFossilPic def_special Special_OpenMuseumFossilPic
def_special Special_CloseMuseumFossilPic def_special Special_CloseMuseumFossilPic
def_special sub_812781C def_special sub_812781C
def_special sub_8127888 def_special ChooseMonForWirelessMinigame
def_special SetBattledTrainerFlag def_special SetBattledTrainerFlag
def_special sub_812B35C def_special sub_812B35C
def_special Special_SSAnneDepartureCutscene def_special Special_SSAnneDepartureCutscene
data/strings.s
+45 -45
View File
@@ -463,7 +463,7 @@ gUnknown_8416202:: @ 8416202
gUnknown_8416206:: gUnknown_8416206::
.string "?????$" .string "?????$"
gUnknown_841620C:: @ 841620C gText_Slash:: @ 841620C
.string "/$" .string "/$"
gUnknown_841620E:: @ 841620E gUnknown_841620E:: @ 841620E
@@ -478,10 +478,10 @@ gText_ThreeHyphens:: @ 8416213
gUnknown_8416217:: @ 8416217 gUnknown_8416217:: @ 8416217
.string "-------$" .string "-------$"
gUnknown_841621F:: @ 841621F gText_MaleSymbol:: @ 841621F
.string "♂$" .string "♂$"
gUnknown_8416221:: @ 8416221 gText_FemaleSymbol:: @ 8416221
.string "♀$" .string "♀$"
gText_Lv:: @ 8416223 gText_Lv:: @ 8416223
@@ -834,25 +834,25 @@ gUnknown_84169B7:: @ 0x84169B7
gUnknown_84169BC:: @ 0x84169BC gUnknown_84169BC:: @ 0x84169BC
.string "TRADE$" .string "TRADE$"
gUnknown_84169C2:: @ 84169C2 gText_HP3:: @ 84169C2
.string "HP$" .string "HP$"
gUnknown_84169C5:: @ 84169C5 gText_SpAtk3:: @ 84169C5
.string "SP. ATK$" .string "SP. ATK$"
gUnknown_84169CD:: @ 84169CD gText_SpDef3:: @ 84169CD
.string "SP. DEF$" .string "SP. DEF$"
gUnknown_84169D5:: @ 84169D5 gMenuText_Confirm:: @ 84169D5
.string "OK$" .string "OK$"
gUnknown_84169D8:: @ 0x84169D8 gUnknown_84169D8:: @ 0x84169D8
.string "$" .string "$"
gUnknown_84169D9:: @ 84169D9 gText_PauseUntilPress:: @ 84169D9
.string "{PAUSE_UNTIL_PRESS}$" .string "{PAUSE_UNTIL_PRESS}$"
gUnknown_84169DC:: @ 84169DC gText_WontHaveEffect:: @ 84169DC
.string "It won't have any effect.{PAUSE_UNTIL_PRESS}$" .string "It won't have any effect.{PAUSE_UNTIL_PRESS}$"
gUnknown_84169F8:: @ 84169F8 gUnknown_84169F8:: @ 84169F8
@@ -882,7 +882,7 @@ gUnknown_8416A98:: @ 8416A98
gUnknown_8416ACB:: @ 8416ACB gUnknown_8416ACB:: @ 8416ACB
.string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$" .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 "This can't be used until a new\n"
.string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$" .string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$"
@@ -894,17 +894,17 @@ gUnknown_8416B3E:: @ 8416B3E
.string "No more than two POKéMON\n" .string "No more than two POKéMON\n"
.string "may enter.{PAUSE_UNTIL_PRESS}$" .string "may enter.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416B64:: @ 8416B64 gText_SendMailToPC:: @ 8416B64
.string "Send the removed MAIL to\n" .string "Send the removed MAIL to\n"
.string "your PC?$" .string "your PC?$"
gUnknown_8416B86:: @ 8416B86 gText_MailSentToPC:: @ 8416B86
.string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" .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}$" .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 "If the MAIL is removed, the\n"
.string "message will be lost. Okay?$" .string "message will be lost. Okay?$"
@@ -912,11 +912,11 @@ gUnknown_8416BFB:: @ 8416BFB
.string "MAIL must be removed before\n" .string "MAIL must be removed before\n"
.string "holding an item.{PAUSE_UNTIL_PRESS}$" .string "holding an item.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C2A:: @ 8416C2A gText_PkmnWasGivenItem:: @ 8416C2A
.string "{STR_VAR_1} was given the\n" .string "{STR_VAR_1} was given the\n"
.string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" .string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C49:: @ 8416C49 gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49
.string "{STR_VAR_1} is already holding\n" .string "{STR_VAR_1} is already holding\n"
.string "one {STR_VAR_2}.\p" .string "one {STR_VAR_2}.\p"
.string "Would you like to switch the\n" .string "Would you like to switch the\n"
@@ -926,41 +926,41 @@ gUnknown_8416C8F:: @ 8416C8F
.string "{STR_VAR_1} isn't holding\n" .string "{STR_VAR_1} isn't holding\n"
.string "anything.{PAUSE_UNTIL_PRESS}$" .string "anything.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CAC:: @ 8416CAC gText_ReceivedItemFromPkmn:: @ 8416CAC
.string "Received the {STR_VAR_2}\n" .string "Received the {STR_VAR_2}\n"
.string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" .string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CC7:: @ 8416CC7 gText_MailTakenFromPkmn:: @ 8416CC7
.string "MAIL was taken from the\n" .string "MAIL was taken from the\n"
.string "POKéMON.{PAUSE_UNTIL_PRESS}$" .string "POKéMON.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CEA:: @ 8416CEA gText_SwitchedPkmnItem:: @ 8416CEA
.string "The {STR_VAR_2} was taken and\n" .string "The {STR_VAR_2} was taken and\n"
.string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" .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 "This POKéMON is holding an\n"
.string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" .string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D4F:: @ 8416D4F gText_MailTransferredFromMailbox:: @ 8416D4F
.string "MAIL was transferred from\n" .string "MAIL was transferred from\n"
.string "the MAILBOX.{PAUSE_UNTIL_PRESS}$" .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 "The {STR_VAR_1} is full. The POKéMON's\n"
.string "item could not be removed.{PAUSE_UNTIL_PRESS}$" .string "item could not be removed.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DB3:: @ 8416DB3 gText_PkmnLearnedMove3:: @ 8416DB3
.string "{STR_VAR_1} learned\n" .string "{STR_VAR_1} learned\n"
.string "{STR_VAR_2}!$" .string "{STR_VAR_2}!$"
gUnknown_8416DC2:: @ 8416DC2 gText_PkmnCantLearnMove:: @ 8416DC2
.string "{STR_VAR_1} and {STR_VAR_2}\n" .string "{STR_VAR_1} and {STR_VAR_2}\n"
.string "are not compatible.\p" .string "are not compatible.\p"
.string "{STR_VAR_2} can't be\n" .string "{STR_VAR_2} can't be\n"
.string "learned.{PAUSE_UNTIL_PRESS}$" .string "learned.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DF7:: @ 8416DF7 gText_PkmnNeedsToReplaceMove:: @ 8416DF7
.string "{STR_VAR_1} wants to learn the\n" .string "{STR_VAR_1} wants to learn the\n"
.string "move {STR_VAR_2}.\p" .string "move {STR_VAR_2}.\p"
.string "However, {STR_VAR_1} already\n" .string "However, {STR_VAR_1} already\n"
@@ -968,15 +968,15 @@ gUnknown_8416DF7:: @ 8416DF7
.string "Should a move be deleted and\n" .string "Should a move be deleted and\n"
.string "replaced with {STR_VAR_2}?$" .string "replaced with {STR_VAR_2}?$"
gUnknown_8416E6B:: @ 8416E6B gText_StopLearningMove2:: @ 8416E6B
.string "Stop trying to teach\n" .string "Stop trying to teach\n"
.string "{STR_VAR_2}?$" .string "{STR_VAR_2}?$"
gUnknown_8416E84:: @ 8416E84 gText_MoveNotLearned:: @ 8416E84
.string "{STR_VAR_1} did not learn the\n" .string "{STR_VAR_1} did not learn the\n"
.string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" .string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EA4:: @ 8416EA4 gText_WhichMoveToForget:: @ 8416EA4
.string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EC6:: @ 8416EC6 gUnknown_8416EC6:: @ 8416EC6
@@ -985,57 +985,57 @@ gUnknown_8416EC6:: @ 8416EC6
.string "use {STR_VAR_2}.\p" .string "use {STR_VAR_2}.\p"
.string "And...{PAUSE_UNTIL_PRESS}$" .string "And...{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F10:: @ 8416F10 gText_PkmnAlreadyKnows:: @ 8416F10
.string "{STR_VAR_1} already knows\n" .string "{STR_VAR_1} already knows\n"
.string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" .string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F27:: @ 8416F27 gText_PkmnHPRestoredByVar2:: @ 8416F27
.string "{STR_VAR_1}'s HP was restored\n" .string "{STR_VAR_1}'s HP was restored\n"
.string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" .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 "{STR_VAR_1} was cured of its\n"
.string "poisoning.{PAUSE_UNTIL_PRESS}$" .string "poisoning.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F6F:: @ 8416F6F gText_PkmnCuredOfParalysis:: @ 8416F6F
.string "{STR_VAR_1} was cured of\n" .string "{STR_VAR_1} was cured of\n"
.string "paralysis.{PAUSE_UNTIL_PRESS}$" .string "paralysis.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F8C:: @ 8416F8C gText_PkmnWokeUp2:: @ 8416F8C
.string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" .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}$" .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}$" .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FC7:: @ 8416FC7 gText_PPWasRestored:: @ 8416FC7
.string "PP was restored.{PAUSE_UNTIL_PRESS}$" .string "PP was restored.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FDA:: @ 0x8416FDA gUnknown_8416FDA:: @ 0x8416FDA
.string "{STR_VAR_1}は\n" .string "{STR_VAR_1}は\n"
.string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$" .string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FED:: @ 8416FED gText_PkmnBecameHealthy:: @ 8416FED
.string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" .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}$" .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 "{STR_VAR_1} was elevated to\n"
.string "Lv. {STR_VAR_2}.$" .string "Lv. {STR_VAR_2}.$"
gUnknown_8417032:: @ 8417032 gText_PkmnBaseVar2StatIncreased:: @ 8417032
.string "{STR_VAR_1}'s base {STR_VAR_2}\n" .string "{STR_VAR_1}'s base {STR_VAR_2}\n"
.string "stat was raised.{PAUSE_UNTIL_PRESS}$" .string "stat was raised.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417052:: @ 8417052 gText_PkmnSnappedOutOfConfusion:: @ 8417052
.string "{STR_VAR_1} snapped out of its\n" .string "{STR_VAR_1} snapped out of its\n"
.string "confusion.{PAUSE_UNTIL_PRESS}$" .string "confusion.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417075:: @ 8417075 gText_PkmnGotOverInfatuation:: @ 8417075
.string "{STR_VAR_1} got over its\n" .string "{STR_VAR_1} got over its\n"
.string "infatuation.{PAUSE_UNTIL_PRESS}$" .string "infatuation.{PAUSE_UNTIL_PRESS}$"
@@ -1241,10 +1241,10 @@ gUnknown_8417640:: @ 8417640
.string "Want to return to the healing spot\n" .string "Want to return to the healing spot\n"
.string "used last in {STR_VAR_1}?$" .string "used last in {STR_VAR_1}?$"
gUnknown_8417674:: @ 8417674 gText_Attack3:: @ 8417674
.string "ATTACK$" .string "ATTACK$"
gUnknown_841767B:: @ 841767B gText_Defense3:: @ 841767B
.string "DEFENSE$" .string "DEFENSE$"
gUnknown_8417683:: @ 0x8417683 gUnknown_8417683:: @ 0x8417683
@@ -1253,7 +1253,7 @@ gUnknown_8417683:: @ 0x8417683
gUnknown_8417688:: @ 0x8417688 gUnknown_8417688:: @ 0x8417688
.string "とくぼう$" .string "とくぼう$"
gUnknown_841768D:: @ 841768D gText_Speed2:: @ 841768D
.string "SPEED$" .string "SPEED$"
gUnknown_8417693:: @ 0x8417693 gUnknown_8417693:: @ 0x8417693
include/battle.h
+1 -1
View File
@@ -712,7 +712,7 @@ extern u16 gLastPrintedMoves[MAX_BATTLERS_COUNT];
extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT]; extern u8 gActionsByTurnOrder[MAX_BATTLERS_COUNT];
extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT]; extern u8 gChosenActionByBattler[MAX_BATTLERS_COUNT];
extern u8 gBattleTerrain; extern u8 gBattleTerrain;
extern struct UnknownPokemonStruct4 gUnknown_2022B58[3]; extern struct UnknownPokemonStruct4 gMultiPartnerParty[3];
extern u16 *gUnknown_2022BC0; extern u16 *gUnknown_2022BC0;
extern u16 gRandomTurnNumber; extern u16 gRandomTurnNumber;
include/field_weather.h
+1 -1
View File
@@ -13,7 +13,7 @@ void DoCurrentWeather(void);
void SetSav1WeatherFromCurrMapHeader(void); void SetSav1WeatherFromCurrMapHeader(void);
void sub_807B0C4(u16 *, u16 *, u32); void sub_807B0C4(u16 *, u16 *, u32);
void PlayRainStoppingSoundEffect(void); void PlayRainStoppingSoundEffect(void);
bool8 field_weather_is_fade_finished(void); bool8 IsWeatherNotFadingIn(void);
void SetWeatherScreenFadeOut(void); void SetWeatherScreenFadeOut(void);
void sub_807B070(void); void sub_807B070(void);
u8 GetCurrentWeather(void); u8 GetCurrentWeather(void);
include/fldeff.h
+1 -1
View File
@@ -44,7 +44,7 @@ bool8 FldEff_UseTeleport(void);
// softboiled // softboiled
bool8 hm_prepare_dive_probably(void); bool8 hm_prepare_dive_probably(void);
void sub_80E56DC(u8 taskId); void ChooseMonForSoftboiled(u8 taskId);
void sub_80E5724(u8 taskId); void sub_80E5724(u8 taskId);
// sweetscent // sweetscent
include/item_menu.h
+2 -2
View File
@@ -25,7 +25,7 @@ extern u16 gSpecialVar_ItemId;
// Exported ROM declarations // Exported ROM declarations
void sub_81AAC50(void); void sub_81AAC50(void);
void sub_81AAC70(void); void sub_81AAC70(void);
void sub_8108CF0(void); void CB2_SetUpReshowBattleScreenAfterMenu(void);
void sub_81089BC(void); void sub_81089BC(void);
void sub_810B108(u8); void sub_810B108(u8);
void CB2_BagMenuFromStartMenu(void); void CB2_BagMenuFromStartMenu(void);
@@ -39,6 +39,6 @@ void sub_8107ECC(void);
void sub_810AF74(void); void sub_810AF74(void);
void sub_8108DC8(u8 pocketId); void sub_8108DC8(u8 pocketId);
void sub_81089F4(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 #endif //GUARD_ITEM_MENU_H
include/overworld.h
+1 -1
View File
@@ -72,7 +72,7 @@ void Overworld_ChangeMusicTo(u16);
bool32 IsUpdateLinkStateCBActive(void); bool32 IsUpdateLinkStateCBActive(void);
void strange_npc_table_clear(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 FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void); void sub_8086230(void);
void CB2_ReturnToField(void); void CB2_ReturnToField(void);
include/party_menu.h
+30 -30
View File
@@ -40,55 +40,55 @@ struct Struct203B0A0
s16 unk10; s16 unk10;
}; };
extern struct Struct203B0A0 gUnknown_203B0A0; extern struct Struct203B0A0 gPartyMenu;
extern u8 gUnknown_203B0C0; extern u8 gPartyMenuUseExitCallback;
extern u8 gUnknown_203B0C1; extern u8 gUnknown_203B0C1;
extern u8 gUnknown_203B0DC[3]; extern u8 gBattlePartyCurrentOrder[3];
extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); extern void (*gItemUseCB)(u8 taskId, TaskFunc func);
extern u8 gSelectedOrderFromParty[3]; extern u8 gSelectedOrderFromParty[3];
bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 MonKnowsMove(struct Pokemon *, u16); bool8 MonKnowsMove(struct Pokemon *, u16);
void sub_81B58A8(void); void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void); void DoWallyTutorialBagMenu(void);
u8 pokemon_ailments_get_primary(u32 status); u8 GetAilmentFromStatus(u32 status);
u16 ItemIdToBattleMoveId(u16 itemId); u16 ItemIdToBattleMoveId(u16 itemId);
void sub_8125B40(u8 taskId, TaskFunc func); void ItemUseCB_TMHM(u8 taskId, TaskFunc func);
void sub_8124C8C(void); void CB2_ShowPartyMenuForItemUse(void);
void sub_8126EDC(void); void CB2_ChooseMonToGiveItem(void);
void c2_8123744(void); void CB2_GiveHoldItem(void);
u8 GetCursorSelectionMonId(void); u8 GetCursorSelectionMonId(void);
void sub_8128370(void); void ChooseMonForDaycare(void);
void sub_811F818(u8 monId, u8 a1); void AnimatePartySlot(u8 monId, u8 a1);
void sub_8121D0C(u8); void DisplayPartyMenuStdMessage(u8);
void sub_811FB28(u8 taskId); void Task_HandleChooseMonInput(u8 taskId);
void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc); void PartyMenuModifyHP(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
void GetMonNickname(const struct Pokemon * mon, u8 * dest); void GetMonNickname(const struct Pokemon * mon, u8 * dest);
void sub_81202F8(const u8 * src, u8 a1); void DisplayPartyMenuMessage(const u8 * src, u8 a1);
bool8 sub_8120370(void); bool8 IsPartyMenuTextPrinterActive(void);
void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); void InitPartyMenu(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
void sub_81252D0(u8 taskId, TaskFunc followUpFunc); void sub_81252D0(u8 taskId, TaskFunc followUpFunc);
void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc); void ItemUseCB_PPRecovery(u8 taskId, TaskFunc followUpFunc);
void dp05_pp_up(u8 taskId, TaskFunc followUpFunc); void ItemUseCB_PPUp(u8 taskId, TaskFunc followUpFunc);
void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc); void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc);
void sub_8126B60(u8 taskId, TaskFunc followUpFunc); void sub_8126B60(u8 taskId, TaskFunc followUpFunc);
void sub_8126894(u8 taskId, TaskFunc followUpFunc); void ItemUseCB_SacredAsh(u8 taskId, TaskFunc followUpFunc);
void sub_81279E0(void); void sub_81279E0(void);
void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc); void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc);
u8 GetItemEffectType(u16 itemId); u8 GetItemEffectType(u16 itemId);
u8 pokemon_order_func(u8); u8 pokemon_order_func(u8);
void sub_8127CAC(void); void BufferBattlePartyCurrentOrder(void);
void sub_8127DA8(u8 battlerId, u8 multiplayerFlag); void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 multiplayerFlag);
void OpenPartyMenuInBattle(u8 arg); void OpenPartyMenuInBattle(void);
void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex); void SwitchPartyOrderLinkMulti(u8 battlerId, u8 unk, u8 arrayIndex);
bool8 IsMultiBattle(void); bool8 IsMultiBattle(void);
void sub_8126EDC(void); void CB2_ChooseMonToGiveItem(void);
void sub_812256C(u8 *partyCount, u8 (*icons)[6], u8 side); void DrawHeldItemIconsForTrade(u8 *partyCount, u8 (*icons)[6], u8 side);
void PartyMenuInit_FromPlayerPc(void); void ChooseMonToGiveMailFromMailbox(void);
void CB2_PartyMenuFromStartMenu(void); void CB2_PartyMenuFromStartMenu(void);
void sub_8128198(void); void ShowPartyMenuToShowcaseMultiBattleParty(void);
void sub_8127FF4(u8 slot, u8 slot2); void SwitchPartyMonSlots(u8 slot, u8 slot2);
void LoadHeldItemIcons(void); void LoadHeldItemIcons(void);
void sub_8127968(void); void OpenPartyMenuInTutorialBattle(u8 partyAction);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
include/region_map.h
+1 -1
View File
@@ -94,7 +94,7 @@ void CreateRegionMapPlayerIcon(u16 x, u16 y);
void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
u8 *GetMapName(u8 *, u16, u16); u8 *GetMapName(u8 *, u16, u16);
bool32 sub_8124668(u8 mapSecId); bool32 sub_8124668(u8 mapSecId);
void sub_80C4DF8(u8 *, u8); void GetMapNameGeneric(u8 *, u8);
void sub_80BFF50(u8 a0, void (*a1)(void)); void sub_80BFF50(u8 a0, void (*a1)(void));
#endif //GUARD_REGION_MAP_H #endif //GUARD_REGION_MAP_H
include/strings.h
+1 -1
View File
@@ -181,7 +181,7 @@ extern const u8 gUnknown_8416644[];
extern const u8 gUnknown_841665C[]; extern const u8 gUnknown_841665C[];
extern const u8 gUnknown_8416690[]; extern const u8 gUnknown_8416690[];
extern const u8 gUnknown_84166A7[]; extern const u8 gUnknown_84166A7[];
extern const u8 gUnknown_84169DC[]; extern const u8 gText_WontHaveEffect[];
extern const u8 gUnknown_841623D[]; extern const u8 gUnknown_841623D[];
extern const u8 gUnknown_84162BD[]; extern const u8 gUnknown_84162BD[];
extern const u8 gUnknown_841D148[]; extern const u8 gUnknown_841D148[];
src/battle_controller_oak_old_man.c
+5 -5
View File
@@ -355,7 +355,7 @@ static void OpenPartyMenuToChooseMon(void)
caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0]; caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
DestroyTask(gUnknown_3004FFC[gActiveBattler]); DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
OpenPartyMenuInBattle(caseId); OpenPartyMenuInTutorialBattle(caseId);
} }
} }
@@ -363,8 +363,8 @@ static void WaitForMonSelection(void)
{ {
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{ {
if (gUnknown_203B0C0 == 1) if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
else else
BtlController_EmitChosenMonReturnValue(1, 6, NULL); BtlController_EmitChosenMonReturnValue(1, 6, NULL);
OakOldManBufferExecCompleted(); OakOldManBufferExecCompleted();
@@ -1879,7 +1879,7 @@ static void OakOldManHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1]; gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
} }
static void OakOldManHandleChoosePokemon(void) static void OakOldManHandleChoosePokemon(void)
@@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i) 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); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
src/battle_controller_player.c
+5 -5
View File
@@ -1305,7 +1305,7 @@ static void OpenPartyMenuToChooseMon(void)
caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0]; caseId = gTasks[gUnknown_3004FFC[gActiveBattler]].data[0];
DestroyTask(gUnknown_3004FFC[gActiveBattler]); DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
OpenPartyMenuInBattle(caseId); OpenPartyMenuInTutorialBattle(caseId);
} }
} }
@@ -1313,8 +1313,8 @@ static void WaitForMonSelection(void)
{ {
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{ {
if (gUnknown_203B0C0 == 1) if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
else else
BtlController_EmitChosenMonReturnValue(1, 6, NULL); BtlController_EmitChosenMonReturnValue(1, 6, NULL);
if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1) if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
@@ -2462,7 +2462,7 @@ static void PlayerHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][1 + i]; gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][1 + i];
} }
static void PlayerHandleChoosePokemon(void) static void PlayerHandleChoosePokemon(void)
@@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i) 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); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
src/battle_controller_pokedude.c
+5 -5
View File
@@ -706,7 +706,7 @@ static void OpenPartyMenuToChooseMon(void)
gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection; gBattlerControllerFuncs[gActiveBattler] = WaitForMonSelection;
DestroyTask(gUnknown_3004FFC[gActiveBattler]); DestroyTask(gUnknown_3004FFC[gActiveBattler]);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
sub_8127968(); OpenPartyMenuInBattle();
} }
} }
@@ -714,8 +714,8 @@ static void WaitForMonSelection(void)
{ {
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{ {
if (gUnknown_203B0C0 == 1) if (gPartyMenuUseExitCallback == 1)
BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC); BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gBattlePartyCurrentOrder);
else else
BtlController_EmitChosenMonReturnValue(1, 6, NULL); BtlController_EmitChosenMonReturnValue(1, 6, NULL);
PokedudeBufferExecCompleted(); PokedudeBufferExecCompleted();
@@ -1985,7 +1985,7 @@ static void PokedudeHandleChooseItem(void)
gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = gBattleBufferA[gActiveBattler][i + 1]; gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][i + 1];
} }
static void PokedudeHandleChoosePokemon(void) static void PokedudeHandleChoosePokemon(void)
@@ -1998,7 +1998,7 @@ static void PokedudeHandleChoosePokemon(void)
*(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2]; *(&gBattleStruct->field_8B) = gBattleBufferA[gActiveBattler][2];
*(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3];
for (i = 0; i < 3; ++i) 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); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon;
gBattlerInMenuId = gActiveBattler; gBattlerInMenuId = gActiveBattler;
src/battle_controllers.c
+3 -3
View File
@@ -75,7 +75,7 @@ void sub_800D30C(void)
SetBattlePartyIds(); SetBattlePartyIds();
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
for (i = 0; i < gBattlersCount; ++i) for (i = 0; i < gBattlersCount; ++i)
sub_8127DA8(i, 0); BufferBattlePartyCurrentOrderBySide(i, 0);
} }
static void InitSinglePlayerBtlControllers(void) static void InitSinglePlayerBtlControllers(void)
@@ -199,11 +199,11 @@ static void InitLinkBtlControllers(void)
{ {
case 0: case 0:
case 3: case 3:
sub_8127DA8(gLinkPlayers[i].id, 0); BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 0);
break; break;
case 1: case 1:
case 2: case 2:
sub_8127DA8(gLinkPlayers[i].id, 1); BufferBattlePartyCurrentOrderBySide(gLinkPlayers[i].id, 1);
break; break;
} }
if (i == multiplayerId) if (i == multiplayerId)
src/battle_gfx_sfx_util.c
+1 -1
View File
@@ -620,7 +620,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId)
break; break;
case 6: case 6:
LoadAndCreateEnemyShadowSprites(); LoadAndCreateEnemyShadowSprites();
sub_8127CAC(); BufferBattlePartyCurrentOrder();
retVal = TRUE; retVal = TRUE;
break; break;
} }
src/battle_main.c
+19 -19
View File
@@ -144,7 +144,7 @@ static EWRAM_DATA u32 gUnknown_2022AE8[25] = {0};
EWRAM_DATA u32 gBattleTypeFlags = 0; EWRAM_DATA u32 gBattleTypeFlags = 0;
EWRAM_DATA u8 gBattleTerrain = 0; EWRAM_DATA u8 gBattleTerrain = 0;
EWRAM_DATA u32 gUnknown_2022B54 = 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_2022BB8 = NULL;
EWRAM_DATA u8 *gUnknown_2022BBC = NULL; EWRAM_DATA u8 *gUnknown_2022BBC = NULL;
EWRAM_DATA u16 *gUnknown_2022BC0 = NULL; EWRAM_DATA u16 *gUnknown_2022BC0 = NULL;
@@ -1078,16 +1078,16 @@ static void sub_80108C4(void)
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
{ {
gUnknown_2022B58[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES); gMultiPartnerParty[i].species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES);
gUnknown_2022B58[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); gMultiPartnerParty[i].heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
nick = gUnknown_2022B58[i].nickname; nick = gMultiPartnerParty[i].nickname;
GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick); GetMonData(&gPlayerParty[i], MON_DATA_NICKNAME, nick);
gUnknown_2022B58[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); gMultiPartnerParty[i].level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
gUnknown_2022B58[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP); gMultiPartnerParty[i].hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
gUnknown_2022B58[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP); gMultiPartnerParty[i].maxhp = GetMonData(&gPlayerParty[i], MON_DATA_MAX_HP);
gUnknown_2022B58[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS); gMultiPartnerParty[i].status = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
gUnknown_2022B58[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); gMultiPartnerParty[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
gUnknown_2022B58[i].gender = GetMonGender(&gPlayerParty[i]); gMultiPartnerParty[i].gender = GetMonGender(&gPlayerParty[i]);
StripExtCtrlCodes(nick); StripExtCtrlCodes(nick);
if (GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE) if (GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE)
{ {
@@ -1098,7 +1098,7 @@ static void sub_80108C4(void)
cur[j] = EOS; cur[j] = EOS;
} }
} }
memcpy(&gBattleStruct->field_184, gUnknown_2022B58, sizeof(gUnknown_2022B58)); memcpy(&gBattleStruct->field_184, gMultiPartnerParty, sizeof(gMultiPartnerParty));
} }
static void CB2_PreInitMultiBattle(void) static void CB2_PreInitMultiBattle(void)
@@ -1123,7 +1123,7 @@ static void CB2_PreInitMultiBattle(void)
if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished()) if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
{ {
sub_80108C4(); 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]; ++gBattleCommunication[MULTIUSE_STATE];
} }
break; break;
@@ -1137,13 +1137,13 @@ static void CB2_PreInitMultiBattle(void)
continue; continue;
if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1)) if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1))
|| (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]; ++gBattleCommunication[MULTIUSE_STATE];
*savedCallback = gMain.savedCallback; *savedCallback = gMain.savedCallback;
*savedBattleTypeFlags = gBattleTypeFlags; *savedBattleTypeFlags = gBattleTypeFlags;
gMain.savedCallback = CB2_PreInitMultiBattle; gMain.savedCallback = CB2_PreInitMultiBattle;
sub_8128198(); ShowPartyMenuToShowcaseMultiBattleParty();
} }
break; break;
case 2: case 2:
@@ -3004,22 +3004,22 @@ void sub_8013F6C(u8 battler)
u8 r4, r1; u8 r4, r1;
for (i = 0; i < 3; ++i) for (i = 0; i < 3; ++i)
gUnknown_203B0DC[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60)); gBattlePartyCurrentOrder[i] = *(battler * 3 + i + (u8 *)(gBattleStruct->field_60));
r4 = pokemon_order_func(gBattlerPartyIndexes[battler]); r4 = pokemon_order_func(gBattlerPartyIndexes[battler]);
r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler)); r1 = pokemon_order_func(*(gBattleStruct->monToSwitchIntoId + battler));
sub_8127FF4(r4, r1); SwitchPartyMonSlots(r4, r1);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{ {
for (i = 0; i < 3; ++i) 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];
*(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gUnknown_203B0DC[i]; *(BATTLE_PARTNER(battler) * 3 + i + (u8 *)(gBattleStruct->field_60)) = gBattlePartyCurrentOrder[i];
} }
} }
else else
{ {
for (i = 0; i < 3; ++i) 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];
} }
} }
src/battle_script_commands.c
+2 -2
View File
@@ -7140,8 +7140,8 @@ static void atk8F_forcerandomswitch(void)
*(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i; *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
if (!IsMultiBattle()) if (!IsMultiBattle())
sub_8013F6C(gBattlerTarget); sub_8013F6C(gBattlerTarget);
sub_8127EC4(gBattlerTarget, i, 0); SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0);
sub_8127EC4(gBattlerTarget ^ 2, i, 1); SwitchPartyOrderLinkMulti(gBattlerTarget ^ 2, i, 1);
} }
} }
else else
src/berry_pouch.c
+2 -2
View File
@@ -1194,7 +1194,7 @@ static void Task_BerryPouch_Give(u8 taskId)
Task_Give_PrintThereIsNoPokemon(taskId); Task_Give_PrintThereIsNoPokemon(taskId);
else else
{ {
sResources->exitCallback = sub_8126EDC; sResources->exitCallback = CB2_ChooseMonToGiveItem;
gTasks[taskId].func = BerryPouch_StartFadeToExitCallback; gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
} }
} }
@@ -1251,7 +1251,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId)
} }
else else
{ {
sResources->exitCallback = c2_8123744; sResources->exitCallback = CB2_GiveHoldItem;
gTasks[taskId].func = BerryPouch_StartFadeToExitCallback; gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
} }
} }
src/daycare.c
+1 -1
View File
@@ -1582,7 +1582,7 @@ void ShowDaycareLevelMenu(void)
void ChooseSendDaycareMon(void) void ChooseSendDaycareMon(void)
{ {
sub_8128370(); ChooseMonForDaycare();
gMain.savedCallback = CB2_ReturnToField; gMain.savedCallback = CB2_ReturnToField;
} }
src/field_fadetransition.c
+1 -1
View File
@@ -522,7 +522,7 @@ static bool32 sub_807E40C(void)
bool32 sub_807E418(void) bool32 sub_807E418(void)
{ {
if (field_weather_is_fade_finished() == TRUE && sub_80F83B0()) if (IsWeatherNotFadingIn() == TRUE && sub_80F83B0())
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
src/field_poison.c
+2 -2
View File
@@ -43,7 +43,7 @@ static void FaintFromFieldPoison(u8 partyIdx)
static bool32 MonFaintedFromPoison(u8 partyIdx) static bool32 MonFaintedFromPoison(u8 partyIdx)
{ {
struct Pokemon *pokemon = gPlayerParty + 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 TRUE;
return FALSE; return FALSE;
} }
@@ -97,7 +97,7 @@ s32 DoPoisonFieldEffect(void)
u32 numFainted = 0; u32 numFainted = 0;
for (i = 0; i < PARTY_SIZE; i++) 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); hp = GetMonData(pokemon, MON_DATA_HP);
if (hp == 0 || --hp == 0) if (hp == 0 || --hp == 0)
src/field_specials.c
+2 -2
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))) 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)) if (gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE22))
sp0.unk1 = r5; sp0.unk1 = r5;
else else
@@ -1875,7 +1875,7 @@ void sub_80CC59C(void)
} }
if (gSaveBlock1Ptr->location.mapGroup == sInsideOutsidePairs[r5].grp2 && gSaveBlock1Ptr->location.mapNum == sInsideOutsidePairs[r5].num2) 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; sp0.unk1 = r5;
if (r5 == 22) if (r5 == 22)
{ {
src/fieldmap.c
+1 -1
View File
@@ -60,7 +60,7 @@ const u8 gUnknown_8352F10[] = {
const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection) 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) void not_trainer_hill_battle_pyramid(void)
src/fldeff_softboiled.c
+28 -28
View File
@@ -13,7 +13,7 @@ static void sub_80E58A0(u8 taskId);
static void sub_80E5934(u8 taskId); static void sub_80E5934(u8 taskId);
extern const u8 gUnknown_84169F8[]; extern const u8 gUnknown_84169F8[];
extern const u8 gUnknown_8416F27[]; extern const u8 gText_PkmnHPRestoredByVar2[];
bool8 hm_prepare_dive_probably(void) bool8 hm_prepare_dive_probably(void)
{ {
@@ -26,27 +26,27 @@ bool8 hm_prepare_dive_probably(void)
return FALSE; return FALSE;
} }
void sub_80E56DC(u8 taskId) void ChooseMonForSoftboiled(u8 taskId)
{ {
gUnknown_203B0A0.unkB = 10; gPartyMenu.unkB = 10;
gUnknown_203B0A0.unkA = gUnknown_203B0A0.unk9; gPartyMenu.unkA = gPartyMenu.unk9;
sub_811F818(GetCursorSelectionMonId(), 1); AnimatePartySlot(GetCursorSelectionMonId(), 1);
sub_8121D0C(5); DisplayPartyMenuStdMessage(5);
gTasks[taskId].func = sub_811FB28; gTasks[taskId].func = Task_HandleChooseMonInput;
} }
void sub_80E5724(u8 taskId) void sub_80E5724(u8 taskId)
{ {
u8 r8 = gUnknown_203B0A0.unk9; u8 r8 = gPartyMenu.unk9;
u8 r5 = gUnknown_203B0A0.unkA; u8 r5 = gPartyMenu.unkA;
u16 curHp; u16 curHp;
s16 delta; s16 delta;
if (r5 > 6) if (r5 > 6)
{ {
gUnknown_203B0A0.unkB = 0; gPartyMenu.unkB = 0;
sub_8121D0C(0); DisplayPartyMenuStdMessage(0);
gTasks[taskId].func = sub_811FB28; gTasks[taskId].func = Task_HandleChooseMonInput;
} }
else else
{ {
@@ -58,7 +58,7 @@ void sub_80E5724(u8 taskId)
else else
{ {
PlaySE(SE_KAIFUKU); 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) static void sub_80E57E8(u8 taskId)
{ {
PlaySE(SE_KAIFUKU); 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.unkA, 1, GetMonData(&gPlayerParty[gPartyMenu.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C);
} }
static void sub_80E583C(u8 taskId) static void sub_80E583C(u8 taskId)
{ {
GetMonNickname(&gPlayerParty[gUnknown_203B0A0.unkA], gStringVar1); GetMonNickname(&gPlayerParty[gPartyMenu.unkA], gStringVar1);
StringExpandPlaceholders(gStringVar4, gUnknown_8416F27); StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
sub_81202F8(gStringVar4, 0); DisplayPartyMenuMessage(gStringVar4, 0);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = sub_80E58A0; gTasks[taskId].func = sub_80E58A0;
} }
static void sub_80E58A0(u8 taskId) static void sub_80E58A0(u8 taskId)
{ {
if (sub_8120370() != TRUE) if (IsPartyMenuTextPrinterActive() != TRUE)
{ {
gUnknown_203B0A0.unkB = 0; gPartyMenu.unkB = 0;
sub_811F818(gUnknown_203B0A0.unk9, 0); AnimatePartySlot(gPartyMenu.unk9, 0);
gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA; gPartyMenu.unk9 = gPartyMenu.unkA;
sub_811F818(gUnknown_203B0A0.unkA, 1); AnimatePartySlot(gPartyMenu.unkA, 1);
ClearStdWindowAndFrameToTransparent(6, 0); ClearStdWindowAndFrameToTransparent(6, 0);
ClearWindowTilemap(6); ClearWindowTilemap(6);
sub_8121D0C(0); DisplayPartyMenuStdMessage(0);
gTasks[taskId].func = sub_811FB28; gTasks[taskId].func = Task_HandleChooseMonInput;
} }
} }
static void sub_80E5900(u8 taskId) static void sub_80E5900(u8 taskId)
{ {
if (sub_8120370() != TRUE) if (IsPartyMenuTextPrinterActive() != TRUE)
{ {
sub_8121D0C(5); DisplayPartyMenuStdMessage(5);
gTasks[taskId].func = sub_811FB28; gTasks[taskId].func = Task_HandleChooseMonInput;
} }
} }
static void sub_80E5934(u8 taskId) static void sub_80E5934(u8 taskId)
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
sub_81202F8(gUnknown_84169F8, 0); DisplayPartyMenuMessage(gUnknown_84169F8, 0);
ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(2);
gTasks[taskId].func = sub_80E5900; gTasks[taskId].func = sub_80E5900;
} }
src/fldeff_sweetscent.c
+1 -1
View File
@@ -20,7 +20,7 @@ static void FailSweetScentEncounter(u8 taskId);
static void Unused_StartSweetscentFldeff(void) static void Unused_StartSweetscentFldeff(void)
{ {
gUnknown_203B0A0.unk9 = 0; gPartyMenu.unk9 = 0;
FieldCallback_SweetScent(); FieldCallback_SweetScent();
} }
src/item_pc.c
+2 -2
View File
@@ -1029,8 +1029,8 @@ static void Task_ItemPcGive(u8 taskId)
static void ItemPc_CB2_SwitchToPartyMenu(void) static void ItemPc_CB2_SwitchToPartyMenu(void)
{ {
PartyMenuInit(0, 0, 6, 0, 6, sub_811FB28, ItemPc_CB2_ReturnFromPartyMenu); InitPartyMenu(0, 0, 6, 0, 6, Task_HandleChooseMonInput, ItemPc_CB2_ReturnFromPartyMenu);
gUnknown_203B0A0.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition()); gPartyMenu.unkC = ItemPc_GetItemIdBySlotId(ItemPc_GetCursorPosition());
} }
static void ItemPc_CB2_ReturnFromPartyMenu(void) static void ItemPc_CB2_ReturnFromPartyMenu(void)
src/item_use.c
+13 -13
View File
@@ -133,7 +133,7 @@ static const u8 sUnref_83E27B4[] = {
}; };
void (*const gUnknown_83E2954[])(void) = { void (*const gUnknown_83E2954[])(void) = {
sub_8124C8C, CB2_ShowPartyMenuForItemUse,
CB2_ReturnToField, CB2_ReturnToField,
NULL, NULL,
NULL NULL
@@ -179,7 +179,7 @@ void sub_80A1084(void)
void sub_80A109C(u8 taskId) void sub_80A109C(u8 taskId)
{ {
if (field_weather_is_fade_finished() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
{ {
sItemUseOnFieldCB(taskId); sItemUseOnFieldCB(taskId);
} }
@@ -234,7 +234,7 @@ bool8 sub_80A1194(void)
void sub_80A11C0(u8 taskId) void sub_80A11C0(u8 taskId)
{ {
if (field_weather_is_fade_finished() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
{ {
UnfreezeMapObjects(); UnfreezeMapObjects();
ScriptContext2_Disable(); ScriptContext2_Disable();
@@ -415,37 +415,37 @@ void sub_80A16D0(u8 taskId)
void FieldUseFunc_Medicine(u8 taskId) void FieldUseFunc_Medicine(u8 taskId)
{ {
gUnknown_3005E98 = sub_81252D0; gItemUseCB = sub_81252D0;
sub_80A16D0(taskId); sub_80A16D0(taskId);
} }
void FieldUseFunc_Ether(u8 taskId) void FieldUseFunc_Ether(u8 taskId)
{ {
gUnknown_3005E98 = ItemUseCB_PpRestore; gItemUseCB = ItemUseCB_PPRecovery;
sub_80A16D0(taskId); sub_80A16D0(taskId);
} }
void FieldUseFunc_PpUp(u8 taskId) void FieldUseFunc_PpUp(u8 taskId)
{ {
gUnknown_3005E98 = dp05_pp_up; gItemUseCB = ItemUseCB_PPUp;
sub_80A16D0(taskId); sub_80A16D0(taskId);
} }
void FieldUseFunc_RareCandy(u8 taskId) void FieldUseFunc_RareCandy(u8 taskId)
{ {
gUnknown_3005E98 = dp05_rare_candy; gItemUseCB = dp05_rare_candy;
sub_80A16D0(taskId); sub_80A16D0(taskId);
} }
void FieldUseFunc_EvoItem(u8 taskId) void FieldUseFunc_EvoItem(u8 taskId)
{ {
gUnknown_3005E98 = sub_8126B60; gItemUseCB = sub_8126B60;
sub_80A16D0(taskId); sub_80A16D0(taskId);
} }
void FieldUseFunc_SacredAsh(u8 taskId) void FieldUseFunc_SacredAsh(u8 taskId)
{ {
gUnknown_3005E98 = sub_8126894; gItemUseCB = ItemUseCB_SacredAsh;
sub_80A0FBC(taskId); sub_80A0FBC(taskId);
} }
@@ -765,7 +765,7 @@ void BattleUseFunc_GuardSpec(u8 taskId)
{ {
if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0)) 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 else
{ {
@@ -812,19 +812,19 @@ void ItemUse_SwitchToPartyMenuInBattle(u8 taskId)
void BattleUseFunc_Medicine(u8 taskId) void BattleUseFunc_Medicine(u8 taskId)
{ {
gUnknown_3005E98 = ItemUseCB_Medicine; gItemUseCB = ItemUseCB_Medicine;
ItemUse_SwitchToPartyMenuInBattle(taskId); ItemUse_SwitchToPartyMenuInBattle(taskId);
} }
void sub_80A1FD8(u8 taskId) void sub_80A1FD8(u8 taskId)
{ {
gUnknown_3005E98 = sub_8126894; gItemUseCB = ItemUseCB_SacredAsh;
ItemUse_SwitchToPartyMenuInBattle(taskId); ItemUse_SwitchToPartyMenuInBattle(taskId);
} }
void BattleUseFunc_Ether(u8 taskId) void BattleUseFunc_Ether(u8 taskId)
{ {
gUnknown_3005E98 = ItemUseCB_PpRestore; gItemUseCB = ItemUseCB_PPRecovery;
ItemUse_SwitchToPartyMenuInBattle(taskId); ItemUse_SwitchToPartyMenuInBattle(taskId);
} }
src/map_preview_screen.c
+1 -1
View File
@@ -495,7 +495,7 @@ static void sub_80F83D0(u8 taskId)
} }
break; break;
case 2: case 2:
if (field_weather_is_fade_finished()) if (IsWeatherNotFadingIn())
{ {
Overworld_PlaySpecialMapMusic(); Overworld_PlaySpecialMapMusic();
data[0]++; data[0]++;
src/player_pc.c
+4 -4
View File
@@ -322,7 +322,7 @@ static void Task_DepositItem_WaitFadeAndGoToBag(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
CleanupOverworldWindowsAndTilemaps(); CleanupOverworldWindowsAndTilemaps();
sub_8107DB4(3, POCKET_ITEMS - 1, CB2_ReturnToField); GoToBagMenu(3, POCKET_ITEMS - 1, CB2_ReturnToField);
gFieldCallback = CB2_ReturnFromDepositMenu; gFieldCallback = CB2_ReturnFromDepositMenu;
DestroyTask(taskId); DestroyTask(taskId);
} }
@@ -336,7 +336,7 @@ static void Task_PlayerPcDepositItem(u8 taskId)
static void Task_ReturnToItemStorageSubmenu(u8 taskId) static void Task_ReturnToItemStorageSubmenu(u8 taskId)
{ {
if (field_weather_is_fade_finished() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
gTasks[taskId].func = Task_TopMenu_ItemStorageSubmenu_HandleInput; gTasks[taskId].func = Task_TopMenu_ItemStorageSubmenu_HandleInput;
} }
@@ -573,7 +573,7 @@ static void Task_WaitFadeAndReadSelectedMail(u8 taskId)
static void Task_WaitFadeAndReturnToMailboxPcInputHandler(u8 taskId) static void Task_WaitFadeAndReturnToMailboxPcInputHandler(u8 taskId)
{ {
if (field_weather_is_fade_finished() == TRUE) if (IsWeatherNotFadingIn() == TRUE)
gTasks[taskId].func = Task_MailboxPcHandleInput; gTasks[taskId].func = Task_MailboxPcHandleInput;
} }
@@ -674,7 +674,7 @@ static void Task_WaitFadeAndGoToPartyMenu(u8 taskId)
{ {
MailboxPC_DestroyListMenuBuffer(); MailboxPC_DestroyListMenuBuffer();
CleanupOverworldWindowsAndTilemaps(); CleanupOverworldWindowsAndTilemaps();
PartyMenuInit_FromPlayerPc(); ChooseMonToGiveMailFromMailbox();
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
src/quest_log.c
+12 -12
View File
@@ -987,7 +987,7 @@ void sub_8111708(void)
gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE); gSaveBlock1Ptr->mapDataId = VarGet(VAR_0x40AE);
if (gSaveBlock1Ptr->mapDataId == 0) if (gSaveBlock1Ptr->mapDataId == 0)
{ {
sp0 = *get_mapheader_by_bank_and_number(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); sp0 = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum);
gSaveBlock1Ptr->mapDataId = sp0.mapDataId; gSaveBlock1Ptr->mapDataId = sp0.mapDataId;
} }
} }
@@ -1363,7 +1363,7 @@ static void sub_8111FCC(u8 taskId)
{ {
if (gUnknown_203AE94.unk_0_6 != 1) if (gUnknown_203AE94.unk_0_6 != 1)
{ {
sub_80C4DF8(gStringVar1, gMapHeader.regionMapSectionId); GetMapNameGeneric(gStringVar1, gMapHeader.regionMapSectionId);
StringExpandPlaceholders(gStringVar4, gUnknown_841B073); StringExpandPlaceholders(gStringVar4, gUnknown_841B073);
sub_8111D10(); sub_8111D10();
} }
@@ -3166,7 +3166,7 @@ static const u16 *sub_8113FBC(const u16 *a0)
StringCopy(gStringVar1, ItemId_GetName(r5[0])); StringCopy(gStringVar1, ItemId_GetName(r5[0]));
if (r5[0] == ITEM_ESCAPE_ROPE) if (r5[0] == ITEM_ESCAPE_ROPE)
{ {
sub_80C4DF8(gStringVar2, r5[2]); GetMapNameGeneric(gStringVar2, r5[2]);
StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6); StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6);
} }
else if (r5[1] != 0xFFFF) else if (r5[1] != 0xFFFF)
@@ -3814,7 +3814,7 @@ static const u16 *sub_8114D68(const u16 *a0)
a0 = sub_8113E88(30, a0); a0 = sub_8113E88(30, a0);
r6 = (const u8 *)a0 + 6; r6 = (const u8 *)a0 + 6;
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
sub_80C4DF8(gStringVar1, r6[0]); GetMapNameGeneric(gStringVar1, r6[0]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[a0[2]].trainerName); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gTrainers[a0[2]].trainerName);
QuestLog_AutoGetSpeciesName(a0[0], 0, 2); QuestLog_AutoGetSpeciesName(a0[0], 0, 2);
@@ -3855,7 +3855,7 @@ static const u16 *sub_8114E68(const u16 *a0)
r6 = (const u8 *)a0 + 8; r6 = (const u8 *)a0 + 8;
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
sub_80C4DF8(gStringVar1, r6[2]); GetMapNameGeneric(gStringVar1, r6[2]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
QuestLog_AutoGetSpeciesName(a0[2], NULL, 1); QuestLog_AutoGetSpeciesName(a0[2], NULL, 1);
ConvertIntToDecimalStringN(gStringVar2, r6[0], STR_CONV_MODE_LEFT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, r6[0], STR_CONV_MODE_LEFT_ALIGN, 3);
@@ -3983,7 +3983,7 @@ static const u16 *sub_81151DC(const u16 *a0)
const u16 *r5 = sub_8113E88(34, a0); const u16 *r5 = sub_8113E88(34, a0);
const u8 *r6 = (const u8 *)r5 + 6; const u8 *r6 = (const u8 *)r5 + 6;
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
sub_80C4DF8(gStringVar1, r6[0]); GetMapNameGeneric(gStringVar1, r6[0]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
if ( if (
gTrainers[r5[2]].trainerClass == 0x51 gTrainers[r5[2]].trainerClass == 0x51
@@ -4164,7 +4164,7 @@ static const u16 *sub_81152BC(const u16 *a0)
const u16 *r5 = sub_8113E88(35, a0); const u16 *r5 = sub_8113E88(35, a0);
const u8 *r5_2 = (const u8 *)r5 + 0; const u8 *r5_2 = (const u8 *)r5 + 0;
r6 = r5_2[1]; r6 = r5_2[1];
sub_80C4DF8(gStringVar1, r5_2[0]); GetMapNameGeneric(gStringVar1, r5_2[0]);
StringCopy(gStringVar2, gUnknown_8456AF0[r6]); StringCopy(gStringVar2, gUnknown_8456AF0[r6]);
if (gUnknown_8456BE4[r6] == 5) if (gUnknown_8456BE4[r6] == 5)
{ {
@@ -4238,7 +4238,7 @@ static const u16 *sub_8115460(const u16 *a0)
const u8 *r5 = (const u8 *)r4 + 2; const u8 *r5 = (const u8 *)r4 + 2;
QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0); QuestLog_AutoGetSpeciesName(r4[0], gStringVar1, 0);
if (r5[1] != 0xFF) if (r5[1] != 0xFF)
sub_80C4DF8(gStringVar2, r5[1]); GetMapNameGeneric(gStringVar2, r5[1]);
if (r5[0] == 7) if (r5[0] == 7)
{ {
if (r5[1] == 0x58) if (r5[1] == 0x58)
@@ -4270,7 +4270,7 @@ static const u16 *sub_8115518(const u16 *a0)
const u8 *r7 = (const u8 *)r4 + 8; const u8 *r7 = (const u8 *)r4 + 8;
u32 r6 = (r4[2] << 16) + r4[3]; u32 r6 = (r4[2] << 16) + r4[3];
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
sub_80C4DF8(gStringVar1, r7[0]); GetMapNameGeneric(gStringVar1, r7[0]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gStringVar1);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0])); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, ItemId_GetName(r4[0]));
if (r4[1] < 2) if (r4[1] < 2)
@@ -4303,7 +4303,7 @@ static const u16 *sub_81155E0(const u16 *a0) {
const u8 *r7 = (const u8 *) r5 + 8; const u8 *r7 = (const u8 *) r5 + 8;
u32 r6 = (r5[2] << 16) + r5[3]; u32 r6 = (r5[2] << 16) + r5[3];
DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_Reset();
sub_80C4DF8(gStringVar1, r7[0]); GetMapNameGeneric(gStringVar1, r7[0]);
if (r7[1] == 0) { if (r7[1] == 0) {
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1); DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gStringVar1);
@@ -4344,7 +4344,7 @@ static const u16 *sub_8115700(const u16 *a0)
{ {
const u16 *r4 = sub_8113E88(40, a0); const u16 *r4 = sub_8113E88(40, a0);
const u8 *r5 = (const u8 *)r4 + 2; const u8 *r5 = (const u8 *)r4 + 2;
sub_80C4DF8(gStringVar1, r5[0]); GetMapNameGeneric(gStringVar1, r5[0]);
StringCopy(gStringVar2, ItemId_GetName(r4[0])); StringCopy(gStringVar2, ItemId_GetName(r4[0]));
StringExpandPlaceholders(gStringVar4, gUnknown_841B03F); StringExpandPlaceholders(gStringVar4, gUnknown_841B03F);
return (const u16 *)(r5 + 2); return (const u16 *)(r5 + 2);
@@ -4420,7 +4420,7 @@ static u16 *sub_81157DC(u16 *a0, const u16 *a1)
static const u16 *sub_8115800(const u16 *a0) static const u16 *sub_8115800(const u16 *a0)
{ {
const u16 *r4 = sub_8113E88(42, a0); const u16 *r4 = sub_8113E88(42, a0);
sub_80C4DF8(gStringVar1, r4[0]); GetMapNameGeneric(gStringVar1, r4[0]);
StringExpandPlaceholders(gStringVar4, gUnknown_841B064); StringExpandPlaceholders(gStringVar4, gUnknown_841B064);
return r4 + 1; return r4 + 1;
} }
src/roamer.c
+1 -1
View File
@@ -236,5 +236,5 @@ u16 GetRoamerLocationMapSectionId(void)
struct Roamer *roamer = &saveRoamer; struct Roamer *roamer = &saveRoamer;
if (!saveRoamer.active) if (!saveRoamer.active)
return MAPSEC_NONE; return MAPSEC_NONE;
return get_mapheader_by_bank_and_number(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId; return Overworld_GetMapHeaderByGroupAndId(sRoamerLocation[MAP_GRP], sRoamerLocation[MAP_NUM])->regionMapSectionId;
} }
src/save_menu_util.c
+1 -1
View File
@@ -41,7 +41,7 @@ void SaveStatToString(u8 gameStatId, u8 *dest0, u8 color)
dest = ConvertIntToDecimalStringN(dest, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); dest = ConvertIntToDecimalStringN(dest, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2);
break; break;
case SAVE_STAT_LOCATION: case SAVE_STAT_LOCATION:
sub_80C4DF8(dest, gMapHeader.regionMapSectionId); GetMapNameGeneric(dest, gMapHeader.regionMapSectionId);
break; break;
case SAVE_STAT_BADGES: case SAVE_STAT_BADGES:
for (flagId = FLAG_BADGE01_GET, nBadges = 0; flagId < FLAG_BADGE01_GET + 8; flagId++) for (flagId = FLAG_BADGE01_GET, nBadges = 0; flagId < FLAG_BADGE01_GET + 8; flagId++)
src/tm_case.c
+5 -5
View File
@@ -848,8 +848,8 @@ static void TMHMContextMenuAction_Use(u8 taskId)
} }
else else
{ {
gUnknown_3005E98 = sub_8125B40; gItemUseCB = ItemUseCB_TMHM;
sTMCaseDynamicResources->savedCallback = sub_8124C8C; sTMCaseDynamicResources->savedCallback = CB2_ShowPartyMenuForItemUse;
Task_BeginFadeOutFromTMCase(taskId); Task_BeginFadeOutFromTMCase(taskId);
} }
} }
@@ -874,7 +874,7 @@ static void TMHMContextMenuAction_Give(u8 taskId)
} }
else else
{ {
sTMCaseDynamicResources->savedCallback = sub_8126EDC; sTMCaseDynamicResources->savedCallback = CB2_ChooseMonToGiveItem;
Task_BeginFadeOutFromTMCase(taskId); Task_BeginFadeOutFromTMCase(taskId);
} }
} }
@@ -945,7 +945,7 @@ static void Task_SelectTMAction_Type1(u8 taskId)
if (!itemid_is_unique(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1]))) if (!itemid_is_unique(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1])))
{ {
sTMCaseDynamicResources->savedCallback = c2_8123744; sTMCaseDynamicResources->savedCallback = CB2_GiveHoldItem;
Task_BeginFadeOutFromTMCase(taskId); Task_BeginFadeOutFromTMCase(taskId);
} }
else else
@@ -1274,7 +1274,7 @@ static void Task_TMCaseDude_Playback(u8 taskId)
sTMCaseStaticResources.scrollOffset = sPokeDudePackBackup->unk_162; sTMCaseStaticResources.scrollOffset = sPokeDudePackBackup->unk_162;
Free(sPokeDudePackBackup); Free(sPokeDudePackBackup);
CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400);
sub_8108CF0(); CB2_SetUpReshowBattleScreenAfterMenu();
BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0);
data[8]++; data[8]++;
} }
src/trade.c
+9 -9
View File
@@ -879,11 +879,11 @@ static void sub_804C728(void)
break; break;
case 8: case 8:
LoadHeldItemIcons(); LoadHeldItemIcons();
sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
gMain.state++; gMain.state++;
break; break;
case 9: case 9:
sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
gMain.state++; gMain.state++;
break; break;
case 10: case 10:
@@ -1483,7 +1483,7 @@ static void sub_804C728(void)
"\tadds r0, 0x36\n" "\tadds r0, 0x36\n"
"\tadds r1, 0x28\n" "\tadds r1, 0x28\n"
"\tmovs r2, 0\n" "\tmovs r2, 0\n"
"\tbl sub_812256C\n" "\tbl DrawHeldItemIconsForTrade\n"
"\tldr r1, _0804CB74 @ =gMain\n" "\tldr r1, _0804CB74 @ =gMain\n"
"\tmovs r5, 0x87\n" "\tmovs r5, 0x87\n"
"\tlsls r5, 3\n" "\tlsls r5, 3\n"
@@ -1499,7 +1499,7 @@ static void sub_804C728(void)
"\tadds r0, 0x36\n" "\tadds r0, 0x36\n"
"\tadds r1, 0x28\n" "\tadds r1, 0x28\n"
"\tmovs r2, 0x1\n" "\tmovs r2, 0x1\n"
"\tbl sub_812256C\n" "\tbl DrawHeldItemIconsForTrade\n"
"\tldr r1, _0804CB98 @ =gMain\n" "\tldr r1, _0804CB98 @ =gMain\n"
"\tmovs r7, 0x87\n" "\tmovs r7, 0x87\n"
"\tlsls r7, 3\n" "\tlsls r7, 3\n"
@@ -1989,11 +1989,11 @@ void sub_804CF14(void)
break; break;
case 8: case 8:
LoadHeldItemIcons(); LoadHeldItemIcons();
sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0); DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 0);
gMain.state++; gMain.state++;
break; break;
case 9: case 9:
sub_812256C(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1); DrawHeldItemIconsForTrade(sTradeMenuResourcesPtr->partyCounts, sTradeMenuResourcesPtr->partyIcons, 1);
gMain.state++; gMain.state++;
break; break;
case 10: case 10:
@@ -2365,7 +2365,7 @@ void sub_804CF14(void)
"\tadds r0, 0x36\n" "\tadds r0, 0x36\n"
"\tadds r1, 0x28\n" "\tadds r1, 0x28\n"
"\tmovs r2, 0\n" "\tmovs r2, 0\n"
"\tbl sub_812256C\n" "\tbl DrawHeldItemIconsForTrade\n"
"\tldr r1, _0804D174 @ =gMain\n" "\tldr r1, _0804D174 @ =gMain\n"
"\tmovs r5, 0x87\n" "\tmovs r5, 0x87\n"
"\tlsls r5, 3\n" "\tlsls r5, 3\n"
@@ -2381,7 +2381,7 @@ void sub_804CF14(void)
"\tadds r0, 0x36\n" "\tadds r0, 0x36\n"
"\tadds r1, 0x28\n" "\tadds r1, 0x28\n"
"\tmovs r2, 0x1\n" "\tmovs r2, 0x1\n"
"\tbl sub_812256C\n" "\tbl DrawHeldItemIconsForTrade\n"
"\tldr r1, _0804D198 @ =gMain\n" "\tldr r1, _0804D198 @ =gMain\n"
"\tmovs r7, 0x87\n" "\tmovs r7, 0x87\n"
"\tlsls r7, 3\n" "\tlsls r7, 3\n"
@@ -4394,7 +4394,7 @@ static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet)
return FALSE; return FALSE;
} }
int sub_804FBEC(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet) int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet)
{ {
u8 r9 = a0.unk_01_0; u8 r9 = a0.unk_01_0;
u8 r4 = a0.unk_00_7; u8 r4 = a0.unk_00_7;
src/wild_pokemon_area.c
+1 -1
View File
@@ -289,7 +289,7 @@ static bool32 PokemonInEncounterTable(const struct WildPokemonInfo * info, s32 s
static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header) static u16 GetMapSecIdFromWildMonHeader(const struct WildPokemonHeader * header)
{ {
return get_mapheader_by_bank_and_number(header->mapGroup, header->mapNum)->regionMapSectionId; return Overworld_GetMapHeaderByGroupAndId(header->mapGroup, header->mapNum)->regionMapSectionId;
} }
static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p) static bool32 TryGetMapSecPokedexAreaEntry(u16 mapSecId, const u16 (*lut)[2], s32 count, s32 * lutIdx_p, u16 * tableIdx_p)
sym_common.txt
+1 -1
View File
@@ -180,7 +180,7 @@ gUnknown_3005E90: @ 3005E90
gUnknown_3005E94: @ 3005E94 gUnknown_3005E94: @ 3005E94
.space 0x4 .space 0x4
gUnknown_3005E98: @ 3005E98 gItemUseCB: @ 3005E98
.space 0x4 .space 0x4
.include "help_system_812B1E0.o" .include "help_system_812B1E0.o"
sym_ewram.txt
+12 -12
View File
@@ -569,10 +569,10 @@ gUnknown_203B05C: @ 203B05C
gUnknown_203B064: @ 203B064 gUnknown_203B064: @ 203B064
.space 0x4 .space 0x4
gUnknown_203B068: @ 203B068 gUnionRoomOfferedSpecies: @ 203B068
.space 0x2 .space 0x2
gUnknown_203B06A: @ 203B06A gUnionRoomRequestedMonType: @ 203B06A
.space 0x2 .space 0x2
gUnknown_203B06C: @ 203B06C gUnknown_203B06C: @ 203B06C
@@ -596,10 +596,10 @@ gUnknown_203B094: @ 203B094
gUnknown_203B098: @ 203B098 gUnknown_203B098: @ 203B098
.space 0x4 .space 0x4
gUnknown_203B09C: @ 203B09C sPartyMenuInternal: @ 203B09C
.space 0x4 .space 0x4
gUnknown_203B0A0: @ 203B0A0 gPartyMenu: @ 203B0A0
.space 0x9 .space 0x9
gUnknown_203B0A9: @ 203B0A9 gUnknown_203B0A9: @ 203B0A9
@@ -608,16 +608,16 @@ gUnknown_203B0A9: @ 203B0A9
gUnknown_203B0AE: @ 203B0AE gUnknown_203B0AE: @ 203B0AE
.space 0x6 .space 0x6
gUnknown_203B0B4: @ 203B0B4 sPartyMenuBoxes: @ 203B0B4
.space 0x4 .space 0x4
gUnknown_203B0B8: @ 203B0B8 sPartyBgGfxTilemap: @ 203B0B8
.space 0x4 .space 0x4
gUnknown_203B0BC: @ 203B0BC sPartyBgTilemapBuffer: @ 203B0BC
.space 0x4 .space 0x4
gUnknown_203B0C0: @ 203B0C0 gPartyMenuUseExitCallback: @ 203B0C0
.space 0x1 .space 0x1
gUnknown_203B0C1: @ 203B0C1 gUnknown_203B0C1: @ 203B0C1
@@ -626,10 +626,10 @@ gUnknown_203B0C1: @ 203B0C1
gPostMenuFieldCallback: @ 203B0C4 gPostMenuFieldCallback: @ 203B0C4
.space 0x4 .space 0x4
gUnknown_203B0C8: @ 203B0C8 sSlot1TilemapBuffer: @ 203B0C8
.space 0x4 .space 0x4
gUnknown_203B0CC: @ 203B0CC sSlot2TilemapBuffer: @ 203B0CC
.space 0x4 .space 0x4
gUnknown_203B0D0: @ 203B0D0 gUnknown_203B0D0: @ 203B0D0
@@ -638,10 +638,10 @@ gUnknown_203B0D0: @ 203B0D0
gSelectedOrderFromParty: @ 203B0D4 gSelectedOrderFromParty: @ 203B0D4
.space 0x4 .space 0x4
gUnknown_203B0D8: @ 203B0D8 sPartyMenuItemId: @ 203B0D8
.space 0x4 .space 0x4
gUnknown_203B0DC: @ 203B0DC gBattlePartyCurrentOrder: @ 203B0DC
.space 0x4 .space 0x4
gUnknown_203B0E0: @ 203B0E0 gUnknown_203B0E0: @ 203B0E0