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

fix merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-26 13:55:24 -07:00
parent d1142b4290 19ecb1631b
commit 31d8bfb048
222 changed files with 17265 additions and 27793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -33,4 +33,4 @@ Other disassembly and/or decompilation projects:
## Contacts
You can find us on [Discord](https://discord.gg/6EuWgX9) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret).
You can find us on [Discord](https://discord.gg/d5dubZ3) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret).
asm/battle_message.s
-3043
View File
File diff suppressed because it is too large Load Diff
asm/berry_crush_3.s
+14 -14
View File
@@ -875,7 +875,7 @@ _0814DCD6:
asrs r0, 24
strh r0, [r2, 0x24]
ldr r2, [r3]
ldr r3, _0814DD38 @ =gUnknown_846F2D1
ldr r3, _0814DD38 @ =gUnknown_846F2D0 + 1
adds r1, r3
movs r0, 0
ldrsb r0, [r1, r0]
@@ -898,7 +898,7 @@ _0814DD2A:
ldrb r1, [r2]
b _0814DE18
.align 2, 0
_0814DD38: .4byte gUnknown_846F2D1
_0814DD38: .4byte gUnknown_846F2D0 + 1
_0814DD3C:
ldrh r0, [r6, 0x28]
movs r1, 0x3
@@ -944,7 +944,7 @@ _0814DD64:
adds r0, 0x78
strh r0, [r2, 0x20]
ldr r2, [r7]
ldr r0, _0814DDD8 @ =gUnknown_846F2D7
ldr r0, _0814DDD8 @ =gUnknown_846F2D6 + 1
adds r1, r0
movs r6, 0
ldrsb r6, [r1, r6]
@@ -975,7 +975,7 @@ _0814DD64:
.align 2, 0
_0814DDD0: .4byte sub_814F0D8
_0814DDD4: .4byte gUnknown_846F2D6
_0814DDD8: .4byte gUnknown_846F2D7
_0814DDD8: .4byte gUnknown_846F2D6 + 1
_0814DDDC:
ldr r0, [r7]
movs r1, 0
@@ -1161,7 +1161,7 @@ _0814DF22:
lsrs r2, r0, 24
cmp r2, 0x7
bls _0814DF0C
ldr r1, _0814DF40 @ =0x000f4240
ldr r1, _0814DF40 @ =1000000
adds r0, r7, 0
bl __udivsi3
strh r0, [r6, 0x8]
@@ -1170,7 +1170,7 @@ _0814DF22:
bx r0
.align 2, 0
_0814DF3C: .4byte gUnknown_846E450
_0814DF40: .4byte 0x000f4240
_0814DF40: .4byte 1000000
thumb_func_end sub_814DEC0
thumb_func_start sub_814DF44
@@ -1468,7 +1468,7 @@ _0814E178:
cmp r2, 0x3
bls _0814E160
adds r0, r3, 0
ldr r1, _0814E1EC @ =0x000f4240
ldr r1, _0814E1EC @ =1000000
bl __udivsi3
lsls r0, 24
lsrs r7, r0, 24
@@ -1514,7 +1514,7 @@ _0814E178:
.align 2, 0
_0814E1E4: .4byte gStringVar1
_0814E1E8: .4byte gUnknown_846E450
_0814E1EC: .4byte 0x000f4240
_0814E1EC: .4byte 1000000
_0814E1F0: .4byte gStringVar2
_0814E1F4: .4byte gUnknown_846F4B8
_0814E1F8: .4byte gStringVar4
@@ -1882,7 +1882,7 @@ _0814E4EA:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, _0814E570 @ =gStringVar2
ldr r1, _0814E590 @ =0x000f4240
ldr r1, _0814E590 @ =1000000
ldr r0, [sp, 0xC]
bl __udivsi3
adds r1, r0, 0
@@ -1934,7 +1934,7 @@ _0814E580: .4byte gUnknown_841D074
_0814E584: .4byte gUnknown_841D058
_0814E588: .4byte gUnknown_841D098
_0814E58C: .4byte gUnknown_846E450
_0814E590: .4byte 0x000f4240
_0814E590: .4byte 1000000
_0814E594: .4byte gUnknown_841D090
_0814E598: .4byte gUnknown_846E3EB
_0814E59C:
@@ -2052,7 +2052,7 @@ _0814E680:
bl sub_814EB04
ldrh r0, [r4, 0x12]
lsls r0, 3
ldr r2, _0814E6A8 @ =gUnknown_846E3D0
ldr r2, _0814E6A8 @ =gUnknown_846E3CC + 4
mov r1, sp
adds r0, r2
ldm r0!, {r2,r3}
@@ -2064,7 +2064,7 @@ _0814E680:
adds r0, 0x4
b _0814E6B2
.align 2, 0
_0814E6A8: .4byte gUnknown_846E3D0
_0814E6A8: .4byte gUnknown_846E3CC + 4
_0814E6AC: .4byte gUnknown_846E448
_0814E6B0:
ldr r0, _0814E6C8 @ =gUnknown_846E448
@@ -2424,7 +2424,7 @@ _0814E96E:
movs r3, 0x3
bl ConvertIntToDecimalStringN
mov r0, r10
ldr r1, _0814EA1C @ =0x000f4240
ldr r1, _0814EA1C @ =1000000
bl __udivsi3
adds r1, r0, 0
ldr r0, _0814EA20 @ =gStringVar2
@@ -2482,7 +2482,7 @@ _0814EA0C: .4byte gStringVar1
_0814EA10: .4byte gUnknown_841D13C
_0814EA14: .4byte gUnknown_846E3DC
_0814EA18: .4byte gUnknown_846E450
_0814EA1C: .4byte 0x000f4240
_0814EA1C: .4byte 1000000
_0814EA20: .4byte gStringVar2
_0814EA24: .4byte gUnknown_841D090
_0814EA28: .4byte gUnknown_841D098
asm/field_control_avatar.s
+1 -1
View File
@@ -2572,7 +2572,7 @@ _0806DC78:
bl sub_805550C
ldrb r0, [r4, 0x7]
ldrb r1, [r4, 0x6]
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4]
ldrb r0, [r4, 0x5]
ldr r1, [r1, 0x8]
asm/field_effect.s
+5 -5
View File
@@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
ldrsh r6, [r4, r0]
cmp r6, 0
bne _08084350
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08084376
@@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
sub_8084564: @ 8084564
push {r4,lr}
adds r4, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08084578
@@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _080852B4
@@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
sub_8085A54: @ 8085A54
push {r4,lr}
adds r4, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08085A78
@@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
sub_8085E0C: @ 8085E0C
push {r4-r6,lr}
adds r6, r0, 0
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _08085E82
asm/field_map_obj.s
+2 -2
View File
@@ -376,7 +376,7 @@ sub_805E080: @ 805E080
str r0, [sp, 0x8]
adds r0, r6, 0
adds r1, r7, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r1, [r0, 0x4]
lsls r0, r4, 1
adds r0, r4
@@ -4294,7 +4294,7 @@ _0805FD90: .4byte gMapHeader
_0805FD94:
adds r0, r2, 0
adds r1, r3, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldr r0, [r0, 0x4]
ldr r1, [r0, 0x4]
_0805FDA0:
asm/field_weather.s
+3 -3
View File
@@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
_0807AA6C: .4byte 0x000006cb
thumb_func_end FieldWeather_StartFadingOutCreditsMap
thumb_func_start field_weather_is_fade_finished
field_weather_is_fade_finished: @ 807AA70
thumb_func_start IsWeatherNotFadingIn
IsWeatherNotFadingIn: @ 807AA70
ldr r0, _0807AA84 @ =gUnknown_2037F34
ldr r1, _0807AA88 @ =0x000006c6
adds r0, r1
@@ -1904,7 +1904,7 @@ field_weather_is_fade_finished: @ 807AA70
.align 2, 0
_0807AA84: .4byte gUnknown_2037F34
_0807AA88: .4byte 0x000006c6
thumb_func_end field_weather_is_fade_finished
thumb_func_end IsWeatherNotFadingIn
thumb_func_start sub_807AA8C
sub_807AA8C: @ 807AA8C
asm/fldeff_cut.s
+3 -3
View File
@@ -24,8 +24,8 @@ sub_8097874: @ 8097874
bx r1
thumb_func_end sub_8097874
thumb_func_start sub_8097898
sub_8097898: @ 8097898
thumb_func_start SetUpFieldMove_Cut
SetUpFieldMove_Cut: @ 8097898
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -138,7 +138,7 @@ _08097970:
.align 2, 0
_0809797C: .4byte gPlayerFacingPosition
_08097980: .4byte 0x0000ffff
thumb_func_end sub_8097898
thumb_func_end SetUpFieldMove_Cut
thumb_func_start sub_8097984
sub_8097984: @ 8097984
asm/fldeff_flash.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80C9B2C
sub_80C9B2C: @ 80C9B2C
thumb_func_start SetUpFieldMove_Flash
SetUpFieldMove_Flash: @ 80C9B2C
push {lr}
ldr r0, _080C9B54 @ =gMapHeader
ldrb r0, [r0, 0x15]
@@ -37,7 +37,7 @@ _080C9B6C:
_080C9B6E:
pop {r1}
bx r1
thumb_func_end sub_80C9B2C
thumb_func_end SetUpFieldMove_Flash
thumb_func_start sub_80C9B74
sub_80C9B74: @ 80C9B74
asm/item_menu.s
+24 -24
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8107DB4
sub_8107DB4: @ 8107DB4
thumb_func_start GoToBagMenu
GoToBagMenu: @ 8107DB4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -136,19 +136,19 @@ _08107EA8: .4byte gSpecialVar_ItemId
_08107EAC: .4byte sub_8107F10
_08107EB0: .4byte gUnknown_203AD10
_08107EB4: .4byte gUnknown_203ACFC
thumb_func_end sub_8107DB4
thumb_func_end GoToBagMenu
thumb_func_start CB2_BagMenuFromStartMenu
CB2_BagMenuFromStartMenu: @ 8107EB8
push {lr}
ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
ldr r2, _08107EC8 @ =CB2_ReturnToFieldWithOpenMenu
movs r0, 0
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
_08107EC8: .4byte CB2_ReturnToStartMenu
_08107EC8: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end CB2_BagMenuFromStartMenu
thumb_func_start sub_8107ECC
@@ -157,7 +157,7 @@ sub_8107ECC: @ 8107ECC
ldr r2, _08107EDC @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x5
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@@ -1934,15 +1934,15 @@ _08108CE8: .4byte 0x0000fff0
_08108CEC: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CB4
thumb_func_start sub_8108CF0
sub_8108CF0: @ 8108CF0
thumb_func_start CB2_SetUpReshowBattleScreenAfterMenu
CB2_SetUpReshowBattleScreenAfterMenu: @ 8108CF0
ldr r1, _08108CF8 @ =gUnknown_203ACFC
movs r0, 0
strb r0, [r1, 0x5]
bx lr
.align 2, 0
_08108CF8: .4byte gUnknown_203ACFC
thumb_func_end sub_8108CF0
thumb_func_end CB2_SetUpReshowBattleScreenAfterMenu
thumb_func_start sub_8108CFC
sub_8108CFC: @ 8108CFC
@@ -2514,7 +2514,7 @@ sub_8109140: @ 8109140
movs r1, 0
movs r2, 0xE
movs r3, 0x1E
bl SetBgRectPal
bl SetBgTilemapPalette
movs r0, 0x1
bl ScheduleBgCopyTilemapToVram
add sp, 0x8
@@ -4399,7 +4399,7 @@ _0810A120:
_0810A13E:
ldr r0, _0810A154 @ =gUnknown_203AD10
ldr r1, [r0]
ldr r0, _0810A158 @ =sub_8126EDC
ldr r0, _0810A158 @ =CB2_ChooseMonToGiveItem
str r0, [r1]
mov r0, r8
subs r0, 0x8
@@ -4409,7 +4409,7 @@ _0810A13E:
b _0810A166
.align 2, 0
_0810A154: .4byte gUnknown_203AD10
_0810A158: .4byte sub_8126EDC
_0810A158: .4byte CB2_ChooseMonToGiveItem
_0810A15C: .4byte ItemMenu_StartFadeToExitCallback
_0810A160:
adds r0, r7, 0
@@ -4786,7 +4786,7 @@ _0810A458: .4byte sub_810A45C
thumb_func_start sub_810A45C
sub_810A45C: @ 810A45C
push {lr}
bl sub_8123730
bl CB2_SelectBagItemToGive
pop {r0}
bx r0
thumb_func_end sub_810A45C
@@ -4918,7 +4918,7 @@ sub_810A554: @ 810A554
ldr r2, _0810A564 @ =sub_808CE60
movs r0, 0x4
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@@ -5063,7 +5063,7 @@ sub_810A67C: @ 810A67C
ldr r2, _0810A68C @ =CB2_ReturnToField
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@@ -6127,7 +6127,7 @@ sub_810AF74: @ 810AF74
ldr r2, _0810AF98 @ =SetCB2ToReshowScreenAfterMenu2
movs r0, 0x6
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
pop {r0}
bx r0
.align 2, 0
@@ -6358,7 +6358,7 @@ _0810B16C:
movs r0, 0x8
_0810B170:
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
pop {r4}
pop {r0}
bx r0
@@ -6856,10 +6856,10 @@ _0810B564:
movs r2, 0
bl DestroyListMenuTask
bl sub_810AECC
ldr r1, _0810B5B0 @ =gUnknown_3005E98
ldr r0, _0810B5B4 @ =ItemUseCB_Medicine
ldr r1, _0810B5B0 @ =gItemUseCB
ldr r0, _0810B5B4 @ =ItemUseCB_MedicineStep
str r0, [r1]
ldr r0, _0810B5B8 @ =sub_81279A4
ldr r0, _0810B5B8 @ =ChooseMonForInBattleItem
bl ItemMenu_SetExitCallback
mov r0, r9
subs r0, 0x8
@@ -6868,9 +6868,9 @@ _0810B564:
str r1, [r0]
b _0810B5C6
.align 2, 0
_0810B5B0: .4byte gUnknown_3005E98
_0810B5B4: .4byte ItemUseCB_Medicine
_0810B5B8: .4byte sub_81279A4
_0810B5B0: .4byte gItemUseCB
_0810B5B4: .4byte ItemUseCB_MedicineStep
_0810B5B8: .4byte ChooseMonForInBattleItem
_0810B5BC: .4byte sub_810B070
_0810B5C0:
ldrh r0, [r5, 0x10]
asm/link_rfu.s
+4 -4
View File
@@ -3172,8 +3172,8 @@ _080FEBA6:
bx r0
thumb_func_end sub_80FEB3C
thumb_func_start sub_80FEBAC
sub_80FEBAC: @ 80FEBAC
thumb_func_start DoEasyChatScreen
DoEasyChatScreen: @ 80FEBAC
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3214,7 +3214,7 @@ sub_80FEBAC: @ 80FEBAC
_080FEC00: .4byte sub_80FEC54
_080FEC04: .4byte gTasks
_080FEC08: .4byte sub_80FEC0C
thumb_func_end sub_80FEBAC
thumb_func_end DoEasyChatScreen
thumb_func_start sub_80FEC0C
sub_80FEC0C: @ 80FEC0C
@@ -3588,7 +3588,7 @@ _080FEF08:
ldr r0, _080FEF24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
ldr r2, _080FEF28 @ =sub_80568C4
bl sub_80FEBAC
bl DoEasyChatScreen
_080FEF12:
pop {r0}
bx r0
asm/link_rfu_2.s
+2 -2
View File
@@ -2308,7 +2308,7 @@ sub_80F9828: @ 80F9828
cmp r0, 0
beq _080F983E
ldr r0, _080F984C @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
ldr r1, _080F9850 @ =0x000005c1
ldr r1, _080F9850 @ =0x000005c1 // 1473
ldr r2, _080F9854 @ =gUnknown_843EDC4 "Rfu.RfuFunc == NULL"
movs r3, 0x1
bl AGBAssert
@@ -3137,7 +3137,7 @@ Rfu_InitBlockSend: @ 80F9E60
cmp r6, 0xFC
bls _080F9E7C
ldr r0, _080F9EA8 @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
ldr r1, _080F9EAC @ =0x00000701
ldr r1, _080F9EAC @ =0x00000701 // 1793
ldr r2, _080F9EB0 @ =gUnknown_843EDD8 "size<=252"
movs r3, 0x1
bl AGBAssert
asm/link_rfu_3.s
+7 -7
View File
@@ -3650,7 +3650,7 @@ _08117784:
ldr r0, _0811779C @ =sub_811C1C8
str r0, [r1, 0x8]
movs r0, 0x2
bl sub_81274A8
bl InitChooseHalfPartyForBattle
b _081178E0
.align 2, 0
_08117798: .4byte gMain
@@ -5602,12 +5602,12 @@ _0811887C:
_081188C4: .4byte gUnknown_203B06C
_081188C8: .4byte gSpecialVar_Result
_081188CC:
bl sub_811FB18
bl GetPartyMenuType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x8
beq _081188E4
bl sub_811FB18
bl GetPartyMenuType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x9
@@ -7335,7 +7335,7 @@ _081197CA:
adds r0, r1
ldr r0, [r0]
str r0, [r2]
ldr r2, _0811982C @ =gUnknown_203B06A
ldr r2, _0811982C @ =gUnionRoomRequestedMonType
ldr r1, [r6]
movs r3, 0x2
ldrsh r0, [r7, r3]
@@ -7344,7 +7344,7 @@ _081197CA:
ldrb r0, [r1, 0x9]
lsrs r0, 2
strb r0, [r2]
ldr r2, _08119830 @ =gUnknown_203B068
ldr r2, _08119830 @ =gUnionRoomOfferedSpecies
ldr r1, [r6]
movs r3, 0x2
ldrsh r0, [r7, r3]
@@ -7369,8 +7369,8 @@ _081197CA:
_08119820: .4byte gUnknown_8458D1C
_08119824: .4byte gUnknown_203B06C
_08119828: .4byte gUnknown_203B064
_0811982C: .4byte gUnknown_203B06A
_08119830: .4byte gUnknown_203B068
_0811982C: .4byte gUnionRoomRequestedMonType
_08119830: .4byte gUnionRoomOfferedSpecies
_08119834: .4byte gFieldCallback
_08119838: .4byte sub_807DCE4
_0811983C: .4byte CB2_ReturnToField
asm/naming_screen.s
+14 -14
View File
@@ -3623,7 +3623,7 @@ sub_809F5C4: @ 809F5C4
push {r4,r5,lr}
sub sp, 0x10
movs r4, 0
ldr r1, _0809F61C @ =gUnknown_841621F
ldr r1, _0809F61C @ =gText_MaleSymbol
add r0, sp, 0xC
bl StringCopy
ldr r5, _0809F620 @ =gUnknown_203998C
@@ -3635,7 +3635,7 @@ sub_809F5C4: @ 809F5C4
beq _0809F614
cmp r0, 0xFE
bne _0809F5EE
ldr r1, _0809F628 @ =gUnknown_8416221
ldr r1, _0809F628 @ =gText_FemaleSymbol
add r0, sp, 0xC
bl StringCopy
movs r4, 0x1
@@ -3664,10 +3664,10 @@ _0809F614:
pop {r0}
bx r0
.align 2, 0
_0809F61C: .4byte gUnknown_841621F
_0809F61C: .4byte gText_MaleSymbol
_0809F620: .4byte gUnknown_203998C
_0809F624: .4byte 0x00001e36
_0809F628: .4byte gUnknown_8416221
_0809F628: .4byte gText_FemaleSymbol
_0809F62C: .4byte 0x00001e13
_0809F630: .4byte gUnknown_83E2428
thumb_func_end sub_809F5C4
@@ -4490,7 +4490,7 @@ sub_809FC90: @ 809FC90
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FCB4 @ =CB2_ReturnToStartMenu
ldr r0, _0809FCB4 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0
movs r3, 0
@@ -4500,7 +4500,7 @@ sub_809FC90: @ 809FC90
bx r0
.align 2, 0
_0809FCB0: .4byte gSaveBlock2Ptr
_0809FCB4: .4byte CB2_ReturnToStartMenu
_0809FCB4: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FC90
thumb_func_start sub_809FCB8
@@ -4512,7 +4512,7 @@ sub_809FCB8: @ 809FCB8
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FCDC @ =CB2_ReturnToStartMenu
ldr r0, _0809FCDC @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x1
movs r3, 0
@@ -4522,7 +4522,7 @@ sub_809FCB8: @ 809FCB8
bx r0
.align 2, 0
_0809FCD8: .4byte gSaveBlock2Ptr
_0809FCDC: .4byte CB2_ReturnToStartMenu
_0809FCDC: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FCB8
thumb_func_start sub_809FCE0
@@ -4534,7 +4534,7 @@ sub_809FCE0: @ 809FCE0
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD04 @ =CB2_ReturnToStartMenu
ldr r0, _0809FD04 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x2
movs r3, 0
@@ -4544,7 +4544,7 @@ sub_809FCE0: @ 809FCE0
bx r0
.align 2, 0
_0809FD00: .4byte gSaveBlock2Ptr
_0809FD04: .4byte CB2_ReturnToStartMenu
_0809FD04: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FCE0
thumb_func_start sub_809FD08
@@ -4556,7 +4556,7 @@ sub_809FD08: @ 809FD08
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD2C @ =CB2_ReturnToStartMenu
ldr r0, _0809FD2C @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x3
movs r3, 0
@@ -4566,7 +4566,7 @@ sub_809FD08: @ 809FD08
bx r0
.align 2, 0
_0809FD28: .4byte gSaveBlock2Ptr
_0809FD2C: .4byte CB2_ReturnToStartMenu
_0809FD2C: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FD08
thumb_func_start sub_809FD30
@@ -4578,7 +4578,7 @@ sub_809FD30: @ 809FD30
ldrb r2, [r1, 0x8]
movs r0, 0
str r0, [sp]
ldr r0, _0809FD54 @ =CB2_ReturnToStartMenu
ldr r0, _0809FD54 @ =CB2_ReturnToFieldWithOpenMenu
str r0, [sp, 0x4]
movs r0, 0x4
movs r3, 0
@@ -4588,7 +4588,7 @@ sub_809FD30: @ 809FD30
bx r0
.align 2, 0
_0809FD50: .4byte gSaveBlock2Ptr
_0809FD54: .4byte CB2_ReturnToStartMenu
_0809FD54: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_809FD30
.align 2, 0 @ Don't pad with nop.
asm/overworld.s
+16 -16
View File
@@ -473,7 +473,7 @@ _08054F8A:
str r2, [sp, 0x4]
adds r0, r2, 0
adds r1, r5, 0
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
mov r6, r10
ldr r1, [r6]
mov r2, r8
@@ -821,8 +821,8 @@ _08055232:
bx r1
thumb_func_end warp_data_is_not_neg_1
thumb_func_start get_mapheader_by_bank_and_number
get_mapheader_by_bank_and_number: @ 8055238
thumb_func_start Overworld_GetMapHeaderByGroupAndId
Overworld_GetMapHeaderByGroupAndId: @ 8055238
lsls r0, 16
lsls r1, 16
ldr r2, _0805524C @ =gMapGroups
@@ -835,7 +835,7 @@ get_mapheader_by_bank_and_number: @ 8055238
bx lr
.align 2, 0
_0805524C: .4byte gMapGroups
thumb_func_end get_mapheader_by_bank_and_number
thumb_func_end Overworld_GetMapHeaderByGroupAndId
thumb_func_start warp1_get_mapheader
warp1_get_mapheader: @ 8055250
@@ -850,7 +850,7 @@ warp1_get_mapheader: @ 8055250
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
pop {r1}
bx r1
.align 2, 0
@@ -872,7 +872,7 @@ set_current_map_header_from_sav1_save_old_name: @ 8055274
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0
ldm r0!, {r2,r3,r6}
stm r1!, {r2,r3,r6}
@@ -908,7 +908,7 @@ set_current_map_header_from_sav1: @ 80552BC
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r1, r4, 0
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
@@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrh r0, [r0, 0x10]
pop {r1}
bx r1
@@ -2863,7 +2863,7 @@ get_map_light_level_by_bank_and_number: @ 8056158
lsls r1, 24
asrs r1, 8
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x17]
pop {r1}
bx r1
@@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -3014,7 +3014,7 @@ sav1_saved_warp2_map_get_name: @ 8056238
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -3036,7 +3036,7 @@ GetCurrentRegionMapSectionId: @ 8056260
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -3058,7 +3058,7 @@ sav1_map_get_battletype: @ 8056288
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x1B]
pop {r1}
bx r1
@@ -3754,8 +3754,8 @@ _080568A0: .4byte gFieldCallback
_080568A4: .4byte sub_807DDD0
thumb_func_end c2_8056854
thumb_func_start CB2_ReturnToStartMenu
CB2_ReturnToStartMenu: @ 80568A8
thumb_func_start CB2_ReturnToFieldWithOpenMenu
CB2_ReturnToFieldWithOpenMenu: @ 80568A8
push {lr}
bl sub_80569BC
ldr r1, _080568BC @ =gFieldCallback2
@@ -3767,7 +3767,7 @@ CB2_ReturnToStartMenu: @ 80568A8
.align 2, 0
_080568BC: .4byte gFieldCallback2
_080568C0: .4byte FieldCB2_ReturnToStartMenuInit
thumb_func_end CB2_ReturnToStartMenu
thumb_func_end CB2_ReturnToFieldWithOpenMenu
thumb_func_start sub_80568C4
sub_80568C4: @ 80568C4
asm/party_menu.s
-19390
View File
File diff suppressed because it is too large Load Diff
asm/pokedex_screen.s
+2 -2
View File
@@ -428,13 +428,13 @@ sub_8102858: @ 8102858
lsls r1, 7
movs r0, 0
bl SetGpuRegBits
ldr r0, _08102878 @ =CB2_ReturnToStartMenu
ldr r0, _08102878 @ =CB2_ReturnToFieldWithOpenMenu
bl SetMainCallback2
_08102874:
pop {r0}
bx r0
.align 2, 0
_08102878: .4byte CB2_ReturnToStartMenu
_08102878: .4byte CB2_ReturnToFieldWithOpenMenu
thumb_func_end sub_8102858
thumb_func_start sub_810287C
asm/pokemon_jump_2.s
+4 -4
View File
@@ -4230,8 +4230,8 @@ sub_81499E0: @ 81499E0
_081499FC: .4byte gUnknown_203F3D4
thumb_func_end sub_81499E0
thumb_func_start sub_8149A00
sub_8149A00: @ 8149A00
thumb_func_start IsSpeciesAllowedInPokemonJump
IsSpeciesAllowedInPokemonJump: @ 8149A00
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -4242,7 +4242,7 @@ sub_8149A00: @ 8149A00
lsrs r0, 31
pop {r1}
bx r1
thumb_func_end sub_8149A00
thumb_func_end IsSpeciesAllowedInPokemonJump
thumb_func_start sub_8149A18
sub_8149A18: @ 8149A18
@@ -4264,7 +4264,7 @@ _08149A1C:
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8149A00
bl IsSpeciesAllowedInPokemonJump
cmp r0, 0
beq _08149A54
ldr r1, _08149A50 @ =gSpecialVar_Result
asm/pokemon_special_anim.s
+4 -4
View File
@@ -558,7 +558,7 @@ _0811C9AA:
adds r0, r4, 0
adds r0, 0x96
ldrh r0, [r0]
bl GetItemCompatibilityRule
bl CheckIfItemIsTMHMOrEvolutionStone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1508,8 +1508,8 @@ sub_811D120: @ 811D120
bx r1
thumb_func_end sub_811D120
thumb_func_start GetMonLevelUpWindowStats
GetMonLevelUpWindowStats: @ 811D130
thumb_func_start BufferMonStatsToTaskData
BufferMonStatsToTaskData: @ 811D130
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1539,7 +1539,7 @@ GetMonLevelUpWindowStats: @ 811D130
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end GetMonLevelUpWindowStats
thumb_func_end BufferMonStatsToTaskData
thumb_func_start sub_811D178
sub_811D178: @ 811D178
asm/pokemon_storage_system.s
+3 -3
View File
@@ -1455,7 +1455,7 @@ _0808C3E0:
.align 2, 0
_0808C444: .4byte gUnknown_83CDA20
_0808C448:
bl field_weather_is_fade_finished
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
bne _0808C454
@@ -6591,7 +6591,7 @@ _0808EEE8:
ldr r2, _0808EF08 @ =sub_808CE60
movs r0, 0x4
movs r1, 0
bl sub_8107DB4
bl GoToBagMenu
_0808EEF6:
adds r0, r7, 0
bl DestroyTask
@@ -15947,7 +15947,7 @@ sub_80937B4: @ 80937B4
_080937C4: .4byte gUnknown_2039822
_080937C8:
ldr r4, _080937D8 @ =gUnknown_2039821
bl sub_8138B20
bl GetLastViewedMonIndex
strb r0, [r4]
_080937D0:
pop {r4}
asm/pokemon_summary_screen.s
+39 -39
View File
@@ -42,7 +42,7 @@ _0813453C: .4byte gUnknown_203B140
_08134540: .4byte 0x00003308
_08134544: .4byte gUnknown_203B144
_08134548:
ldr r0, _08134574 @ =gUnknown_203B16C
ldr r0, _08134574 @ =gLastViewedMonIndex
strb r6, [r0]
ldr r0, _08134578 @ =gUnknown_203B16D
movs r1, 0
@@ -64,7 +64,7 @@ _08134548:
movs r0, 0x1
b _08134596
.align 2, 0
_08134574: .4byte gUnknown_203B16C
_08134574: .4byte gLastViewedMonIndex
_08134578: .4byte gUnknown_203B16D
_0813457C: .4byte gUnknown_203B16E
_08134580: .4byte 0x000032f8
@@ -3448,7 +3448,7 @@ _08136168:
ldr r0, [r6]
ldr r3, _08136208 @ =0x00003084
adds r0, r3
ldr r1, _0813620C @ =gUnknown_8416221
ldr r1, _0813620C @ =gText_FemaleSymbol
bl StringCopy
b _08136238
.align 2, 0
@@ -3459,19 +3459,19 @@ _081361FC: .4byte 0x00003220
_08136200: .4byte 0x00003221
_08136204: .4byte 0x00003034
_08136208: .4byte 0x00003084
_0813620C: .4byte gUnknown_8416221
_0813620C: .4byte gText_FemaleSymbol
_08136210:
cmp r7, 0
bne _0813622C
ldr r0, [r6]
ldr r1, _08136224 @ =0x00003084
adds r0, r1
ldr r1, _08136228 @ =gUnknown_841621F
ldr r1, _08136228 @ =gText_MaleSymbol
bl StringCopy
b _08136238
.align 2, 0
_08136224: .4byte 0x00003084
_08136228: .4byte gUnknown_841621F
_08136228: .4byte gText_MaleSymbol
_0813622C:
ldr r0, [r6]
ldr r2, _08136308 @ =0x00003084
@@ -3622,7 +3622,7 @@ sub_8136350: @ 8136350
bl ConvertIntToDecimalStringN
ldr r0, [r6]
adds r0, r4
ldr r1, _08136504 @ =gUnknown_841620C
ldr r1, _08136504 @ =gText_Slash
bl StringAppend
ldr r0, [r6]
adds r0, r7
@@ -3794,7 +3794,7 @@ _081363E6:
_081364F8: .4byte gUnknown_203B140
_081364FC: .4byte 0x00003290
_08136500: .4byte 0x00003090
_08136504: .4byte gUnknown_841620C
_08136504: .4byte gText_Slash
_08136508: .4byte gUnknown_203B144
_0813650C: .4byte 0x000032f8
_08136510: .4byte sub_804CF14
@@ -5618,7 +5618,7 @@ _081373EA:
str r6, [sp]
mov r7, r9
str r7, [sp, 0x4]
ldr r1, _081374E0 @ =gUnknown_841620C
ldr r1, _081374E0 @ =gText_Slash
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0x3A
@@ -5663,7 +5663,7 @@ _081374D0: .4byte gUnknown_8416238
_081374D4: .4byte gUnknown_203B144
_081374D8: .4byte 0x000030b8
_081374DC: .4byte 0x00003258
_081374E0: .4byte gUnknown_841620C
_081374E0: .4byte gText_Slash
_081374E4: .4byte 0x000030f0
thumb_func_end sub_81372E4
@@ -6839,8 +6839,8 @@ _08137E82:
adds r0, r1
ldr r0, [r0]
bl SetMainCallback2
bl sub_8138B20
ldr r1, _08137EE0 @ =gUnknown_203B16C
bl GetLastViewedMonIndex
ldr r1, _08137EE0 @ =gLastViewedMonIndex
strb r0, [r1]
ldr r0, [r4]
cmp r0, 0
@@ -6864,7 +6864,7 @@ _08137ECC:
_08137ED4: .4byte gUnknown_203B140
_08137ED8: .4byte 0x00003214
_08137EDC: .4byte 0x000032f8
_08137EE0: .4byte gUnknown_203B16C
_08137EE0: .4byte gLastViewedMonIndex
_08137EE4: .4byte gUnknown_203B144
thumb_func_end sub_8137E64
@@ -8397,14 +8397,14 @@ _08138B18: .4byte 0x00003220
_08138B1C: .4byte 0x00003221
thumb_func_end sub_8138A38
thumb_func_start sub_8138B20
sub_8138B20: @ 8138B20
ldr r0, _08138B28 @ =gUnknown_203B16C
thumb_func_start GetLastViewedMonIndex
GetLastViewedMonIndex: @ 8138B20
ldr r0, _08138B28 @ =gLastViewedMonIndex
ldrb r0, [r0]
bx lr
.align 2, 0
_08138B28: .4byte gUnknown_203B16C
thumb_func_end sub_8138B20
_08138B28: .4byte gLastViewedMonIndex
thumb_func_end GetLastViewedMonIndex
thumb_func_start GetMoveSlotToReplace
GetMoveSlotToReplace: @ 8138B2C
@@ -8443,7 +8443,7 @@ sub_8138B4C: @ 8138B4C
ldrb r0, [r0]
cmp r0, 0x1
bne _08138B84
ldr r0, _08138B80 @ =gUnknown_203B16C
ldr r0, _08138B80 @ =gLastViewedMonIndex
ldrb r0, [r0]
cmp r0, 0x3
bhi _08138B76
@@ -8454,7 +8454,7 @@ _08138B76:
b _08138B86
.align 2, 0
_08138B7C: .4byte gReceivedRemoteLinkPlayers
_08138B80: .4byte gUnknown_203B16C
_08138B80: .4byte gLastViewedMonIndex
_08138B84:
movs r0, 0
_08138B86:
@@ -8476,7 +8476,7 @@ sub_8138B8C: @ 8138B8C
adds r2, 0xD8
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -8493,7 +8493,7 @@ _08138BC4:
ldr r2, _08138BE8 @ =0x000032f4
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -9148,7 +9148,7 @@ sub_81390B0: @ 81390B0
ldr r1, _081391DC @ =0x000032f4
adds r0, r1
ldr r6, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -9294,7 +9294,7 @@ sub_81391EC: @ 81391EC
ldr r1, _08139318 @ =0x000032f4
adds r0, r1
ldr r6, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -9442,7 +9442,7 @@ sub_8139328: @ 8139328
adds r2, 0xD8
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -9459,7 +9459,7 @@ _08139360:
ldr r2, _08139384 @ =0x000032f4
adds r0, r1, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -9489,7 +9489,7 @@ sub_8139388: @ 8139388
bl sub_8138BEC
lsls r0, 16
lsrs r0, 16
bl sub_8125A90
bl IsMoveHm
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -10269,7 +10269,7 @@ _081399DC: .4byte sub_804CF14
_081399E0: .4byte 0x00003024
_081399E4: .4byte 0x0000ffff
_081399E8:
ldr r0, _08139A1C @ =gUnknown_203B16C
ldr r0, _08139A1C @ =gLastViewedMonIndex
ldrb r1, [r0]
movs r0, 0x3
bl sub_804455C
@@ -10293,7 +10293,7 @@ _081399E8:
bl CreateMonPicSprite
b _08139A40
.align 2, 0
_08139A1C: .4byte gUnknown_203B16C
_08139A1C: .4byte gLastViewedMonIndex
_08139A20: .4byte 0x0000ffff
_08139A24:
movs r0, 0x3C
@@ -10787,7 +10787,7 @@ _08139E20:
.align 2, 0
_08139E28: .4byte SpriteCallbackDummy
_08139E2C:
ldr r0, _08139E48 @ =gUnknown_203B16C
ldr r0, _08139E48 @ =gLastViewedMonIndex
ldrb r1, [r0]
movs r0, 0x3
bl sub_804455C
@@ -10801,7 +10801,7 @@ _08139E2C:
str r4, [sp, 0x4]
b _08139E58
.align 2, 0
_08139E48: .4byte gUnknown_203B16C
_08139E48: .4byte gLastViewedMonIndex
_08139E4C: .4byte SpriteCallbackDummy
_08139E50:
ldr r1, _08139E98 @ =SpriteCallbackDummy
@@ -13221,7 +13221,7 @@ _0813B16C:
ldr r2, _0813B190 @ =0x000032f4
adds r0, r2
ldr r4, [r0]
bl sub_8138B20
bl GetLastViewedMonIndex
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -13268,7 +13268,7 @@ _0813B1CC:
negs r1, r1
cmp r0, r1
beq _0813B1F4
ldr r0, _0813B1FC @ =gUnknown_203B16C
ldr r0, _0813B1FC @ =gLastViewedMonIndex
strb r2, [r0]
ldr r0, _0813B200 @ =sub_813B3F0
movs r1, 0
@@ -13284,7 +13284,7 @@ _0813B1F4:
pop {r0}
bx r0
.align 2, 0
_0813B1FC: .4byte gUnknown_203B16C
_0813B1FC: .4byte gLastViewedMonIndex
_0813B200: .4byte sub_813B3F0
_0813B204: .4byte gUnknown_203B140
_0813B208: .4byte 0x0000328c
@@ -13311,7 +13311,7 @@ sub_813B20C: @ 813B20C
movs r1, 0x1
negs r1, r1
adds r5, r0, 0
ldr r6, _0813B264 @ =gUnknown_203B16C
ldr r6, _0813B264 @ =gLastViewedMonIndex
cmp r3, r1
bne _0813B23E
ldrb r0, [r6]
@@ -13336,7 +13336,7 @@ _0813B252:
_0813B258: .4byte gUnknown_203B140
_0813B25C: .4byte 0x000032f4
_0813B260: .4byte 0x00003214
_0813B264: .4byte gUnknown_203B16C
_0813B264: .4byte gLastViewedMonIndex
_0813B268: .4byte 0x00003210
_0813B26C:
lsls r5, r4, 24
@@ -13346,7 +13346,7 @@ _0813B26E:
asrs r1, r5, 24
adds r0, r1
lsls r0, 24
ldr r4, _0813B29C @ =gUnknown_203B16C
ldr r4, _0813B29C @ =gLastViewedMonIndex
lsrs r6, r0, 24
asrs r0, 24
ldrb r3, [r4]
@@ -13365,7 +13365,7 @@ _0813B294:
negs r0, r0
b _0813B2C0
.align 2, 0
_0813B29C: .4byte gUnknown_203B16C
_0813B29C: .4byte gLastViewedMonIndex
_0813B2A0: .4byte gUnknown_203B140
_0813B2A4: .4byte 0x00003210
_0813B2A8:
@@ -13514,7 +13514,7 @@ _0813B39E:
bhi _0813B3B6
ldr r4, _0813B3D4 @ =gUnknown_8463FB8
adds r4, r5, r4
bl sub_8138B20
bl GetLastViewedMonIndex
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
asm/region_map.s
+14 -14
View File
@@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -7477,7 +7477,7 @@ _080C3BAC:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r0, _080C3BEC @ =gUnknown_20399E4
ldr r1, [r0]
@@ -7506,7 +7506,7 @@ _080C3BF0:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r0, _080C3C28 @ =gUnknown_20399E4
ldr r1, [r0]
@@ -7543,7 +7543,7 @@ _080C3C2C:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
b _080C3C8E
.align 2, 0
@@ -7564,7 +7564,7 @@ _080C3C68:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
bl get_mapheader_by_bank_and_number
bl Overworld_GetMapHeaderByGroupAndId
adds r2, r0, 0
ldr r1, [r4]
ldrb r0, [r2, 0x14]
@@ -9761,8 +9761,8 @@ _080C4DF2:
bx r1
thumb_func_end GetMapName
thumb_func_start sub_80C4DF8
sub_80C4DF8: @ 80C4DF8
thumb_func_start GetMapNameGeneric
GetMapNameGeneric: @ 80C4DF8
push {lr}
lsls r1, 16
lsrs r1, 16
@@ -9770,14 +9770,14 @@ sub_80C4DF8: @ 80C4DF8
bl GetMapName
pop {r1}
bx r1
thumb_func_end sub_80C4DF8
thumb_func_end GetMapNameGeneric
thumb_func_start sub_80C4E08
sub_80C4E08: @ 80C4E08
push {lr}
lsls r1, 16
lsrs r1, 16
bl sub_80C4DF8
bl GetMapNameGeneric
pop {r1}
bx r1
thumb_func_end sub_80C4E08
@@ -9893,15 +9893,15 @@ _080C4EF2:
bx r0
thumb_func_end sub_80C4ED0
thumb_func_start sub_80C4EF8
sub_80C4EF8: @ 80C4EF8
thumb_func_start MCB2_FlyMap
MCB2_FlyMap: @ 80C4EF8
push {lr}
bl sub_80C51E8
movs r0, 0x2
bl sub_80BFEDC
pop {r0}
bx r0
thumb_func_end sub_80C4EF8
thumb_func_end MCB2_FlyMap
thumb_func_start sub_80C4F08
sub_80C4F08: @ 80C4F08
@@ -10283,7 +10283,7 @@ _080C5220:
_080C5250: .4byte gUnknown_20399FC
_080C5254: .4byte CB2_ReturnToField
_080C5258:
ldr r0, _080C5274 @ =sub_8124AB0
ldr r0, _080C5274 @ =CB2_ReturnToPartyMenuFromFlyMap
bl SetMainCallback2
_080C525E:
ldr r4, _080C5278 @ =gUnknown_20399FC
@@ -10298,7 +10298,7 @@ _080C526E:
pop {r0}
bx r0
.align 2, 0
_080C5274: .4byte sub_8124AB0
_080C5274: .4byte CB2_ReturnToPartyMenuFromFlyMap
_080C5278: .4byte gUnknown_20399FC
thumb_func_end sub_80C5208
asm/script_pokemon_util_80A0058.s
+2 -2
View File
@@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334
ldr r0, _080A034C @ =sub_80A0350
str r0, [r1, 0x8]
movs r0, 0
bl sub_81274A8
bl InitChooseHalfPartyForBattle
pop {r0}
bx r0
.align 2, 0
@@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380
ldr r0, _080A0398 @ =sub_80A039C
str r0, [r1, 0x8]
movs r0, 0x1
bl sub_81274A8
bl InitChooseHalfPartyForBattle
pop {r0}
bx r0
.align 2, 0
asm/script_pokemon_util_80BF8FC.s
+1 -1
View File
@@ -88,7 +88,7 @@ sub_80BF97C: @ 80BF97C
lsls r0, 3
adds r0, r1
ldrb r0, [r0, 0x8]
bl sub_81283A8
bl ChoosePartyMonByMenuType
adds r0, r4, 0
bl DestroyTask
_080BF9AC:
asm/union_room_chat.s
+2 -2
View File
@@ -5660,7 +5660,7 @@ sub_812AF8C: @ 812AF8C
push {r4,lr}
adds r4, r0, 0
lsls r4, 2
ldr r0, _0812AFB8 @ =gUnknown_845AC16
ldr r0, _0812AFB8 @ =gUnknown_845AC14 + 2
adds r4, r0
movs r0, 0
bl IndexOfSpritePaletteTag
@@ -5677,7 +5677,7 @@ sub_812AF8C: @ 812AF8C
pop {r0}
bx r0
.align 2, 0
_0812AFB8: .4byte gUnknown_845AC16
_0812AFB8: .4byte gUnknown_845AC14 + 2
_0812AFBC: .4byte 0x01010000
thumb_func_end sub_812AF8C
baserom.ips
BIN
View File
Binary file not shown.
common_syms/party_menu.txt
+1
View File
@@ -0,0 +1 @@
gItemUseCB
data/battle_message.s
-2923
View File
File diff suppressed because it is too large Load Diff
data/battle_scripts_1.s
+3 -3
View File
@@ -3167,7 +3167,7 @@ BattleScript_RainContinuesOrEndsEnd::
end2
BattleScript_DamagingWeatherContinues::
printfromtable gSandStormHailContinuesStringIds
printfromtable gSandstormHailContinuesStringIds
waitmessage 0x40
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0
@@ -3175,7 +3175,7 @@ BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd
printfromtable gSandStormHailDmgStringIds
printfromtable gSandstormHailDmgStringIds
waitmessage 0x40
orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
effectivenesssound
@@ -3193,7 +3193,7 @@ BattleScript_WeatherDamageEndedBattle::
end2
BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds
printfromtable gSandstormHailEndStringIds
waitmessage 0x40
end2
data/berry_crush.s
+294 -49
View File
@@ -2,119 +2,364 @@
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_846E2E0:: @ 846E2E0
.incbin "baserom.gba", 0x46E2E0, 0x8
.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
gUnknown_846E2E8:: @ 846E2E8
.incbin "baserom.gba", 0x46E2E8, 0x8
.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
gUnknown_846E2F0:: @ 846E2F0
.incbin "baserom.gba", 0x46E2F0, 0x24
.byte 0x04, 0x01, 0x00, 0xff
.byte 0x00, 0x00, 0x00, 0x04
.byte 0x02, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0x04, 0x02
.byte 0x00, 0xfe, 0x00, 0x00
.byte 0x00, 0x06, 0x03, 0x01
.byte 0xff, 0xfd, 0xff, 0x00
.byte 0x06, 0x04, 0x01, 0xfe
.byte 0xfc, 0xfe, 0x00, 0x00
gUnknown_846E314:: @ 846E314
.incbin "baserom.gba", 0x46E314, 0x14
.byte 0x03, 0x02, 0x01, 0x00
.byte 0x03, 0x03, 0x01, 0x00
.byte 0x03, 0x03, 0x02, 0x00
.byte 0x03, 0x04, 0x02, 0x00
.byte 0x03, 0x05, 0x03, 0x00
gUnknown_846E328:: @ 846E328
.incbin "baserom.gba", 0x46E328, 0x24
.4byte gUnknown_841CE3C
.4byte gUnknown_841CE78
.4byte gUnknown_841CEA8
.4byte gUnknown_841CF14
.4byte gUnknown_841CF50
.4byte gUnknown_841CF70
.4byte gUnknown_841CFA0
.4byte gUnknown_841CFD4
.4byte gUnknown_841D008
gUnknown_846E34C:: @ 846E34C
.incbin "baserom.gba", 0x46E34C, 0x68
.4byte NULL
.4byte sub_814BBB8
.4byte sub_814BC10
.4byte sub_814BC74
.4byte sub_814BD7C
.4byte sub_814BD9C
.4byte sub_814BDBC
.4byte sub_814BE0C
.4byte sub_814BE64
.4byte sub_814BE7C
.4byte sub_814BFD0
.4byte sub_814C118
.4byte sub_814C24C
.4byte sub_814C850
.4byte sub_814C8F8
.4byte sub_814C990
.4byte sub_814CB20
.4byte sub_814CC0C
.4byte sub_814CFA8
.4byte sub_814D094
.4byte sub_814D188
.4byte sub_814D240
.4byte sub_814D31C
.4byte sub_814D3A4
.4byte sub_814D468
.4byte sub_814D4C8
gUnknown_846E3B4:: @ 846E3B4
.incbin "baserom.gba", 0x46E3B4, 0x10
.byte 0x02, 0x04, 0x06, 0x07
.byte 0x03, 0x05, 0x08, 0x0b
.byte 0x03, 0x07, 0x0b, 0x0f
.byte 0x04, 0x08, 0x0c, 0x11
gUnknown_846E3C4:: @ 846E3C4
.incbin "baserom.gba", 0x46E3C4, 0x4
.byte 0x05, 0x07, 0x09, 0x0c
gUnknown_846E3C8:: @ 846E3C8
.incbin "baserom.gba", 0x46E3C8, 0x4
.byte 0x03, 0x07, 0x0f, 0x1f
gUnknown_846E3CC:: @ 846E3CC
.incbin "baserom.gba", 0x46E3CC, 0x4
gUnknown_846E3D0:: @ 846E3D0
.incbin "baserom.gba", 0x46E3D0, 0xC
.4byte 0x000000f8
@ {
@ .bg = 0,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 15,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000014d1
@ {
@ .bg = 1,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 13,
@ .screenSize = 2,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x000020c2
@ {
@ .bg = 2,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 12,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 2,
@ .baseTile = 0x0000
@ }
.4byte 0x000030b3
@ {
@ .bg = 3,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 11,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_846E3DC:: @ 846E3DC
.incbin "baserom.gba", 0x46E3DC, 0x3
.byte 0x01, 0x02, 0x03
gUnknown_846E3DF:: @ 846E3DF
.incbin "baserom.gba", 0x46E3DF, 0x3
.byte 0x00, 0x01, 0x02
gUnknown_846E3E2:: @ 846E3E2
.incbin "baserom.gba", 0x46E3E2, 0x3
.byte 0x00, 0x03, 0x04
gUnknown_846E3E5:: @ 846E3E5
.incbin "baserom.gba", 0x46E3E5, 0x6
.byte 0x01, 0x08, 0x09
.byte 0x01, 0x06, 0x07
gUnknown_846E3EB:: @ 846E3EB
.incbin "baserom.gba", 0x46E3EB, 0x5
.byte 0x01, 0x04, 0x05
.align 2
gUnknown_846E3F0:: @ 846E3F0
.incbin "baserom.gba", 0x46E3F0, 0x8
.byte 0, 3, 4, 24, 13, 15
.2byte 0x0001
gUnknown_846E3F8:: @ 846E3F8
.incbin "baserom.gba", 0x46E3F8, 0x50
.byte 0, 0, 0, 9, 2, 8
.2byte 0x03ed
.byte 0, 0, 3, 9, 2, 8
.2byte 0x03db
.byte 0, 0, 6, 9, 2, 8
.2byte 0x03c9
.byte 0, 21, 3, 9, 2, 8
.2byte 0x03b7
.byte 0, 21, 6, 9, 2, 8
.2byte 0x03a5
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
.byte 0, 4, 2, 22, 16, 15
.2byte 0x0001
.byte 0, 4, 2, 22, 16, 15
.2byte 0x0001
.byte 0, 3, 2, 24, 16, 15
.2byte 0x0001
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_846E448:: @ 846E448
.incbin "baserom.gba", 0x46E448, 0x8
.byte 0x06, 0x08, 0x09, 0x0b
.byte 0x0c, 0x0e, 0x0f, 0x10
gUnknown_846E450:: @ 846E450
.incbin "baserom.gba", 0x46E450, 0x940
.4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625
gUnknown_846ED90:: @ 846ED90
.incbin "baserom.gba", 0x46ED90, 0x130
gUnknown_846E470:: @ 846E470 gbapal
.incbin "graphics/link_games/unk_846E4D0.gbapal"
gUnknown_846EEC0:: @ 846EEC0
.incbin "baserom.gba", 0x46EEC0, 0x198
gUnknown_846E490:: @ 846E490 gbapal
.incbin "graphics/link_games/unk_846E7FC.gbapal"
gUnknown_846F058:: @ 846F058
.incbin "baserom.gba", 0x46F058, 0x228
gUnknown_846E4B0:: @ 846E4B0 gbapal
.incbin "graphics/link_games/unk_846ECC4.gbapal"
gUnknown_846E4D0:: @ 846E4D0 4bpp.lz
.incbin "graphics/link_games/unk_846E4D0.4bpp.lz"
gUnknown_846E7FC:: @ 846E7FC 4bpp.lz
.incbin "graphics/link_games/unk_846E7FC.4bpp.lz"
gUnknown_846EB78:: @ 846EB78 4bpp.lz
.incbin "graphics/link_games/unk_846EB78.4bpp.lz"
gUnknown_846ECC4:: @ 846ECC4 4bpp.lz
.incbin "graphics/link_games/unk_846ECC4.4bpp.lz"
gUnknown_846ED90:: @ 846ED90 bin.lz
.incbin "graphics/link_games/unk_846ED90.bin.lz"
gUnknown_846EEC0:: @ 846EEC0 bin.lz
.incbin "graphics/link_games/unk_846EEC0.bin.lz"
gUnknown_846F058:: @ 846F058 bin.lz
.incbin "graphics/link_games/unk_846F058.bin.lz"
gUnknown_846F280:: @ 846F280
.incbin "baserom.gba", 0x46F280, 0x14
.byte 0x01, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x03, 0x00, 0x00
.byte 0x01, 0x03, 0x02, 0x04, 0x00
.byte 0x00, 0x01, 0x03, 0x02, 0x04
gUnknown_846F294:: @ 846F294
.incbin "baserom.gba", 0x46F294, 0x3C
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x03, 0x00, 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
.byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00, 0xf8, 0xff, 0x10, 0x00
.byte 0x03, 0x14, 0x03, 0x00, 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff
gUnknown_846F2D0:: @ 846F2D0
.incbin "baserom.gba", 0x46F2D0, 0x1
gUnknown_846F2D1:: @ 846F2D1
.incbin "baserom.gba", 0x46F2D1, 0x5
.byte 0x00, 0x00
.byte 0xff, 0x00
.byte 0x01, 0x01
gUnknown_846F2D6:: @ 846F2D6
.incbin "baserom.gba", 0x46F2D6, 0x1
gUnknown_846F2D7:: @ 846F2D7
.incbin "baserom.gba", 0x46F2D7, 0x15
.byte 0x00, 0x00
.byte 0xf0, 0xfc
.byte 0x10, 0xfc
.byte 0xf8, 0xfe
.byte 0x08, 0xfe
.byte 0xe8, 0xf8
.byte 0x18, 0xf8
.byte 0xe0, 0xf4
.byte 0x20, 0xf4
.byte 0xd8, 0xf0
.byte 0x28, 0xf0
gUnknown_846F2EC:: @ 846F2EC
.incbin "baserom.gba", 0x46F2EC, 0xC
.2byte 5, 6, 7, 8, 9
.align 2
gUnknown_846F2F8:: @ 846F2F8
.incbin "baserom.gba", 0x46F2F8, 0x28
obj_tiles gUnknown_846E4D0, 0x0800, 1
obj_tiles gUnknown_846E7FC, 0x0e00, 2
obj_tiles gUnknown_846EB78, 0x0700, 3
obj_tiles gUnknown_846ECC4, 0x02c0, 4
obj_tiles NULL, 0x0000, 0
gUnknown_846F320:: @ 846F320
.incbin "baserom.gba", 0x46F320, 0xF0
obj_pal gUnknown_846E470, 1
obj_pal gUnknown_846E490, 2
obj_pal gUnknown_846E4B0, 4
obj_pal NULL, 0
gUnknown_846F340::
obj_image_anim_frame 0x0000, 0
obj_image_anim_end
gUnknown_846F348::
obj_image_anim_frame 0x0000, 4
obj_image_anim_frame 0x0010, 4
obj_image_anim_frame 0x0020, 4
obj_image_anim_end
gUnknown_846F358::
obj_image_anim_frame 0x0030, 2
obj_image_anim_frame 0x0040, 2
obj_image_anim_frame 0x0050, 2
obj_image_anim_frame 0x0060, 2
obj_image_anim_end
gUnknown_846F36C::
obj_image_anim_frame 0x0000, 2
obj_image_anim_frame 0x0004, 2
obj_image_anim_frame 0x0008, 2
obj_image_anim_frame 0x000c, 2
obj_image_anim_frame 0x0010, 2
obj_image_anim_frame 0x0014, 2
obj_image_anim_jump 0
gUnknown_846F388::
obj_image_anim_frame 0x0018, 4
obj_image_anim_frame 0x001c, 4
obj_image_anim_frame 0x0020, 4
obj_image_anim_frame 0x0024, 4
obj_image_anim_frame 0x0028, 4
obj_image_anim_frame 0x002c, 4
obj_image_anim_frame 0x0030, 4
obj_image_anim_frame 0x0034, 4
obj_image_anim_jump 0
gUnknown_846F3AC::
obj_image_anim_frame 0x0014, 0
obj_image_anim_end
gUnknown_846F3B4::
obj_image_anim_frame 0x0000, 0
obj_image_anim_end
gUnknown_846F3BC::
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_frame 0, 0, 2, 1
obj_rot_scal_anim_jump 1
gUnknown_846F3D4::
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_frame 0, 0, 254, 1
obj_rot_scal_anim_jump 1
gUnknown_846F3EC::
.4byte gUnknown_846F340
gUnknown_846F3F0::
.4byte gUnknown_846F348
.4byte gUnknown_846F358
gUnknown_846F3F8::
.4byte gUnknown_846F36C
.4byte gUnknown_846F388
gUnknown_846F400::
.4byte gUnknown_846F3AC
gUnknown_846F404::
.4byte gUnknown_846F3B4
gUnknown_846F408::
.4byte gUnknown_846F3BC
.4byte gUnknown_846F3D4
gUnknown_846F410:: @ 846F410
.incbin "baserom.gba", 0x46F410, 0x18
spr_template 1, 1, gOamData_83AC9E0, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F428:: @ 846F428
.incbin "baserom.gba", 0x46F428, 0x18
spr_template 2, 2, gOamData_83AC9D8, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0
gUnknown_846F440:: @ 846F440
.incbin "baserom.gba", 0x46F440, 0x18
spr_template 3, 2, gOamData_83AC9D0, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F458:: @ 846F458
.incbin "baserom.gba", 0x46F458, 0x18
spr_template 4, 4, gOamData_83ACA08, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846F470:: @ 846F470
.incbin "baserom.gba", 0x46F470, 0x18
spr_template 5, 5, gOamData_83ACA98, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
gUnknown_846F488:: @ 846F488
.incbin "baserom.gba", 0x46F488, 0x30
gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
.byte 9, 2, 8
.align 2
.2byte 0x9c, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.align 2
.2byte 0xb4, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
.byte 8, 2, 8
.align 2
.2byte 0xcc, 0x00
.4byte gUnknown_846F2F8 + 0x18
.4byte gUnknown_846F320 + 0x10
gUnknown_846F4B8:: @ 846F4B8
.incbin "baserom.gba", 0x46F4B8, 0x18
.4byte gUnknown_841D034
.4byte gUnknown_841D03C
.4byte gUnknown_841D044
.4byte gUnknown_841D0D4
.4byte gUnknown_841D0E8
.4byte gUnknown_841D100
data/data_8471F00.s
+85
View File
@@ -218,38 +218,103 @@ gUnknown_847A913::
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
gUnknown_847A955::
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
gUnknown_847A976::
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
gUnknown_847A997::
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
gUnknown_847A9B8::
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
gUnknown_847A9D9::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
gUnknown_847A9FA::
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
gUnknown_847AA1B::
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
gUnknown_847AA3C::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
gUnknown_847AA5D::
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
gUnknown_847AA76::
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
gUnknown_847AA8F::
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
gUnknown_847AAA8::
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
gUnknown_847AAC1::
.string "ABCDE$"
gUnknown_847AAC7::
.string "FGHIJ$"
gUnknown_847AACD::
.string "KLMNO$"
gUnknown_847AAD3::
.string "PQRST$"
gUnknown_847AAD9::
.string "UVWXY$"
gUnknown_847AADF::
.string "Z $"
gUnknown_847AAE5::
.string "01234$"
gUnknown_847AAEB::
.string "56789$"
gUnknown_847AAF1::
.string ".,!? $"
gUnknown_847AAF7::
.string "-/&… $"
gUnknown_847AAFD::
.string "abcde$"
gUnknown_847AB03::
.string "fghij$"
gUnknown_847AB09::
.string "klmno$"
gUnknown_847AB0F::
.string "pqrst$"
gUnknown_847AB15::
.string "uvwxy$"
gUnknown_847AB1B::
.string "z $"
gUnknown_847AB21::
.string "01234$"
gUnknown_847AB27::
.string "56789$"
gUnknown_847AB2D::
.string ".,!? $"
gUnknown_847AB33::
.string "-/&… $"
.string "$"
.string "$"
.string "$"
@@ -258,15 +323,35 @@ gUnknown_847A934::
.string "$"
.string "$"
.string "$"
gUnknown_847AB41::
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
gUnknown_847AB4C::
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
gUnknown_847AB57::
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
gUnknown_847AB62::
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
gUnknown_847AB6B::
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
gUnknown_847AB76::
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
gUnknown_847AB81::
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
gUnknown_847AB8C::
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
gUnknown_847AB97::
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
gUnknown_847ABA2::
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
data/event_scripts.s
+3 -3
View File
@@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A
goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059
setvar VAR_0x8005, 0
special sub_8127888
special ChooseMonForWirelessMinigame
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
@@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184
goto_if eq, EventScript_1BC2A6
msgbox gUnknown_81BD059
setvar VAR_0x8005, 1
special sub_8127888
special ChooseMonForWirelessMinigame
waitstate
compare_var_to_value VAR_0x8004, 6
goto_if ge, EventScript_1BB83F
@@ -13968,7 +13968,7 @@ EventScript_1C4F26:: @ 81C4F26
end
EventScript_1C4F30:: @ 81C4F30
special sub_812781C
special ChooseMonForMoveTutor
waitstate
lock
faceplayer
data/field_player_avatar.s
+89 -24
View File
@@ -1,73 +1,138 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_835B764:: @ 835B764
.incbin "baserom.gba", 0x35B764, 0xB0
.4byte MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip
.4byte MetatileBehavior_IsIce_2, ForcedMovement_Slip
.4byte MetatileBehavior_IsWalkSouth, sub_805B750
.4byte MetatileBehavior_IsWalkNorth, sub_805B768
.4byte MetatileBehavior_IsWalkWest, sub_805B780
.4byte MetatileBehavior_IsWalkEast, sub_805B798
.4byte MetatileBehavior_IsSouthwardCurrent, sub_805B82C
.4byte MetatileBehavior_IsNorthwardCurrent, sub_805B844
.4byte MetatileBehavior_IsWestwardCurrent, sub_805B85C
.4byte MetatileBehavior_IsEastwardCurrent, sub_805B874
.4byte MetatileBehavior_UnusedIsSpinRight, sub_805B7B0
.4byte MetatileBehavior_UnusedIsSpinLeft, sub_805B7CC
.4byte MetatileBehavior_UnusedIsSpinUp, sub_805B7E8
.4byte MetatileBehavior_UnusedIsSpinDown, sub_805B804
.4byte MetatileBehavior_IsSlideSouth, ForcedMovement_SlideSouth
.4byte MetatileBehavior_IsSlideNorth, ForcedMovement_SlideNorth
.4byte MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest
.4byte MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast
.4byte MetatileBehavior_IsWaterfall, sub_805B82C
.4byte MetatileBehavior_UnusedReturnFalse_7, sub_805B924
.4byte MetatileBehavior_UnusedReturnFalse_8, sub_805B930
.4byte NULL, ForcedMovement_None
gUnknown_835B814:: @ 835B814
.incbin "baserom.gba", 0x35B814, 0xC
.4byte PlayerNotOnBikeNotMoving
.4byte sub_805B9C4
.4byte sub_805B9D4
gUnknown_835B820:: @ 835B820
.incbin "baserom.gba", 0x35B820, 0x8
.byte 0x04, 0x04, 0x05, 0x06, 0x07
.align 2
gUnknown_835B828:: @ 835B828
.incbin "baserom.gba", 0x35B828, 0x14
.4byte MetatileBehavior_ReturnFalse_14
.4byte MetatileBehavior_ReturnFalse_15
.4byte MetatileBehavior_ReturnFalse_16
.4byte MetatileBehavior_ReturnFalse_17
.4byte MetatileBehavior_ReturnFalse_18
gUnknown_835B83C:: @ 835B83C
.incbin "baserom.gba", 0x35B83C, 0x8
.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d
.align 2
gUnknown_835B844:: @ 835B844
.incbin "baserom.gba", 0x35B844, 0x20
.4byte sub_805BE60
.4byte sub_805BE74
.4byte sub_805BE74
.4byte sub_805BE90
.4byte nullsub_23
.4byte PlayerAvatarTransition_ReturnToField
.4byte nullsub_22
.4byte nullsub_22
gUnknown_835B864:: @ 835B864
.incbin "baserom.gba", 0x35B864, 0x10
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B874:: @ 835B874
.incbin "baserom.gba", 0x35B874, 0xC
.byte 0x00, 0x07, 0x01, 0x08, 0x02, 0x09, 0x03, 0x0a, 0x04, 0x0b, 0x05, 0x0c
gUnknown_835B880:: @ 835B880
.incbin "baserom.gba", 0x35B880, 0x2
.byte 0x0e, 0x0f
gUnknown_835B882:: @ 835B882
.incbin "baserom.gba", 0x35B882, 0xC
.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x08, 0x07, 0x01, 0x08, 0x02, 0x09, 0x08
gUnknown_835B88E:: @ 835B88E
.incbin "baserom.gba", 0x35B88E, 0x2
.byte 0x06, 0x0d
gUnknown_835B890:: @ 835B890
.incbin "baserom.gba", 0x35B890, 0x10
.4byte MetatileBehavior_IsSouthArrowWarp
.4byte MetatileBehavior_IsNorthArrowWarp
.4byte MetatileBehavior_IsWestArrowWarp
.4byte MetatileBehavior_IsEastArrowWarp
gUnknown_835B8A0:: @ 835B8A0
.incbin "baserom.gba", 0x35B8A0, 0xC
.4byte sub_805CD64
.4byte sub_805CD84
.4byte sub_805CE20
gUnknown_835B8AC:: @ 835B8AC
.incbin "baserom.gba", 0x35B8AC, 0x4
.4byte PlayerAvatar_DoSecretBaseMatJump
gUnknown_835B8B0:: @ 835B8B0
.incbin "baserom.gba", 0x35B8B0, 0x10
.4byte sub_805CFC4
.4byte sub_805CFEC
.4byte sub_805D064
.4byte sub_805D0A4
gUnknown_835B8C0:: @ 835B8C0
.incbin "baserom.gba", 0x35B8C0, 0x4
.byte 0x03, 0x04, 0x02, 0x01
gUnknown_835B8C4:: @ 835B8C4
.incbin "baserom.gba", 0x35B8C4, 0x8
.byte 0x18, 0x18, 0x19, 0x1a, 0x1b
.align 2
gUnknown_835B8CC:: @ 835B8CC
.incbin "baserom.gba", 0x35B8CC, 0x40
.4byte sub_805D33C
.4byte fish1
.4byte fish2
.4byte sub_805D430
.4byte sub_805D47C
.4byte sub_805D508
.4byte sub_805D574
.4byte sub_805D580
.4byte sub_805D5EC
.4byte sub_805D66C
.4byte sub_805D6C8
.4byte sub_805D7C0
.4byte sub_805D838
.4byte sub_805D8AC
.4byte sub_805D8D8
.4byte sub_805D980
gUnknown_835B90C:: @ 835B90C
.incbin "baserom.gba", 0x35B90C, 0x6
.2byte 0x0001, 0x0001, 0x0001
gUnknown_835B912:: @ 835B912
.incbin "baserom.gba", 0x35B912, 0x6
.2byte 0x0001, 0x0003, 0x0006
gUnknown_835B918:: @ 835B918
.incbin "baserom.gba", 0x35B918, 0x2
.string "·$"
gUnknown_835B91A:: @ 835B91A
.incbin "baserom.gba", 0x35B91A, 0x6
.2byte 0x0024, 0x0021, 0x001e
gUnknown_835B920:: @ 835B920
.incbin "baserom.gba", 0x35B920, 0xC
.2byte 0x0000, 0x0000, 0x0028, 0x000a, 0x0046, 0x001e
gUnknown_835B92C:: @ 835B92C
.incbin "baserom.gba", 0x35B92C, 0x8
.byte 0x01, 0x03, 0x04, 0x02, 0x01
data/field_weather.s
+325 -34
View File
@@ -1,104 +1,395 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83BFBE4:: @ 83BFBE4
.incbin "baserom.gba", 0x3BFBE4, 0x2FD8
.incbin "graphics/field_effects/unk_83BFBE4.bin.lz"
gUnknown_83C0408::
.incbin "graphics/field_effects/unk_83C0408.bin.lz"
gUnknown_83C0C00::
.incbin "graphics/field_effects/unk_83C0C00.bin.lz"
gUnknown_83C139C::
.incbin "graphics/field_effects/unk_83C139C.bin.lz"
gUnknown_83C1BB8::
.incbin "graphics/field_effects/unk_83C1BB8.bin.lz"
gUnknown_83C2380::
.incbin "graphics/field_effects/unk_83C2380.bin.lz"
gUnknown_83C2BA4::
.4byte gUnknown_83BFBE4
.4byte gUnknown_83C0408
.4byte gUnknown_83C0C00
.4byte gUnknown_83C139C
.4byte gUnknown_83C1BB8
.4byte gUnknown_83C2380
gUnknown_83C2BBC:: @ 83C2BBC
.incbin "baserom.gba", 0x3C2BBC, 0x4
.4byte gUnknown_2037F34
gUnknown_83C2BC0:: @ 83C2BC0
.incbin "baserom.gba", 0x3C2BC0, 0xF0
.4byte sub_8079EC0
.4byte nullsub_45
.4byte sub_8079EC0
.4byte sub_8079EE4
.4byte Clouds_InitVars
.4byte Clouds_Main
.4byte Clouds_InitAll
.4byte Clouds_Finish
.4byte Weather2_InitVars
.4byte nullsub_48
.4byte Weather2_InitAll
.4byte sub_807B434
.4byte LightRain_InitVars
.4byte LightRain_Main
.4byte LightRain_InitAll
.4byte LightRain_Finish
.4byte Snow_InitVars
.4byte snowflakes_progress2
.4byte Snow_InitAll
.4byte Snow_Finish
.4byte sub_807C2E4
.4byte Rain_Main
.4byte sub_807C358
.4byte Rain_Finish
.4byte Fog1_InitVars
.4byte Fog1_Main
.4byte Fog1_InitAll
.4byte Fog1_Finish
.4byte Ash_InitVars
.4byte Ash_Main
.4byte Ash_InitAll
.4byte Ash_Finish
.4byte Sandstorm_InitVars
.4byte Sandstorm_Main
.4byte Sandstorm_InitAll
.4byte Sandstorm_Finish
.4byte Fog2_InitVars
.4byte Fog2_Main
.4byte Fog2_InitAll
.4byte Fog2_Finish
.4byte Fog1_InitVars
.4byte Fog1_Main
.4byte Fog1_InitAll
.4byte Fog1_Finish
.4byte Weather11_InitVars
.4byte nullsub_49
.4byte Weather11_InitAll
.4byte sub_807D8D0
.4byte Drought_InitVars
.4byte Drought_Main
.4byte Drought_InitAll
.4byte sub_807B6BC
.4byte sub_807C388
.4byte Rain_Main
.4byte sub_807C3F4
.4byte Rain_Finish
.4byte Bubbles_InitVars
.4byte Bubbles_Main
.4byte Bubbles_InitAll
.4byte Bubbles_Finish
gUnknown_83C2CB0:: @ 83C2CB0
.incbin "baserom.gba", 0x3C2CB0, 0x10
.4byte sub_8079FFC
.4byte sub_807A084
.4byte nullsub_46
.4byte nullsub_46
gUnknown_83C2CC0:: @ 83C2CC0
.incbin "baserom.gba", 0x3C2CC0, 0x20
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01
gUnknown_83C2CE0:: @ 83C2CE0
.incbin "baserom.gba", 0x3C2CE0, 0x20
.incbin "graphics/field_effects/unk_83C2CE0.gbapal"
gUnknown_83C2D00:: @ 83C2D00
.incbin "baserom.gba", 0x3C2D00, 0x20
.incbin "graphics/field_effects/unk_83C2D00.gbapal"
gUnknown_83C2D20:: @ 83C2D20
.incbin "baserom.gba", 0x3C2D20, 0x820
.incbin "graphics/field_effects/unk_83C2D20.gbapal"
gUnknown_83C2D40::
.incbin "graphics/field_effects/unk_83C2D40.4bpp"
gWeatherFog1Tiles:: @ 83C3540
.incbin "baserom.gba", 0x3C3540, 0x3080
.incbin "graphics/field_effects/unk_83C3540.4bpp"
gUnknown_83C3D40::
.incbin "graphics/field_effects/unk_83C3D40.4bpp"
gUnknown_83C4540::
.incbin "graphics/field_effects/unk_83C4540.4bpp"
gUnknown_83C4580::
.incbin "graphics/field_effects/unk_83C4580.4bpp"
gUnknown_83C45C0::
.incbin "graphics/field_effects/unk_83C45C0.4bpp"
gUnknown_83C55C0::
.incbin "graphics/field_effects/unk_83C55C0.4bpp"
gUnknown_83C5BC0::
.incbin "graphics/field_effects/unk_83C5BC0.4bpp"
gUnknown_83C65C0:: @ 83C65C0
.incbin "baserom.gba", 0x3C65C0, 0x4
.byte 0x02, 0x03, 0x05, 0x03
gUnknown_83C65C4:: @ 83C65C4
.incbin "baserom.gba", 0x3C65C4, 0x4
.byte 0x02, 0x02, 0x03, 0x02
gUnknown_83C65C8:: @ 83C65C8
.incbin "baserom.gba", 0x3C65C8, 0xC
.2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e
gUnknown_83C65D4:: @ 83C65D4
.incbin "baserom.gba", 0x3C65D4, 0x1C
obj_tiles gUnknown_83C3D40, 0x0800, 4608
gUnknown_83C65DC::
.4byte 0xc0000400, 0x00000c00
gUnknown_83C65E4::
obj_image_anim_frame 0x0000, 16
obj_image_anim_end
gUnknown_83C65EC::
.4byte gUnknown_83C65E4
gUnknown_83C65F0:: @ 83C65F0
.incbin "baserom.gba", 0x3C65F0, 0x18
spr_template 4608, 4608, gUnknown_83C65DC, gUnknown_83C65EC, NULL, gDummySpriteAffineAnimTable, sub_807B558
gUnknown_83C6608:: @ 83C6608
.incbin "baserom.gba", 0x3C6608, 0x9C
.2byte 0x0000, 0x0000
.2byte 0x0000, 0x00a0
.2byte 0x0000, 0x0040
.2byte 0x0090, 0x00e0
.2byte 0x0090, 0x0080
.2byte 0x0020, 0x0020
.2byte 0x0020, 0x00c0
.2byte 0x0020, 0x0060
.2byte 0x0048, 0x0080
.2byte 0x0048, 0x0020
.2byte 0x0048, 0x00c0
.2byte 0x00d8, 0x0060
.2byte 0x00d8, 0x0000
.2byte 0x0068, 0x00a0
.2byte 0x0068, 0x0040
.2byte 0x0068, 0x00e0
.2byte 0x0090, 0x0000
.2byte 0x0090, 0x00a0
.2byte 0x0090, 0x0040
.2byte 0x0020, 0x00e0
.2byte 0x0020, 0x0080
.2byte 0x0048, 0x0020
.2byte 0x0048, 0x00c0
.2byte 0x0030, 0x0060
gUnknown_83C6668::
.4byte 0x80008000, 0x00002400
gUnknown_83C6670::
obj_image_anim_frame 0x0000, 16
obj_image_anim_jump 0
gUnknown_83C6678::
obj_image_anim_frame 0x0008, 3
obj_image_anim_frame 0x0020, 2
obj_image_anim_frame 0x0028, 2
obj_image_anim_end
gUnknown_83C6688::
obj_image_anim_frame 0x0008, 3
obj_image_anim_frame 0x0010, 3
obj_image_anim_frame 0x0018, 4
obj_image_anim_end
gUnknown_83C6698::
.4byte gUnknown_83C6670
.4byte gUnknown_83C6678
.4byte gUnknown_83C6688
gUnknown_83C66A4:: @ 83C66A4
.incbin "baserom.gba", 0x3C66A4, 0x18
spr_template 4614, 4608, gUnknown_83C6668, gUnknown_83C6698, NULL, gDummySpriteAffineAnimTable, sub_807BA24
gUnknown_83C66BC:: @ 83C66BC
.incbin "baserom.gba", 0x3C66BC, 0x8
.2byte 0xff98, 0x00d0
.2byte 0xff60, 0x0140
gUnknown_83C66C4:: @ 83C66C4
.incbin "baserom.gba", 0x3C66C4, 0x8
.2byte 0x0012, 0x0007
.2byte 0x000c, 0x000a
gUnknown_83C66CC:: @ 83C66CC
.incbin "baserom.gba", 0x3C66CC, 0x38
obj_tiles gUnknown_83C55C0, 0x0600, 4614
gUnknown_83C66D4::
.4byte 0x00000000, 0x00000400
gUnknown_83C66DC::
obj_frame_tiles gUnknown_83C4540 + 0x00, 0x0020
obj_frame_tiles gUnknown_83C4540 + 0x20, 0x0020
gUnknown_83C66EC::
obj_image_anim_frame 0x0000, 16
obj_image_anim_end
gUnknown_83C66F4::
obj_image_anim_frame 0x0001, 16
obj_image_anim_end
gUnknown_83C66FC::
.4byte gUnknown_83C66EC
.4byte gUnknown_83C66F4
gUnknown_83C6704:: @ 83C6704
.incbin "baserom.gba", 0x3C6704, 0x8C
spr_template 65535, 4608, gUnknown_83C66D4, gUnknown_83C66FC, gUnknown_83C66DC, gDummySpriteAffineAnimTable, sub_807C1AC
gUnknown_83C671C::
.2byte 0x0000, 0x0006, 0x0006, 0x000c, 0x0012, 0x002a, 0x012c, 0x012c
gUnknown_83C672C::
.4byte 0xc0000400, 0x00000800
gUnknown_83C6734::
obj_image_anim_frame 0x0000, 16
obj_image_anim_end
gUnknown_83C673C::
obj_image_anim_frame 0x0020, 16
obj_image_anim_end
gUnknown_83C6744::
obj_image_anim_frame 0x0040, 16
obj_image_anim_end
gUnknown_83C674C::
obj_image_anim_frame 0x0060, 16
obj_image_anim_end
gUnknown_83C6754::
obj_image_anim_frame 0x0080, 16
obj_image_anim_end
gUnknown_83C675C::
obj_image_anim_frame 0x00a0, 16
obj_image_anim_end
gUnknown_83C6764::
.4byte gUnknown_83C6734
.4byte gUnknown_83C673C
.4byte gUnknown_83C6744
.4byte gUnknown_83C674C
.4byte gUnknown_83C6754
.4byte gUnknown_83C675C
gUnknown_83C677C::
obj_rot_scal_anim_frame 512, 512, 0, 0
obj_rot_scal_anim_end
gUnknown_83C678C::
.4byte gUnknown_83C677C
gUnknown_83C6790:: @ 83C6790
.incbin "baserom.gba", 0x3C6790, 0x18
spr_template 4609, 4608, gUnknown_83C672C, gUnknown_83C6764, NULL, gUnknown_83C678C, Fog1SpriteCallback
gUnknown_83C67A8:: @ 83C67A8
.incbin "baserom.gba", 0x3C67A8, 0x8
obj_tiles gWeatherFog1Tiles, 0x0800, 4609
gUnknown_83C67B0:: @ 83C67B0
.incbin "baserom.gba", 0x3C67B0, 0x20
obj_tiles gUnknown_83C45C0, 0x1000, 4610
gUknown_83C67B8::
.4byte 0xc0000400, 0x0000f400
gUnknown_83C67C0::
obj_image_anim_frame 0x0000, 60
obj_image_anim_frame 0x0040, 60
obj_image_anim_jump 0
gUnknown_83C67CC::
.4byte gUnknown_83C67C0
gUnknown_83C67D0:: @ 83C67D0
.incbin "baserom.gba", 0x3C67D0, 0x18
spr_template 4610, 4608, gUknown_83C67B8, gUnknown_83C67CC, NULL, gDummySpriteAffineAnimTable, sub_807CF08
gUnknown_83C67E8:: @ 83C67E8
.incbin "baserom.gba", 0x3C67E8, 0x1C
obj_tiles gUnknown_83C2D40, 0x0800, 4611
gUnknown_83C67F0::
.4byte 0xc0000400, 0x00000800
gUnknown_83C67F8::
obj_image_anim_frame 0x0000, 16
obj_image_anim_end
gUnknown_83C6800::
.4byte gUnknown_83C67F8
gUnknown_83C6804:: @ 83C6804
.incbin "baserom.gba", 0x3C6804, 0x38
spr_template 4611, 4608, gUnknown_83C67F0, gUnknown_83C6800, NULL, gDummySpriteAffineAnimTable, Fog2SpriteCallback
gUnknown_83C681C::
.4byte 0xc0000400, 0x00000400
gUnknown_83C6824::
obj_image_anim_frame 0x0000, 3
obj_image_anim_end
gUnknown_83C682C::
obj_image_anim_frame 0x0040, 3
obj_image_anim_end
gUnknown_83C6834::
.4byte gUnknown_83C6824
.4byte gUnknown_83C682C
gUnknown_83C683C:: @ 83C683C
.incbin "baserom.gba", 0x3C683C, 0x18
spr_template 4612, 4608, gUnknown_83C681C, gUnknown_83C6834, NULL, gDummySpriteAffineAnimTable, SandstormSpriteCallback1
gUnknown_83C6854:: @ 83C6854
.incbin "baserom.gba", 0x3C6854, 0x8
obj_tiles gUnknown_83C5BC0, 0x0a00, 4612
gUnknown_83C685C:: @ 83C685C
.incbin "baserom.gba", 0x3C685C, 0xC
.2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000
gUnknown_83C6868:: @ 83C6868
.incbin "baserom.gba", 0x3C6868, 0x8
.byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e
gUnknown_83C6870:: @ 83C6870
.incbin "baserom.gba", 0x3C6870, 0x8
obj_tiles gUnknown_83C4580, 0x0040, 4613
gUnknown_83C6878:: @ 83C6878
.incbin "baserom.gba", 0x3C6878, 0x44
.2byte 0x0078, 0x00a0
.2byte 0x0178, 0x00a0
.2byte 0x0028, 0x008c
.2byte 0x0128, 0x008c
.2byte 0x00b4, 0x0082
.2byte 0x01b4, 0x0082
.2byte 0x003c, 0x00a0
.2byte 0x01b4, 0x00a0
.2byte 0x00dc, 0x00b4
.2byte 0x01dc, 0x00b4
.2byte 0x000a, 0x005a
.2byte 0x010a, 0x005a
.2byte 0x0100, 0x00a0
gUnknown_83C68AC::
obj_image_anim_frame 0x0000, 16
obj_image_anim_frame 0x0001, 16
obj_image_anim_end
gUnknown_83C68B8::
.4byte gUnknown_83C68AC
gUnknown_83C68BC:: @ 83C68BC
.incbin "baserom.gba", 0x3C68BC, 0x18
spr_template 4613, 4608, gOamData_83AC9C8, gUnknown_83C68B8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4
gUnknown_83C68D4:: @ 83C68D4
.incbin "baserom.gba", 0x3C68D4, 0xC
.2byte 0x00c8, 0x0048, 0x0038, 0x0028, 0x0018, 0x0000
data/graphics.s
+15 -15
View File
@@ -13892,35 +13892,35 @@ gFile_graphics_battle_anims_sprites_188_palette:: @ 8E826E8
.incbin "graphics/battle_anims/sprites/188.gbapal.lz"
.align 2
gFile_graphics_interface_party_menu_misc_sheet:: @ 8E82700
gPartyMenuBg_Gfx:: @ 8E82700
.incbin "graphics/interface/party_menu_misc.4bpp.lz"
.align 2
gUnknown_8E829C8:: @ 8E829C8
gPartyMenuBg_Pal:: @ 8E829C8
.incbin "baserom.gba", 0xE829C8, 0xE8
.align 2
gFile_graphics_interface_party_menu_misc_tilemap:: @ 8E82AB0
gPartyMenuBg_Tilemap:: @ 8E82AB0
.incbin "graphics/interface/party_menu_misc.bin.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_sheet:: @ 8E82BE8
gPartyMenuPokeball_Gfx:: @ 8E82BE8
.incbin "graphics/interface/party_menu_pokeball.4bpp.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_small_sheet:: @ 8E82D68
gPartyMenuPokeballSmall_Gfx:: @ 8E82D68
.incbin "graphics/interface/party_menu_pokeball_small.4bpp.lz"
.align 2
gFile_graphics_interface_party_menu_pokeball_palette:: @ 8E82E7C
gPartyMenuPokeball_Pal:: @ 8E82E7C
.incbin "graphics/interface/party_menu_pokeball.gbapal.lz"
.align 2
gUnknown_8E82EA0:: @ 8E82EA0
gStatusGfx_Icons:: @ 8E82EA0
.incbin "baserom.gba", 0xE82EA0, 0x204
.align 2
gFile_graphics_interface_status_icons_palette:: @ 8E830A4
gStatusPal_Icons:: @ 8E830A4
.incbin "graphics/interface/status_icons.gbapal.lz"
.align 2
@@ -14015,7 +14015,7 @@ gBuyMenuFrame_Tilemap:: @ 8E85EFC
.incbin "graphics/shop_menu/shop_tilemap.bin"
gBuyMenuFrame_TmHmTilemap:: @ 8E86038
.incbin "graphics/shop_menu/shop_tmHmTilemap.bin"
.incbin "graphics/shop_menu/shop_tm_hm_tilemap.bin"
gBuyMenuFrame_Pal:: @ 8E86170
.incbin "graphics/shop_menu/shop_menu.gbapal.lz"
@@ -16125,22 +16125,22 @@ gUnknown_8E998CC:: @ 8E998CC
.incbin "baserom.gba", 0xE998CC, 0x4C0
gUnknown_8E99D8C:: @ 8E99D8C
.incbin "baserom.gba", 0xE99D8C, 0x20 @UNKNOWN
.incbin "graphics/link_rfu/unk_8E99DAC.gbapal"
gUnknown_8E99DAC:: @ 8E99DAC
.incbin "baserom.gba", 0xE99DAC, 0xC8 @UNKNOWN
.incbin "graphics/link_rfu/unk_8E99DAC.4bpp.lz"
gUnknown_8E99E74:: @ 8E99E74
.incbin "baserom.gba", 0xE99E74, 0xB0
.incbin "graphics/link_rfu/unk_8E99E74.bin.lz"
gUnknown_8E99F24:: @ 8E99F24
.incbin "baserom.gba", 0xE99F24, 0x20 @UNKNOWN
.incbin "graphics/link_rfu/unk_8E9A168.gbapal"
gUnknown_8E99F44:: @ 8E99F44
.incbin "baserom.gba", 0xE99F44, 0x224
.incbin "graphics/link_rfu/unk_8E99F44.4bpp.lz"
gUnknown_8E9A168:: @ 8E9A168
.incbin "baserom.gba", 0xE9A168, 0x2F8
.incbin "graphics/link_rfu/unk_8E9A168.4bpp.lz"
gUnknown_8E9A460:: @ 8E9A460
.incbin "baserom.gba", 0xE9A460, 0xEB0
data/item_menu.s
+75 -17
View File
@@ -7,52 +7,110 @@
.align 2
gUnknown_8452CF4:: @ 8452CF4
.incbin "baserom.gba", 0x452CF4, 0x8
.4byte 0x000001f0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000011ed
@ {
@ .bg = 1,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 30,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
gUnknown_8452CFC:: @ 8452CFC
.incbin "baserom.gba", 0x452CFC, 0xC
.4byte gUnknown_84162CD
.4byte gUnknown_84162DE
.4byte gUnknown_84162D3
gUnknown_8452D08:: @ 8452D08
.incbin "baserom.gba", 0x452D08, 0x1B0
.incbin "graphics/item_menu/bagmap_0.bin"
.incbin "graphics/item_menu/bagmap_1.bin"
.incbin "graphics/item_menu/bagmap_2.bin"
.incbin "graphics/item_menu/bagmap_3.bin"
.incbin "graphics/item_menu/bagmap_4.bin"
.incbin "graphics/item_menu/bagmap_5.bin"
.incbin "graphics/item_menu/bagmap_6.bin"
.incbin "graphics/item_menu/bagmap_7.bin"
.incbin "graphics/item_menu/bagmap_8.bin"
.incbin "graphics/item_menu/bagmap_9.bin"
.incbin "graphics/item_menu/bagmap_A.bin"
.incbin "graphics/item_menu/bagmap_B.bin"
gUnknown_8452EB8:: @ 8452EB8
.incbin "baserom.gba", 0x452EB8, 0x60
.4byte gOtherText_Use, sub_8109C50
.4byte gOtherText_Toss, sub_8109CC0
.4byte gUnknown_84161A9, sub_810A000
.4byte gOtherText_Give, sub_810A0A8
.4byte gFameCheckerText_Cancel, sub_810A2DC
.4byte gOtherText_Use, sub_810A324
.4byte gUnknown_84161E9, sub_8109C50
.4byte gUnknown_84161F4, sub_8109C50
.4byte gUnknown_84161F4, sub_810A324
.4byte gUnknown_84161BC, sub_8109C50
.4byte gUnknown_84161F9, sub_810A000
.4byte gString_Dummy, NULL
gUnknown_8452F18:: @ 8452F18
.incbin "baserom.gba", 0x452F18, 0xC
.byte 0x00, 0x03, 0x01, 0x04
.byte 0x00, 0x02, 0x04, 0x0b
.byte 0x03, 0x01, 0x04, 0x0b
gUnknown_8452F24:: @ 8452F24
.incbin "baserom.gba", 0x452F24, 0x4
.byte 0x06, 0x03, 0x01, 0x04
gUnknown_8452F28:: @ 8452F28
.incbin "baserom.gba", 0x452F28, 0x6
.byte 0x03, 0x04
.byte 0x04, 0x0b
.byte 0x03, 0x04
gUnknown_8452F2E:: @ 8452F2E
.incbin "baserom.gba", 0x452F2E, 0x2
.byte 0x07, 0x04
gUnknown_8452F30:: @ 8452F30
.incbin "baserom.gba", 0x452F30, 0x2
.byte 0x05, 0x04
gUnknown_8452F32:: @ 8452F32
.incbin "baserom.gba", 0x452F32, 0x2
.byte 0x04, 0x0b
gUnknown_8452F34:: @ 8452F34
.incbin "baserom.gba", 0x452F34, 0x1C
.4byte sub_8109BB8
.4byte sub_810A370
.4byte sub_810A568
.4byte sub_810AB40
.4byte sub_810A468
.4byte sub_8109BB8
.4byte NULL
gUnknown_8452F50:: @ 8452F50
.incbin "baserom.gba", 0x452F50, 0x8
.4byte sub_8109EA8
.4byte sub_8109DB0
gUnknown_8452F58:: @ 8452F58
.incbin "baserom.gba", 0x452F58, 0x8
.4byte sub_810A940
.4byte sub_810A720
gUnknown_8452F60:: @ 8452F60
.incbin "baserom.gba", 0x452F60, 0x6
.string "{COLOR_HIGHLIGHT_SHADOW RED TRANSPARENT GREEN}$"
gUnknown_8452F66:: @ 8452F66
.incbin "baserom.gba", 0x452F66, 0x6
.string "{COLOR_HIGHLIGHT_SHADOW LIGHT_GRAY TRANSPARENT BLACK}$"
gUnknown_8452F6C:: @ 8452F6C
.incbin "baserom.gba", 0x452F6C, 0x10
.byte 0, 8, 72, 1, 72, 72
.2byte 0, 2, 111, 111
.byte 0
.align 2
gUnknown_8452F7C:: @ 8452F7C
.incbin "baserom.gba", 0x452F7C, 0xC0
.incbin "graphics/interface/select_button.4bpp"
data/link_rfu.s
+255 -47
View File
@@ -1,88 +1,296 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_843F29C:: @ 843F29C
.incbin "baserom.gba", 0x43F29C, 0x8
.2byte 0x143a, 0x1817, 0x100b, 0x200f
gUnknown_843F2A4:: @ 843F2A4
.incbin "baserom.gba", 0x43F2A4, 0x8
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_843F2AC:: @ 843F2AC
.incbin "baserom.gba", 0x43F2AC, 0xF0
.byte 0, 2, 2, 0
.4byte gUnknown_8418A2B
.4byte gUnknown_84186D1
.4byte gUnknown_84186EF
.4byte gUnknown_841880E
.4byte gUnknown_8418902
.byte 1, 2, 3, 1
.4byte gUnknown_8418A33
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841881B
.4byte gUnknown_8418902
.byte 2, 2, 3, 1
.4byte gUnknown_8418A4A
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841883E
.4byte gUnknown_8418902
.byte 3, 2, 3, 1
.4byte gUnknown_8418A61
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841885F
.4byte gUnknown_8418902
.byte 4, 2, 5, 2
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte gUnknown_841888C
.4byte gUnknown_8418902
.byte 5, 2, 2, 0
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte NULL
.4byte NULL
.byte 6, 2, 3, 1
.4byte gUnknown_8418A77
.4byte gUnknown_84187B2
.4byte gUnknown_84187D1
.4byte gUnknown_84188AC
.4byte gUnknown_8418902
.byte 7, 2, 3, 1
.4byte gUnknown_8418AA1
.4byte gUnknown_8418745
.4byte gUnknown_8418763
.4byte gUnknown_8418881
.4byte gUnknown_8418902
.byte 9, 2, 1, 3
.4byte gUnknown_8418A87
.4byte gUnknown_84188B9
.4byte gUnknown_84188D6
.4byte gUnknown_84188F0
.4byte gUnknown_8418902
.byte 14, 2, 2, 0
.4byte gUnknown_8418AB2
.4byte gUnknown_84186D1
.4byte gUnknown_84187EE
.4byte gUnknown_8418881
.4byte gUnknown_8418902
gUnknown_843F39C:: @ 843F39C
.incbin "baserom.gba", 0x43F39C, 0x3D0
gUnknown_843F39C:: @ 843F39C data8 4x7
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00
.byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00
.byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
.byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_843F76C:: @ 843F76C
.incbin "baserom.gba", 0x43F76C, 0x20
gUnknown_843F3B8:: @ 843F3B8 gbapal
.incbin "graphics/link_rfu/unk_843F3F8.gbapal"
gUnknown_843F78C:: @ 843F78C
.incbin "baserom.gba", 0x43F78C, 0x20
gUnknown_843F3D8:: @ 843F3D8 gbapal
.incbin "graphics/link_rfu/unk_8E9BD28.gbapal"
gUnknown_843F7AC:: @ 843F7AC
.incbin "baserom.gba", 0x43F7AC, 0xC8
gUnknown_843F3F8:: @ 843F3F8 4bpp
.incbin "graphics/link_rfu/unk_843F3F8.4bpp"
gUnknown_843F874:: @ 843F874
.incbin "baserom.gba", 0x43F874, 0x8
gUnknown_843F418:: @ 843F418 4bpp
.incbin "graphics/link_rfu/unk_843F418.4bpp"
gUnknown_843F87C:: @ 843F87C
.incbin "baserom.gba", 0x43F87C, 0xC
gUnknown_843F518:: @ 843F518 4bpp
.incbin "graphics/link_rfu/unk_843F518.4bpp"
gUnknown_843F888:: @ 843F888
.incbin "baserom.gba", 0x43F888, 0x18
gUnknown_843F618:: @ 843F618 gbapal
.incbin "graphics/link_rfu/unk_843F638.gbapal"
gUnknown_843F8A0:: @ 843F8A0
.incbin "baserom.gba", 0x43F8A0, 0x10
gUnknown_843F638:: @ 843F638 4bpp.lz
.incbin "graphics/link_rfu/unk_843F638.4bpp.lz"
gUnknown_843F8B0:: @ 843F8B0
.incbin "baserom.gba", 0x43F8B0, 0x20
gUnknown_843F76C:: @ 843F76C gbapal
.incbin "graphics/link_rfu/unk_843F76C.gbapal"
gUnknown_843F8D0:: @ 843F8D0
.incbin "baserom.gba", 0x43F8D0, 0x8
gUnknown_843F78C:: @ 843F78C gbapal
.incbin "graphics/link_rfu/unk_843F78C.gbapal"
gUnknown_843F8D8:: @ 843F8D8
.incbin "baserom.gba", 0x43F8D8, 0x3
gUnknown_843F7AC:: @ 843F7AC 4bpp.lz
.incbin "graphics/link_rfu/unk_843F7AC.4bpp.lz"
gUnknown_843F8DB:: @ 843F8DB
.incbin "baserom.gba", 0x43F8DB, 0x5
gUnknown_843F874:: @ 843F874 gbapal
.2byte RGB(0, 0, 0)
.2byte RGB(0, 0, 0)
.2byte RGB(7, 25, 31)
.2byte RGB(21, 21, 29)
gUnknown_843F87C:: @ 843F87C gbapal
.2byte RGB(0, 0, 0)
.2byte RGB(31, 31, 31)
.2byte RGB(12, 12, 12)
.2byte RGB(27, 26, 27)
.2byte RGB(8, 17, 9)
.align 2
gUnknown_843F888:: @ 843F888 data8 6x4
.byte 0x03, 0x04, 0x18, 0x04
.byte 0x01, 0x04, 0x1b, 0x04
.byte 0x03, 0x00, 0x18, 0x0a
.byte 0x06, 0x06, 0x12, 0x04
.byte 0x10, 0x04, 0x09, 0x02
.byte 0x0e, 0x04, 0x12, 0x04
gUnknown_843F8A0:: @ 843F8A0 bg_template
.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
gUnknown_843F8B0:: @ 843F8B0 window_template
.align 2
.byte 0x01, 0x07, 0x00, 0x10, 0x02, 0x0a
.2byte 0x0010
@ {0x01, 0x07, 0x00, 0x10, 0x02, 0x0a, 0x0010}
.align 2
.byte 0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f
.2byte 0x000a
@ {0x00, 0x04, 0x0f, 0x16, 0x04, 0x0f, 0x000a}
.align 2
.byte 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03
.2byte 0x0000
@ {0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000}
.align 2
.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00
.2byte 0x0000
@ {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000}
gUnknown_843F8D0:: @ 843F8D0 window_template
.align 2
.byte 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f
.2byte 0x0062
@ {0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x0062}
gUnknown_843F8D8:: @ 843F8D8 text
.string "{UNDERSCORE}$"
gUnknown_843F8DB:: @ 843F8DB text
.string "{CLEAR 17}$"
.align 2
gUnknown_843F8E0:: @ 843F8E0
.4byte gUnknown_847A8D8
.4byte gUnknown_847A8FA
.4byte gUnknown_847A913
.4byte gUnknown_847A934
gUnknown_843F8F0:: @ 843F8F0
.incbin "baserom.gba", 0x43F8F0, 0x20
gUnknown_843F8F0:: @ 843F8F0 sprite_sheet
obj_tiles gUnknown_843F3F8, 0x0020, 0
obj_tiles gUnknown_843F418, 0x0100, 2
obj_tiles gUnknown_843F518, 0x0100, 3
null_obj_tiles
gUnknown_843F910:: @ 843F910
.incbin "baserom.gba", 0x43F910, 0x28
gUnknown_843F910:: @ 843F910 sprite_palette
obj_pal gUnknown_843F3B8, 0
obj_pal gUnknown_843F3D8, 1
obj_pal gUnknown_8E99F24, 2
obj_pal gUnknown_843F618, 3
null_obj_pal
gUnknown_843F938:: @ 843F938
.incbin "baserom.gba", 0x43F938, 0x20
gUnknown_843F938:: @ 843F938 sprite_sheet
obj_tiles gUnknown_843F638, 0x0800, 5
obj_tiles gUnknown_8E9BD28, 0x1000, 1
obj_tiles gUnknown_8E99F44, 0x0800, 6
obj_tiles gUnknown_8E9A168, 0x1000, 4
gUnknown_843F958:: @ 843F958
.incbin "baserom.gba", 0x43F958, 0x10
gUnknown_843F958:: @ 843F958 data8
.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
gUnknown_843F968:: @ 843F968
.incbin "baserom.gba", 0x43F968, 0x50
gUnknown_843F960::
.4byte 0x00000000, 0x00000c00
gUnknown_843F9B8:: @ 843F9B8
.incbin "baserom.gba", 0x43F9B8, 0x68
gUnknown_843F968:: @ 843F968 sprite_template
spr_template 0, 0, gUnknown_843F960, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8101B20
gUnknown_843FA20:: @ 843FA20
.incbin "baserom.gba", 0x43FA20, 0x20
gUnknown_843F980::
.4byte 0xc0004000, 0x00000400
gUnknown_843FA40:: @ 843FA40
.incbin "baserom.gba", 0x43FA40, 0x40
gUnknown_843F988::
obj_image_anim_frame 0x0000, 0
obj_image_anim_end
gUnknown_843FA80:: @ 843FA80
.incbin "baserom.gba", 0x43FA80, 0x18
gUnknown_843F990::
obj_image_anim_frame 0x0020, 0
obj_image_anim_end
gUnknown_843FA98:: @ 843FA98
.incbin "baserom.gba", 0x43FA98, 0x18
gUnknown_843F998::
obj_image_anim_frame 0x0040, 0
obj_image_anim_end
gUnknown_843F9A0::
obj_image_anim_frame 0x0060, 0
obj_image_anim_end
gUnknown_843F9A8::
.4byte 0x843f988
.4byte 0x843f990
.4byte 0x843f998
.4byte 0x843f9a0
gUnknown_843F9B8:: @ 843F9B8 sprite_template
spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20
gUnknown_843F9D0::
.4byte 0xc0004000, 0x00000400
gUnknown_843F9D8::
obj_image_anim_frame 0x0060, 0
obj_image_anim_end
gUnknown_843F9E0::
obj_image_anim_frame 0x0040, 4
obj_image_anim_frame 0x0020, 4
obj_image_anim_end
gUnknown_843F9EC::
obj_image_anim_frame 0x0040, 4
obj_image_anim_frame 0x0000, 4
obj_image_anim_end
gUnknown_843F9F8::
obj_image_anim_frame 0x0040, 4
obj_image_anim_frame 0x0060, 0
obj_image_anim_end
gUnknown_843FA04::
obj_image_anim_frame 0x0040, 4
obj_image_anim_end
gUnknown_843FA0C::
.4byte gUnknown_843F9D8
.4byte gUnknown_843F9E0
.4byte gUnknown_843F9EC
.4byte gUnknown_843F9F8
.4byte gUnknown_843FA04
gUnknown_843FA20:: @ 843FA20 sprite_template
spr_template 4, 2, gUnknown_843F9D0, gUnknown_843FA0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA38::
.4byte 0xc0000000, 0x00000c00
gUnknown_843FA40:: @ 843FA40 sprite_template
spr_template 6, 2, gUnknown_843FA38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA58::
.4byte 0x40004000, 0x00000400
gUnknown_843FA60::
.4byte 0x40000000, 0x00000400
gUnknown_843FA68::
obj_image_anim_frame 0x0000, 0
obj_image_anim_end
gUnknown_843FA70::
obj_image_anim_frame 0x0004, 0
obj_image_anim_end
gUnknown_843FA78::
.4byte gUnknown_843FA68
.4byte gUnknown_843FA70
gUnknown_843FA80:: @ 843FA80 sprite_template
spr_template 3, 2, gUnknown_843FA58, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_843FA98:: @ 843FA98 sprite_template
spr_template 2, 2, gUnknown_843FA60, gUnknown_843FA78, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/link_rfu_2.s
+184 -19
View File
@@ -7,32 +7,91 @@
.align 2
gUnknown_843EBB4:: @ 843EBB4
.incbin "baserom.gba", 0x43EBB4, 0x18
.byte 0x04, 0x20
.2byte 0x0000
.byte 0x00
.align 1
.2byte 0x0002
.4byte gUnknown_3005440
.4byte gUnknown_3005E00
.byte 0x01, 0x00
.2byte 0x0258, 0x012c
.align 2
gUnknown_843EBCC:: @ 843EBCC
.incbin "baserom.gba", 0x43EBCC, 0x8
.byte 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
gUnknown_843EBD4:: @ 843EBD4
.incbin "baserom.gba", 0x43EBD4, 0x64
.4byte 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f
.4byte 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff
.4byte 0x0000ffff, 0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff, 0x001fffff, 0x003fffff, 0x007fffff
.4byte 0x00ffffff
gUnknown_843EC38:: @ 843EC38
.incbin "baserom.gba", 0x43EC38, 0x9
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02
.byte 0x03
gUnknown_843EC41:: @ 843EC41
.incbin "baserom.gba", 0x43EC41, 0x10
.byte 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x02, 0x03
.byte 0x01, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x04
gUnknown_843EC51:: @ 843EC51
.incbin "baserom.gba", 0x43EC51, 0x13
.byte 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x00, 0x00, 0x00
gUnknown_843EC64:: @ 843EC64
.incbin "baserom.gba", 0x43EC64, 0x28
.4byte gBlockSendBuffer
.2byte 0xc8
.align 2
.4byte gBlockSendBuffer
.2byte 0xc8
.align 2
.4byte gBlockSendBuffer
.2byte 0x64
.align 2
.4byte gBlockSendBuffer
.2byte 0xdc
.align 2
.4byte gBlockSendBuffer
.2byte 0x28
.align 2
gUnknown_843EC8C:: @ 843EC8C
.incbin "baserom.gba", 0x43EC8C, 0xFC
.2byte 0x0002, 0x7f7d, 0xffff
.macro ascipad str, len
1:
.ascii "\str"
2:
.space \len - (2b - 1b)
.endm
sUnref_843EC92::
ascipad "RFU WAIT", 15
ascipad "RFU BOOT", 15
ascipad "RFU ERROR", 15
ascipad "RFU RESET", 15
ascipad "RFU CONFIG", 15
ascipad "RFU START", 15
ascipad "RFU SC POLL", 15
ascipad "RFU SP POLL", 15
ascipad "RFU START", 15
ascipad "RFU SEND ERR", 15
ascipad "RFU CP POLL", 15
sUnref_843ED38::
ascipad " ", 16
ascipad "RECOVER START ", 16
ascipad "DISSCONECT ", 16
ascipad "RECOVER SUUSES", 16
ascipad "RECOVER FAILED", 16
.align 2
gUnknown_843ED88:: @ 843ED88
.incbin "baserom.gba", 0x43ED88, 0xC
.4byte sub_80FA834
.4byte sub_80FAA94
.4byte sub_80FACF0
.align 2
gUnknown_843ED94:: @ 843ED94
@@ -62,13 +121,15 @@ gUnknown_843EE10:: @ 843EE10
.align 2
gUnknown_843EE28:: @ 843EE28
.incbin "baserom.gba", 0x43EE28, 0x1F
.asciz " "
gUnknown_843EE47:: @ 843EE47
.incbin "baserom.gba", 0x43EE47, 0x10
.asciz " "
gUnknown_843EE57:: @ 843EE57
.incbin "baserom.gba", 0x43EE57, 0xD
.asciz " "
.asciz " "
.asciz "*"
.align 2
gUnknown_843EE64:: @ 843EE64
@@ -91,22 +152,126 @@ gUnknown_843EE64:: @ 843EE64
.asciz "SEARCH"
.align 2
.incbin "baserom.gba", 0x43EEC0, 0x144
gUnknown_843EEC0::
.incbin "graphics/interface/wireless_link_icon.gbapal"
gUnknown_843EEE0::
.incbin "graphics/interface/wireless_link_icon.4bpp.lz"
gUnknown_843F004:: @ 843F004
.incbin "baserom.gba", 0x43F004, 0x100
.byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37
.byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
.byte 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47
.byte 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f
.byte 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba
.byte 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8
.byte 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f
.byte 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1
.byte 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9
.byte 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1
.byte 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6
.byte 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb
.byte 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3
.byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb
.byte 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32
.byte 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a
.byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
.byte 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
.byte 0x1b, 0xad, 0xb3, 0xb4, 0x00, 0xaf, 0x7d, 0x7f
.byte 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0xa0
.byte 0xae, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57
.byte 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f
.byte 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67
.byte 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f
.byte 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77
.byte 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7e, 0xb0, 0xac
.byte 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23
.byte 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b
.byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
.byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
gUnknown_843F104:: @ 843F104
.incbin "baserom.gba", 0x43F104, 0x100
.byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
.byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
.byte 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c
.byte 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3
.byte 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb
.byte 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c
.byte 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07
.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
.byte 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17
.byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
.byte 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7
.byte 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf
.byte 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7
.byte 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf
.byte 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7
.byte 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7
.byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2
.byte 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa
.byte 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03
.byte 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
.byte 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36
.byte 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5
.byte 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20
.byte 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45
.byte 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d
.byte 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55
.byte 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63
.byte 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b
.byte 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73
.byte 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20
.byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20
.byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
gUnknown_843F204:: @ 843F204
.incbin "baserom.gba", 0x43F204, 0x70
.4byte 0x40000000, 0x00000000
gAnimCmd_843F20C::
obj_image_anim_frame 0x0004, 5
obj_image_anim_frame 0x0008, 5
obj_image_anim_frame 0x000c, 5
obj_image_anim_frame 0x0010, 10
obj_image_anim_frame 0x000c, 5
obj_image_anim_frame 0x0008, 5
obj_image_anim_jump 0
gAnimCmd_843F228::
obj_image_anim_frame 0x0004, 5
obj_image_anim_frame 0x0008, 5
obj_image_anim_frame 0x000c, 10
obj_image_anim_frame 0x0008, 5
obj_image_anim_jump 0
gAnimCmd_843F23C::
obj_image_anim_frame 0x0004, 5
obj_image_anim_frame 0x0008, 5
obj_image_anim_jump 0
gAnimCmd_843F248::
obj_image_anim_frame 0x0004, 10
obj_image_anim_frame 0x0014, 10
obj_image_anim_jump 0
gAnimCmd_843F254::
obj_image_anim_frame 0x0018, 10
obj_image_anim_frame 0x0004, 10
obj_image_anim_jump 0
gSpriteAnimTable_843F260::
.4byte gAnimCmd_843F20C
.4byte gAnimCmd_843F228
.4byte gAnimCmd_843F23C
.4byte gAnimCmd_843F248
.4byte gAnimCmd_843F254
gUnknown_843F274:: @ 843F274
.incbin "baserom.gba", 0x43F274, 0x8
obj_tiles gUnknown_843EEE0, 0x0380, 54321
gUnknown_843F27C:: @ 843F27C
.incbin "baserom.gba", 0x43F27C, 0x8
obj_pal gUnknown_843EEC0, 54322
gUnknown_843F284:: @ 843F284
.incbin "baserom.gba", 0x43F284, 0x18
spr_template 54321, 54322, gUnknown_843F204, gSpriteAnimTable_843F260, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
data/party_menu.s
-672
View File
@@ -1,672 +0,0 @@
#include "constants/region_map.h"
#include "constants/flags.h"
#include "constants/moves.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gMoveTutorMoves:: @ 8459B60
.2byte MOVE_MEGA_PUNCH
.2byte MOVE_SWORDS_DANCE
.2byte MOVE_MEGA_KICK
.2byte MOVE_BODY_SLAM
.2byte MOVE_DOUBLE_EDGE
.2byte MOVE_COUNTER
.2byte MOVE_SEISMIC_TOSS
.2byte MOVE_MIMIC
.2byte MOVE_METRONOME
.2byte MOVE_SOFT_BOILED
.2byte MOVE_DREAM_EATER
.2byte MOVE_THUNDER_WAVE
.2byte MOVE_EXPLOSION
.2byte MOVE_ROCK_SLIDE
.2byte MOVE_SUBSTITUTE
gMoveTutorMoveCompatibilityTable:: @ 8459B7E
.2byte 0x0000
.2byte 0x409a
.2byte 0x409a
.2byte 0x409a
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x0000
.2byte 0x0000
.2byte 0x4490
.2byte 0x0000
.2byte 0x0000
.2byte 0x4092
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x48b8
.2byte 0x48b8
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x48fd
.2byte 0x48fd
.2byte 0x60fa
.2byte 0x60fa
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x60fd
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x60fd
.2byte 0x4ffd
.2byte 0x4ffd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4cfd
.2byte 0x4cfd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4092
.2byte 0x4092
.2byte 0x409a
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x4498
.2byte 0x4498
.2byte 0x40fd
.2byte 0x40fd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x41fd
.2byte 0x41fd
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4092
.2byte 0x4092
.2byte 0x409a
.2byte 0x4092
.2byte 0x4092
.2byte 0x71f9
.2byte 0x71f9
.2byte 0x71fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4c98
.2byte 0x4cfd
.2byte 0x4890
.2byte 0x4890
.2byte 0x409a
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x5088
.2byte 0x5088
.2byte 0x5090
.2byte 0x5090
.2byte 0x5480
.2byte 0x5480
.2byte 0x55fd
.2byte 0x7098
.2byte 0x4dfd
.2byte 0x4dfd
.2byte 0x409a
.2byte 0x409a
.2byte 0x5880
.2byte 0x5880
.2byte 0x5490
.2byte 0x5490
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x64ff
.2byte 0x5080
.2byte 0x5080
.2byte 0x60ba
.2byte 0x60ff
.2byte 0x4ffd
.2byte 0x409a
.2byte 0x60fd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4890
.2byte 0x4c90
.2byte 0x4dfd
.2byte 0x40b2
.2byte 0x45fd
.2byte 0x48fd
.2byte 0x40fd
.2byte 0x60da
.2byte 0x4098
.2byte 0x0000
.2byte 0x4898
.2byte 0x4498
.2byte 0x0000
.2byte 0x4098
.2byte 0x4098
.2byte 0x4898
.2byte 0x4098
.2byte 0x4c90
.2byte 0x6098
.2byte 0x60d8
.2byte 0x6098
.2byte 0x60de
.2byte 0x6090
.2byte 0x61fd
.2byte 0x4090
.2byte 0x4890
.2byte 0x4090
.2byte 0x4898
.2byte 0x4898
.2byte 0x4898
.2byte 0x4dfd
.2byte 0x7fff
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4098
.2byte 0x4098
.2byte 0x60fd
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x4098
.2byte 0x4098
.2byte 0x4490
.2byte 0x4490
.2byte 0x4093
.2byte 0x4093
.2byte 0x4098
.2byte 0x4098
.2byte 0x4090
.2byte 0x4890
.2byte 0x4890
.2byte 0x48fd
.2byte 0x4ffd
.2byte 0x4cfd
.2byte 0x4ffd
.2byte 0x4ffd
.2byte 0x4c90
.2byte 0x4c90
.2byte 0x4898
.2byte 0x48fd
.2byte 0x48fd
.2byte 0x4092
.2byte 0x40dd
.2byte 0x40dd
.2byte 0x70fd
.2byte 0x41fd
.2byte 0x4092
.2byte 0x4092
.2byte 0x4092
.2byte 0x4dfd
.2byte 0x4092
.2byte 0x4092
.2byte 0x4490
.2byte 0x4098
.2byte 0x40fd
.2byte 0x4498
.2byte 0x4498
.2byte 0x4c90
.2byte 0x4cfd
.2byte 0x4c90
.2byte 0x0000
.2byte 0x0000
.2byte 0x4c98
.2byte 0x70b8
.2byte 0x70b8
.2byte 0x6cb8
.2byte 0x64b2
.2byte 0x7098
.2byte 0x49fd
.2byte 0x69fd
.2byte 0x4892
.2byte 0x40b2
.2byte 0x6098
.2byte 0x60fa
.2byte 0x44b2
.2byte 0x41ff
.2byte 0x61ff
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x7098
.2byte 0x4890
.2byte 0x48d0
.2byte 0x40fd
.2byte 0x4098
.2byte 0x60b0
.2byte 0x44b8
.2byte 0x44b8
.2byte 0x4098
.2byte 0x40b8
.2byte 0x60b8
.2byte 0x4c90
.2byte 0x4c98
.2byte 0x0000
.2byte 0x60fc
.2byte 0x60fc
.2byte 0x45fd
.2byte 0x48fd
.2byte 0x40fd
.2byte 0x69fd
.2byte 0x4ffd
.2byte 0x4898
.2byte 0x4098
.2byte 0x4098
.2byte 0x6098
.2byte 0x6098
.2byte 0x68fd
.2byte 0x4c98
.2byte 0x4c90
.2byte 0x4592
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x0000
.2byte 0x40ff
.2byte 0x40ff
.2byte 0x40ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x60ff
.2byte 0x4098
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x40b8
.2byte 0x40b8
.2byte 0x4898
.2byte 0x4898
.2byte 0x0000
.2byte 0x0000
.2byte 0x4090
.2byte 0x0000
.2byte 0x4090
.2byte 0x409a
.2byte 0x409a
.2byte 0x41ff
.2byte 0x509a
.2byte 0x509e
.2byte 0x509e
.2byte 0x4090
.2byte 0x4092
.2byte 0x4490
.2byte 0x40b0
.2byte 0x40b0
.2byte 0x409a
.2byte 0x40ff
.2byte 0x65fd
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4090
.2byte 0x4098
.2byte 0x4098
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x69fd
.2byte 0x7490
.2byte 0x7490
.2byte 0x7898
.2byte 0x7098
.2byte 0x45fd
.2byte 0x4090
.2byte 0x6090
.2byte 0x4090
.2byte 0x40ba
.2byte 0x40ba
.2byte 0x4090
.2byte 0x4098
.2byte 0x4090
.2byte 0x4090
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x61fd
.2byte 0x61fd
.2byte 0x4898
.2byte 0x4898
.2byte 0x6098
.2byte 0x7098
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x40fb
.2byte 0x40ff
.2byte 0x4098
.2byte 0x5098
.2byte 0x7498
.2byte 0x7498
.2byte 0x4098
.2byte 0x4498
.2byte 0x44fd
.2byte 0x49fd
.2byte 0x49fd
.2byte 0x60ff
.2byte 0x45fd
.2byte 0x65fd
.2byte 0x4498
.2byte 0x4498
.2byte 0x0000
.2byte 0x4498
.2byte 0x65fd
.2byte 0x409a
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x54b8
.2byte 0x54b8
.2byte 0x409a
.2byte 0x40fd
.2byte 0x60fd
.2byte 0x60fd
.2byte 0x4098
.2byte 0x4098
.2byte 0x4098
.2byte 0x6cba
.2byte 0x4c98
.2byte 0x4d98
.2byte 0x4098
.2byte 0x68ff
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x68fd
.2byte 0x4898
.2byte 0x49fd
.2byte 0x49fd
.2byte 0x6098
.2byte 0x6098
.2byte 0x609a
.2byte 0x60da
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x6098
.2byte 0x6098
.2byte 0x6098
.2byte 0x0000
.2byte 0x7098
.2byte 0x7098
.2byte 0x78fd
.2byte 0x78fd
.2byte 0x78fd
.2byte 0x6898
.2byte 0x68ff
.2byte 0x6898
.2byte 0x4c98
.2byte 0x4c98
.2byte 0x4d98
.2byte 0x6cfd
.2byte 0x4490
.align 2
gUnknown_8459EB8:: @ 8459EB8
.incbin "baserom.gba", 0x459EB8, 0xC
gUnknown_8459EC4:: @ 8459EC4
.incbin "baserom.gba", 0x459EC4, 0x20
gUnknown_8459EE4:: @ 8459EE4
.incbin "baserom.gba", 0x459EE4, 0x20
gUnknown_8459F04:: @ 8459F04
.incbin "baserom.gba", 0x459F04, 0xC0
gUnknown_8459FC4:: @ 8459FC4
.incbin "baserom.gba", 0x459FC4, 0x1C
gUnknown_8459FE0:: @ 8459FE0
.incbin "baserom.gba", 0x459FE0, 0x1C
gUnknown_8459FFC:: @ 8459FFC
.incbin "baserom.gba", 0x459FFC, 0xF
gUnknown_845A00B:: @ 845A00B
.incbin "baserom.gba", 0x45A00B, 0x5
gUnknown_845A010:: @ 845A010
.incbin "baserom.gba", 0x45A010, 0x40
gUnknown_845A050:: @ 845A050
.incbin "baserom.gba", 0x45A050, 0x40
gUnknown_845A090:: @ 845A090
.incbin "baserom.gba", 0x45A090, 0x40
gUnknown_845A0D0:: @ 845A0D0
.incbin "baserom.gba", 0x45A0D0, 0x38
gUnknown_845A108:: @ 845A108
.incbin "baserom.gba", 0x45A108, 0x8
gUnknown_845A110:: @ 845A110
.incbin "baserom.gba", 0x45A110, 0x8
gUnknown_845A118:: @ 845A118
.incbin "baserom.gba", 0x45A118, 0x8
gUnknown_845A120:: @ 845A120
.incbin "baserom.gba", 0x45A120, 0x8
gUnknown_845A128:: @ 845A128
.incbin "baserom.gba", 0x45A128, 0x8
gUnknown_845A130:: @ 845A130
.incbin "baserom.gba", 0x45A130, 0x8
gUnknown_845A138:: @ 845A138
.incbin "baserom.gba", 0x45A138, 0x8
gUnknown_845A140:: @ 845A140
.incbin "baserom.gba", 0x45A140, 0x8
gUnknown_845A148:: @ 845A148
.incbin "baserom.gba", 0x45A148, 0x8
gUnknown_845A150:: @ 845A150
.incbin "baserom.gba", 0x45A150, 0x8
gUnknown_845A158:: @ 845A158
.incbin "baserom.gba", 0x45A158, 0x8
gUnknown_845A160:: @ 845A160
.incbin "baserom.gba", 0x45A160, 0x8
gUnknown_845A168:: @ 845A168
.incbin "baserom.gba", 0x45A168, 0x8
gUnknown_845A170:: @ 845A170
.incbin "baserom.gba", 0x45A170, 0x8
gUnknown_845A178:: @ 845A178
.incbin "baserom.gba", 0x45A178, 0x8
gUnknown_845A180:: @ 845A180
.incbin "baserom.gba", 0x45A180, 0x46
gUnknown_845A1C6:: @ 845A1C6
.incbin "baserom.gba", 0x45A1C6, 0x46
gUnknown_845A20C:: @ 845A20C
.incbin "baserom.gba", 0x45A20C, 0x36
gUnknown_845A242:: @ 845A242
.incbin "baserom.gba", 0x45A242, 0x36
gUnknown_845A278:: @ 845A278
.incbin "baserom.gba", 0x45A278, 0x36
gUnknown_845A2AE:: @ 845A2AE
.incbin "baserom.gba", 0x45A2AE, 0x2
gUnknown_845A2B0:: @ 845A2B0
.incbin "baserom.gba", 0x45A2B0, 0x2
gUnknown_845A2B2:: @ 845A2B2
.incbin "baserom.gba", 0x45A2B2, 0x3
gUnknown_845A2B5:: @ 845A2B5
.incbin "baserom.gba", 0x45A2B5, 0x3
gUnknown_845A2B8:: @ 845A2B8
.incbin "baserom.gba", 0x45A2B8, 0x2
gUnknown_845A2BA:: @ 845A2BA
.incbin "baserom.gba", 0x45A2BA, 0x2
gUnknown_845A2BC:: @ 845A2BC
.incbin "baserom.gba", 0x45A2BC, 0x2
gUnknown_845A2BE:: @ 845A2BE
.incbin "baserom.gba", 0x45A2BE, 0x2
gUnknown_845A2C0:: @ 845A2C0
.incbin "baserom.gba", 0x45A2C0, 0x2
gUnknown_845A2C2:: @ 845A2C2
.incbin "baserom.gba", 0x45A2C2, 0x3
gUnknown_845A2C5:: @ 845A2C5
.incbin "baserom.gba", 0x45A2C5, 0x3
gUnknown_845A2C8:: @ 845A2C8
.incbin "baserom.gba", 0x45A2C8, 0x3
gUnknown_845A2CB:: @ 845A2CB
.incbin "baserom.gba", 0x45A2CB, 0x3
gUnknown_845A2CE:: @ 845A2CE
.incbin "baserom.gba", 0x45A2CE, 0x3
gUnknown_845A2D1:: @ 845A2D1
.incbin "baserom.gba", 0x45A2D1, 0x3
gUnknown_845A2D4:: @ 845A2D4
.incbin "baserom.gba", 0x45A2D4, 0x3
gUnknown_845A2D7:: @ 845A2D7
.incbin "baserom.gba", 0x45A2D7, 0x3
gUnknown_845A2DA:: @ 845A2DA
.incbin "baserom.gba", 0x45A2DA, 0x3
gUnknown_845A2DD:: @ 845A2DD
.incbin "baserom.gba", 0x45A2DD, 0x3
gUnknown_845A2E0:: @ 845A2E0
.incbin "baserom.gba", 0x45A2E0, 0x3
gUnknown_845A2E3:: @ 845A2E3
.incbin "baserom.gba", 0x45A2E3, 0x5
gUnknown_845A2E8:: @ 845A2E8
.incbin "baserom.gba", 0x45A2E8, 0x6C
gUnknown_845A354:: @ 845A354
.incbin "baserom.gba", 0x45A354, 0x28
gUnknown_845A37C:: @ 845A37C
.incbin "baserom.gba", 0x45A37C, 0xB0
gUnknown_845A42C:: @ 845A42C
.incbin "baserom.gba", 0x45A42C, 0x8
gUnknown_845A434:: @ 845A434
.incbin "baserom.gba", 0x45A434, 0x8
gUnknown_845A43C:: @ 845A43C
.incbin "baserom.gba", 0x45A43C, 0x38
gUnknown_845A474:: @ 845A474
.incbin "baserom.gba", 0x45A474, 0x8
gUnknown_845A47C:: @ 845A47C
.incbin "baserom.gba", 0x45A47C, 0x8
gUnknown_845A484:: @ 845A484
.incbin "baserom.gba", 0x45A484, 0x68
gUnknown_845A4EC:: @ 845A4EC
.incbin "baserom.gba", 0x45A4EC, 0x8
gUnknown_845A4F4:: @ 845A4F4
.incbin "baserom.gba", 0x45A4F4, 0x80
gUnknown_845A574:: @ 845A574
.incbin "baserom.gba", 0x45A574, 0x8
gUnknown_845A57C:: @ 845A57C
.incbin "baserom.gba", 0x45A57C, 0x8
gUnknown_845A584:: @ 845A584
.incbin "baserom.gba", 0x45A584, 0x18
gUnknown_845A59C:: @ 845A59C
.incbin "baserom.gba", 0x45A59C, 0x7C
gUnknown_845A618:: @ 845A618
.incbin "baserom.gba", 0x45A618, 0x114
gUnknown_845A72C:: @ 845A72C
.incbin "baserom.gba", 0x45A72C, 0x34
gUnknown_845A760:: @ 845A760
.incbin "baserom.gba", 0x45A760, 0xE
gUnknown_845A76E:: @ 845A76E
.incbin "baserom.gba", 0x45A76E, 0x1A
gUnknown_845A788:: @ 845A788
.incbin "baserom.gba", 0x45A788, 0x60
gUnknown_845A7E8:: @ 845A7E8
.4byte gUnknown_841718C @ Not what other player wants
.4byte gUnknown_84171CC @ Not an egg
.4byte gUnknown_84170BC @ Mon can't be traded
.4byte gUnknown_84170BC @ Mon can't be traded
.4byte gUnknown_84170FC @ Other trainer's mon can't be traded
.4byte gUnknown_84170E0 @ Egg can't be traded
.4byte gUnknown_8417130 @ Other trainer can't accept
.4byte gUnknown_8417164 @ Can't trade with trainer now
.4byte gUnknown_8417164 @ Can't trade with trainer now
gUnknown_845A80C:: @ 845A80C
.incbin "baserom.gba", 0x45A80C, 0x74
data/pokemon_jump.s
+306 -49
View File
@@ -60,82 +60,171 @@ gUnknown_846B4AC:: @ 846B4AC
.4byte sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34
gUnknown_846B4BC:: @ 846B4BC
.incbin "baserom.gba", 0x46B4BC, 0x190
.2byte 0x0001, 0x0002, 0x0004, 0x0001, 0x0007, 0x0000, 0x000a, 0x0001, 0x000b, 0x0001, 0x000d, 0x0001, 0x000e, 0x0001, 0x0013, 0x0001
.2byte 0x0014, 0x0001, 0x0019, 0x0000, 0x001b, 0x0000, 0x001d, 0x0000, 0x0020, 0x0000, 0x0023, 0x0000, 0x0025, 0x0000, 0x0027, 0x0002
.2byte 0x002b, 0x0002, 0x002e, 0x0001, 0x0034, 0x0000, 0x0036, 0x0002, 0x0038, 0x0001, 0x003a, 0x0001, 0x003c, 0x0002, 0x0045, 0x0002
.2byte 0x005a, 0x0001, 0x0062, 0x0001, 0x0066, 0x0002, 0x0068, 0x0000, 0x0084, 0x0002, 0x0085, 0x0000, 0x008a, 0x0001, 0x008c, 0x0001
.2byte 0x0098, 0x0002, 0x009b, 0x0001, 0x009e, 0x0000, 0x00a7, 0x0001, 0x00ac, 0x0000, 0x00ad, 0x0000, 0x00ae, 0x0002, 0x00af, 0x0002
.2byte 0x00b3, 0x0000, 0x00b6, 0x0002, 0x00b7, 0x0002, 0x00bf, 0x0002, 0x00c2, 0x0002, 0x00cc, 0x0002, 0x00d1, 0x0000, 0x00d5, 0x0002
.2byte 0x00d8, 0x0000, 0x00da, 0x0002, 0x00dc, 0x0000, 0x00e4, 0x0001, 0x00e7, 0x0000, 0x00e9, 0x0000, 0x00ec, 0x0001, 0x00ee, 0x0002
.2byte 0x00ef, 0x0001, 0x00f0, 0x0001, 0x00f6, 0x0001, 0x0115, 0x0001, 0x0118, 0x0002, 0x011b, 0x0000, 0x011c, 0x0000, 0x011e, 0x0001
.2byte 0x0120, 0x0000, 0x0121, 0x0000, 0x0122, 0x0001, 0x0123, 0x0002, 0x0125, 0x0002, 0x0127, 0x0002, 0x012a, 0x0001, 0x0188, 0x0000
.2byte 0x0189, 0x0000, 0x0137, 0x0002, 0x0132, 0x0002, 0x012d, 0x0001, 0x0172, 0x0000, 0x015e, 0x0002, 0x013b, 0x0000, 0x0142, 0x0000
.2byte 0x0163, 0x0000, 0x017e, 0x0001, 0x0164, 0x0002, 0x0151, 0x0001, 0x0161, 0x0001, 0x0162, 0x0001, 0x0182, 0x0000, 0x0183, 0x0000
.2byte 0x016b, 0x0002, 0x016f, 0x0002, 0x0153, 0x0002, 0x0141, 0x0002, 0x015f, 0x0000, 0x014c, 0x0002, 0x0158, 0x0002, 0x0186, 0x0001
.2byte 0x0168, 0x0000, 0x015a, 0x0000, 0x0175, 0x0001, 0x018b, 0x0001
gUnknown_846B64C:: @ 846B64C
.incbin "baserom.gba", 0x46B64C, 0x24
.4byte sub_8148344
.4byte sub_81483D0
.4byte sub_8148464
.4byte sub_81484D0
.4byte sub_81485C8
.4byte sub_81486C4
.4byte sub_8148760
.4byte sub_81487B4
.4byte sub_814881C
gUnknown_846B670:: @ 846B670
.incbin "baserom.gba", 0x46B670, 0x24
.4byte sub_8148398
.4byte sub_8148418
.4byte sub_81484B0
.4byte sub_814856C
.4byte sub_8148664
.4byte sub_8148724
.4byte sub_8148760
.4byte sub_8148800
.4byte sub_814881C
gUnknown_846B694:: @ 846B694
.incbin "baserom.gba", 0x46B694, 0x10
.2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d
gUnknown_846B6A4:: @ 846B6A4
.incbin "baserom.gba", 0x46B6A4, 0x8
.2byte 0x0000, 0x0001, 0x0001, 0x0002
gUnknown_846B6AC:: @ 846B6AC
.incbin "baserom.gba", 0x46B6AC, 0x8
.2byte 0x0058, 0x005f, 0x00dd, 0x00fe
gUnknown_846B6B4:: @ 846B6B4
.incbin "baserom.gba", 0x46B6B4, 0x90
.byte 0xfd, 0xfa, 0xf8, 0xf6, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe9, 0xea, 0xec, 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc
.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec, 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4
.byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed, 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2, 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5, 0xe6, 0xe7, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2
.byte 0xf4, 0xf5, 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_846B744:: @ 846B744
.incbin "baserom.gba", 0x46B744, 0x18
.4byte 0, 0, 50, 100, 200, 500
gUnknown_846B75C:: @ 846B75C
.incbin "baserom.gba", 0x46B75C, 0x10
.2byte 0x008a, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092, 0x0093
gUnknown_846B76C:: @ 846B76C
.incbin "baserom.gba", 0x46B76C, 0x28
.4byte 5000, 1
.4byte 8000, 2
.4byte 12000, 3
.4byte 16000, 4
.4byte 20000, 5
gUnknown_846B794:: @ 846B794
.incbin "baserom.gba", 0x46B794, 0x20
gUnknown_846B794:: @ 846B794 gbapal
.incbin "graphics/link_games/unk_846B794.gbapal"
gUnknown_846B7B4:: @ 846B7B4
.incbin "baserom.gba", 0x46B7B4, 0x20
gUnknown_846B7B4:: @ 846B7B4 gbapal
.incbin "graphics/link_games/unk_846B7B4.gbapal"
gUnknown_846B7D4:: @ 846B7D4
.incbin "baserom.gba", 0x46B7D4, 0x22C
gUnknown_846B7D4:: @ 846B7D4 4bpp.lz
.incbin "graphics/link_games/unk_846B7D4.4bpp.lz"
gUnknown_846BA00:: @ 846BA00
.incbin "baserom.gba", 0x46BA00, 0x1B0
gUnknown_846BA00:: @ 846BA00 bin.lz
.incbin "graphics/link_games/unk_846BA00.bin.lz"
gUnknown_846BBB0:: @ 846BBB0
.incbin "baserom.gba", 0x46BBB0, 0x20
gUnknown_846BBB0:: @ 846BBB0 gbapal
.incbin "graphics/link_games/unk_846BBB0.gbapal"
gUnknown_846BBD0:: @ 846BBD0
.incbin "baserom.gba", 0x46BBD0, 0x950
gUnknown_846BBD0:: @ 846BBD0 4bpp.lz
.incbin "graphics/link_games/unk_846BBD0.4bpp.lz"
gUnknown_846C520:: @ 846C520
.incbin "baserom.gba", 0x46C520, 0x3B8
gUnknown_846C520:: @ 846C520 bin.lz
.incbin "graphics/link_games/unk_846C520.bin.lz"
gUnknown_846C8D8:: @ 846C8D8
.incbin "baserom.gba", 0x46C8D8, 0x20
gUnknown_846C8D8:: @ 846C8D8 gbapal
.incbin "graphics/link_games/unk_846C8D8.gbapal"
gUnknown_846C8F8:: @ 846C8F8
.incbin "baserom.gba", 0x46C8F8, 0xAB0
gUnknown_846C8F8:: @ 846C8F8 4bpp.lz
.incbin "graphics/link_games/unk_846C8F8.4bpp.lz"
gUnknown_846D3A8:: @ 846D3A8
.incbin "baserom.gba", 0x46D3A8, 0x52C
gUnknown_846D3A8:: @ 846D3A8 bin.lz
.incbin "graphics/link_games/unk_846D3A8.bin.lz"
gUnknown_846D8D4:: @ 846D8D4
.incbin "baserom.gba", 0x46D8D4, 0x10
.4byte 0x000001b0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 27,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000025e6
@ {
@ .bg = 2,
@ .charBaseIndex = 1,
@ .mapBaseIndex = 30,
@ .screenSize = 2,
@ .paletteMode = 0,
@ .priority = 2,
@ .baseTile = 0x0000
@ }
.4byte 0x000016c9
@ {
@ .bg = 1,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 12,
@ .screenSize = 3,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x000031df
@ {
@ .bg = 3,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 29,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_846D8E4:: @ 846D8E4
.incbin "baserom.gba", 0x46D8E4, 0x18
.byte 0, 19, 0, 6, 2, 2
.2byte 0x0013
.byte 0, 8, 0, 6, 2, 2
.2byte 0x001f
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_846D8FC:: @ 846D8FC
.incbin "baserom.gba", 0x46D8FC, 0x50
.4byte 0, sub_8149DC8
.4byte 1, sub_8149F64
.4byte 2, sub_8149FD0
.4byte 3, sub_814A03C
.4byte 4, sub_814A0C8
.4byte 5, sub_814A174
.4byte 6, sub_814A218
.4byte 7, sub_814A264
.4byte 9, sub_814A3AC
.4byte 8, sub_814A308
gUnknown_846D94C:: @ 846D94C
.incbin "baserom.gba", 0x46D94C, 0x4
.string "IES$"
gUnknown_846D950:: @ 846D950
.incbin "baserom.gba", 0x46D950, 0x3
.byte 0x00, 0x02, 0x03
gUnknown_846D953:: @ 846D953
.incbin "baserom.gba", 0x46D953, 0xD
.byte 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
gUnknown_846D960:: @ 846D960
obj_tiles gUnknown_8479688, 0, 800
@@ -144,38 +233,206 @@ gUnknown_846D968:: @ 846D968
obj_pal gUnknown_8479668, 800
gUnknown_846D970::
.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0002, 0x0006
.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006, 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
.2byte 0x0006, 0x0008, 0x0010, 0x0008
gUnknown_846D978::
.2byte 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008
gUnknown_846D984::
.2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006
gUnknown_846D994::
.2byte 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
gUnknown_846D9A8:: @ 846D9A8
.incbin "baserom.gba", 0x46D9A8, 0x2C
.4byte gUnknown_846D970
.4byte gUnknown_846D978
.4byte gUnknown_846D984
.4byte gUnknown_846D994
gUnknown_846D9B8::
.2byte 0x0058, 0x0098
gUnknown_846D9BC::
.2byte 0x0058, 0x0078, 0x0098
gUnknown_846D9C2::
.2byte 0x0038, 0x0058, 0x0098, 0x00b8
gUnknown_846D9CA::
.2byte 0x0038, 0x0058, 0x0078, 0x0098, 0x00b8
gUnknown_846D9D4:: @ 846D9D4
.incbin "baserom.gba", 0x46D9D4, 0x6DC
.4byte gUnknown_846D9B8
.4byte gUnknown_846D9BC
.4byte gUnknown_846D9C2
.4byte gUnknown_846D9CA
gUnknown_846D9E4:: @ gbapal
.incbin "graphics/link_games/unk_846D9E4.gbapal"
gUnknown_846DA04:: @ gbapal
.incbin "graphics/link_games/unk_846DA04.gbapal"
gUnknown_846DA24:: @ 4bpp.lz
.incbin "graphics/link_games/unk_846DA24.4bpp.lz"
gUnknown_846DB44:: @ 4bpp.lz
.incbin "graphics/link_games/unk_846DB44.4bpp.lz"
gUnknown_846DD18:: @ 4bpp.lz
.incbin "graphics/link_games/unk_846DD18.4bpp.lz"
gUnknown_846DE48:: @ 4bpp.lz
.incbin "graphics/link_games/unk_846DE48.4bpp.lz"
gUnknown_846DF44:: @ 4bpp.lz
.incbin "graphics/link_games/unk_846DF44.4bpp.lz"
gUnknown_846E0B0:: @ 846E0B0
.incbin "baserom.gba", 0x46E0B0, 0x28
obj_tiles gUnknown_846DA24, 0x0600, 5
obj_tiles gUnknown_846DB44, 0x0c00, 6
obj_tiles gUnknown_846DD18, 0x0600, 7
obj_tiles gUnknown_846DE48, 0x0600, 8
obj_tiles gUnknown_846DF44, 0x0200, 10
gUnknown_846E0D8:: @ 846E0D8
.incbin "baserom.gba", 0x46E0D8, 0x10
obj_pal gUnknown_846D9E4, 5
obj_pal gUnknown_846DA04, 6
gUnknown_846E0E8:: @ 846E0E8
.incbin "baserom.gba", 0x46E0E8, 0x18
spr_template 0, 0, gUnknown_846E170, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E100:: @ 846E100
.incbin "baserom.gba", 0x46E100, 0x50
.2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072, 0x0060, 0x0060, 0x0046, 0x0050, 0x0060, 0x0072, 0x0078, 0x0080
.2byte 0x0078, 0x0072, 0x0060, 0x0050, 0x0032, 0x0048, 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048, 0x002a, 0x0048
.2byte 0x0060, 0x0072, 0x0080, 0x0088, 0x0080, 0x0072, 0x0060, 0x0048
gUnknown_846E150:: @ 846E150
.incbin "baserom.gba", 0x46E150, 0x10
.2byte 0x0010, 0x0028, 0x0048, 0x0068, 0x0088, 0x00a8, 0x00c8, 0x00e0
gUnknown_846E160:: @ 846E160
.incbin "baserom.gba", 0x46E160, 0x154
.4byte gUnknown_846E220
.4byte gUnknown_846E238
.4byte gUnknown_846E250
.4byte gUnknown_846E268
gUnknown_846E170::
.4byte 0xc0000000, 0x00000800
gUnknown_846E178::
.4byte 0x80008000, 0x00000800
gUnknown_846E180::
.4byte 0x80000000, 0x00000800
gUnknown_846E188::
.4byte 0x80004000, 0x00000800
gUnknown_846E190::
obj_image_anim_frame 0x0000, 1
obj_image_anim_end
gUnknown_846E198::
obj_image_anim_frame 0x0008, 1
obj_image_anim_end
gUnknown_846E1A0::
obj_image_anim_frame 0x0010, 1
obj_image_anim_end
gUnknown_846E1A8::
obj_image_anim_frame 0x0018, 1
obj_image_anim_end
gUnknown_846E1B0::
obj_image_anim_frame 0x0020, 1
obj_image_anim_end
gUnknown_846E1B8::
obj_image_anim_frame 0x0028, 1
obj_image_anim_end
gUnknown_846E1C0::
obj_image_anim_frame 0x0000, 1
obj_image_anim_end
gUnknown_846E1C8::
obj_image_anim_frame 0x0010, 1
obj_image_anim_end
gUnknown_846E1D0::
obj_image_anim_frame 0x0020, 1
obj_image_anim_end
gUnknown_846E1D8::
obj_image_anim_frame 0x0030, 1
obj_image_anim_end
gUnknown_846E1E0::
obj_image_anim_frame 0x0040, 1
obj_image_anim_end
gUnknown_846E1E8::
obj_image_anim_frame 0x0050, 1
obj_image_anim_end
gUnknown_846E1F0::
.4byte gUnknown_846E190
.4byte gUnknown_846E198
.4byte gUnknown_846E1A0
.4byte gUnknown_846E1A8
.4byte gUnknown_846E1B0
.4byte gUnknown_846E1B8
gUnknown_846E208::
.4byte gUnknown_846E1C0
.4byte gUnknown_846E1C8
.4byte gUnknown_846E1D0
.4byte gUnknown_846E1D8
.4byte gUnknown_846E1E0
.4byte gUnknown_846E1E8
gUnknown_846E220::
spr_template 5, 5, gUnknown_846E178, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E238::
spr_template 6, 5, gUnknown_846E180, gUnknown_846E208, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E250::
spr_template 7, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E268::
spr_template 8, 5, gUnknown_846E188, gUnknown_846E1F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E280::
.4byte 0x40000000, 0x00000400
gUnknown_846E288::
obj_image_anim_frame 0x0000, 0
obj_image_anim_end
gUnknown_846E290::
obj_image_anim_frame 0x0000, 4
obj_image_anim_frame 0x0004, 4
obj_image_anim_frame 0x0008, 4
obj_image_anim_frame 0x000c, 4
obj_image_anim_loop 1
obj_image_anim_frame 0x0000, 4
obj_image_anim_end
gUnknown_846E2AC::
.4byte gUnknown_846E288
.4byte gUnknown_846E290
gUnknown_846E2B4:: @ 846E2B4
.incbin "baserom.gba", 0x46E2B4, 0x18
spr_template 10, 5, gUnknown_846E280, gUnknown_846E2AC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_846E2CC:: @ 846E2CC
.incbin "baserom.gba", 0x46E2CC, 0x8
.byte 0, 1, 1, 28, 9, 15
.2byte 0x0001
gUnknown_846E2D4:: @ 846E2D4
.incbin "baserom.gba", 0x46E2D4, 0xC
.4byte gUnknown_841CB78
.4byte gUnknown_841CB88
.4byte gUnknown_841CB94
data/pokemon_special_anim.s
+170 -46
View File
@@ -6,71 +6,195 @@
.section .rodata
.align 2
gUnknown_8459634:: @ 8459634
.incbin "baserom.gba", 0x459634, 0x8
gUnknown_8459634:: @ 8459634 data16 2x2
.2byte 0x0044, 0x0000
.2byte 0x000d, 0x0001
gUnknown_845963C:: @ 845963C
.incbin "baserom.gba", 0x45963C, 0x20
gUnknown_845963C:: @ 845963C gbapal
.incbin "graphics/pokemon_special_anim/unk_845963C.gbapal"
gUnknown_845965C:: @ 845965C
.incbin "baserom.gba", 0x45965C, 0x20
gUnknown_845965C:: @ 845965C gbapal
.incbin "graphics/pokemon_special_anim/unk_845965C.gbapal"
gUnknown_845967C:: @ 845967C
.incbin "baserom.gba", 0x45967C, 0xC0
gUnknown_845967C:: @ 845967C 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_845967C.4bpp.lz"
gUnknown_845973C:: @ 845973C
.incbin "baserom.gba", 0x45973C, 0x12C
gUnknown_845973C:: @ 845973C bin.lz
.incbin "graphics/pokemon_special_anim/unk_845973C.bin.lz"
gUnknown_8459868:: @ 8459868
.incbin "baserom.gba", 0x459868, 0x20
gUnknown_8459868:: @ 8459868 gbapal
.incbin "graphics/pokemon_special_anim/unk_8459868.gbapal"
gUnknown_8459888:: @ 8459888
.incbin "baserom.gba", 0x459888, 0xF8
gUnknown_8459888:: @ 8459888 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_8459888.4bpp.lz"
gUnknown_8459980:: @ 8459980
.incbin "baserom.gba", 0x459980, 0x8
gUnknown_84598A4:: @ 84598A4 gbapal
.incbin "graphics/pokemon_special_anim/unk_84598A4.gbapal"
gUnknown_8459988:: @ 8459988
.incbin "baserom.gba", 0x459988, 0x10
gUnknown_84598C4:: @ 84598C4 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_84598C4.4bpp.lz"
gUnknown_8459998:: @ 8459998
.incbin "baserom.gba", 0x459998, 0x12
gUnknown_8459940:: @ 8459940 gbapal
.incbin "graphics/pokemon_special_anim/unk_8459940.gbapal"
gUnknown_84599AA:: @ 84599AA
.incbin "baserom.gba", 0x4599AA, 0x8
gUnknown_8459960:: @ 8459960 4bpp.lz
.incbin "graphics/pokemon_special_anim/unk_8459960.4bpp.lz"
gUnknown_84599B2:: @ 84599B2
.incbin "baserom.gba", 0x4599B2, 0x6
gUnknown_8459980:: @ 8459980 bg_template
.4byte 0x000041f0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0001
@ }
.4byte 0x000031cf
@ {
@ .bg = 3,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 28,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0000
@ }
gUnknown_84599B8:: @ 84599B8
.incbin "baserom.gba", 0x4599B8, 0x8
gUnknown_8459988:: @ 8459988 window_template
.byte 0, 1, 15, 28, 4, 15
.2byte 0x000a
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_84599C0:: @ 84599C0
.incbin "baserom.gba", 0x4599C0, 0x8
gUnknown_8459998:: @ 8459998 dataptr
.4byte gUnknown_841B2ED @ 1,
.4byte gUnknown_841B2F1 @ 2, and ‥ ‥ ‥
.4byte gUnknown_841B2FF @ Poof!
gUnknown_84599C8:: @ 84599C8
.incbin "baserom.gba", 0x4599C8, 0x8
gUnknown_84599A4:: @ 84599A4
.2byte 0x0000, 0x0010
gUnknown_84599D0:: @ 84599D0
.incbin "baserom.gba", 0x4599D0, 0x50
gUnknown_84599A8:: @ 84599A8 unref, data16?
.2byte 0x0044
gUnknown_8459A20:: @ 8459A20
.incbin "baserom.gba", 0x459A20, 0x10
gUnknown_84599AA:: @ 84599AA data16
.2byte 0x0100, 0x0155, 0x01aa, 0x0200
gUnknown_8459A30:: @ 8459A30
.incbin "baserom.gba", 0x459A30, 0x78
gUnknown_84599B2:: @ 84599B2 data8
.byte 0xf8, 0xf8, 0x06, 0xf3, 0x08, 0xf8
gUnknown_8459AA8:: @ 8459AA8
.incbin "baserom.gba", 0x459AA8, 0x24
gUnknown_84599B8:: @ 84599B8 sprite_sheet
obj_tiles gUnknown_84598C4, 0x0080, 2
gUnknown_8459ACC:: @ 8459ACC
.incbin "baserom.gba", 0x459ACC, 0x20
gUnknown_84599C0:: @ 84599C0 sprite_palette
obj_pal gUnknown_84598A4, 2
gUnknown_8459AEC:: @ 8459AEC
.incbin "baserom.gba", 0x459AEC, 0x44
gUnknown_84599C8:: @ 84599C8 sprite_sheet
obj_tiles gUnknown_8459960, 0x0060, 5
gUnknown_8459B30:: @ 8459B30
.incbin "baserom.gba", 0x459B30, 0x18
gUnknown_84599D0:: @ 84599D0 sprite_palette
obj_pal gUnknown_8459940, 5
gUnknown_8459B48:: @ 8459B48
.incbin "baserom.gba", 0x459B48, 0x18
gUnknown_84599D8:: @ 84599D8
.4byte 0xc0000300, 0x00000400
gUnknown_84599E0:: @ 84599E0
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_end
gUnknown_84599F0:: @ 84599F0
obj_rot_scal_anim_frame 341, 341, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A00:: @ 8459A00
obj_rot_scal_anim_frame 426, 426, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A10:: @ 8459A10
obj_rot_scal_anim_frame 512, 512, 0, 0
obj_rot_scal_anim_end
gUnknown_8459A20:: @ 8459A20 dataptr
.4byte gUnknown_84599E0
.4byte gUnknown_84599F0
.4byte gUnknown_8459A00
.4byte gUnknown_8459A10
gUnknown_8459A30:: @ 8459A30 spr_template
spr_template 0, 0, gUnknown_84599D8, gDummySpriteAnimTable, NULL, gUnknown_8459A20, SpriteCallbackDummy
gUnknown_8459A48:: @ 8459A48 affine_anim_cmd?
obj_rot_scal_anim_frame 256, 256, 0, 0
obj_rot_scal_anim_frame -28, -28, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A60:: @ 459A60
obj_rot_scal_anim_frame 341, 341, 0, 0
obj_rot_scal_anim_frame -37, -37, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A78:: @ 459A78
obj_rot_scal_anim_frame 426, 426, 0, 0
obj_rot_scal_anim_frame -47, -47, 0, 8
obj_rot_scal_anim_end
gUnknown_8459A90:: @ 459A90
obj_rot_scal_anim_frame 512, 512, 0, 0
obj_rot_scal_anim_frame -56, -56, 0, 8
obj_rot_scal_anim_end
gUnknown_8459AA8:: @ 8459AA8 dataptr
.4byte gUnknown_8459A48
.4byte gUnknown_8459A60
.4byte gUnknown_8459A78
.4byte gUnknown_8459A90
gUnknown_8459AB8:: @ 8459AB8
.4byte 0x00008400, 0x00000400
gUnknown_8459AC0:: @ 8459AC0
obj_image_anim_frame 0x0000, 3
obj_image_anim_end
gUnknown_8459AC8:: @ 8459AC8
.4byte gUnknown_8459AC0
gUnknown_8459ACC:: @ 8459ACC spr_template
spr_template 0, 0, gUnknown_8459AB8, gUnknown_8459AC8, NULL, gDummySpriteAffineAnimTable, sub_811E7B4
gUnknown_8459AE4:: @ 8459AE4
.4byte 0x40000000, 0x00000400
gUnknown_8459AEC:: @ 8459AEC spr_template
spr_template 2, 2, gUnknown_8459AE4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811E300
gUnknown_8459B04:: @ 8459B04
.4byte 0x00000000, 0x00000000
gUnknown_8459B0C:: @ 8459B0C
obj_image_anim_frame 0x0000, 16
obj_image_anim_frame 0x0001, 8
obj_image_anim_frame 0x0002, 4
obj_image_anim_end
gUnknown_8459B1C:: @ 8459B1C
obj_image_anim_frame 0x0001, 4
obj_image_anim_frame 0x0000, 4
obj_image_anim_end
gUnknown_8459B28:: @ 8459B28
.4byte gUnknown_8459B0C
.4byte gUnknown_8459B1C
gUnknown_8459B30:: @ 8459B30 spr_template
spr_template 5, 5, gUnknown_8459B04, gUnknown_8459B28, NULL, gDummySpriteAffineAnimTable, sub_811E520
gUnknown_8459B48:: @ 8459B48 dataptr
.4byte gUnknown_841B2A9
.4byte gUnknown_841B2B7
.4byte gUnknown_841B2BE
.4byte gUnknown_841B2CC
.4byte gUnknown_841B2D4
.4byte gUnknown_841B2C6
data/specials.inc
+2 -2
View File
@@ -405,8 +405,8 @@ gSpecials:: @ 815FD60
def_special get_unknown_box_id
def_special Special_OpenMuseumFossilPic
def_special Special_CloseMuseumFossilPic
def_special sub_812781C
def_special sub_8127888
def_special ChooseMonForMoveTutor
def_special ChooseMonForWirelessMinigame
def_special SetBattledTrainerFlag
def_special sub_812B35C
def_special Special_SSAnneDepartureCutscene
data/strings.s
+173 -144
View File
@@ -433,16 +433,16 @@ gString_Dummy:: @ 84161CD
gUnknown_84161CE::
.string "キャンセル$"
gUnknown_84161D4::
gText_Item::
.string "ITEM$"
gUnknown_84161D9::
gText_Mail::
.string "MAIL$"
gUnknown_84161DE::
gText_Take::
.string "TAKE$"
gUnknown_84161E3::
gText_Store::
.string "STORE$"
gUnknown_84161E9::
@@ -463,7 +463,7 @@ gUnknown_8416202:: @ 8416202
gUnknown_8416206::
.string "?????$"
gUnknown_841620C:: @ 841620C
gText_Slash:: @ 841620C
.string "/$"
gUnknown_841620E:: @ 841620E
@@ -478,10 +478,10 @@ gText_ThreeHyphens:: @ 8416213
gText_SevenHyphens:: @ 8416217
.string "-------$"
gUnknown_841621F:: @ 841621F
gText_MaleSymbol:: @ 841621F
.string "♂$"
gUnknown_8416221:: @ 8416221
gText_FemaleSymbol:: @ 8416221
.string "♀$"
gText_Lv:: @ 8416223
@@ -804,85 +804,85 @@ gText_TurnedOverItemsWorthYen:: @ 8416959
gText_PokedollarVar1:: @ 841697A
.string "¥{STR_VAR_1}$"
gUnknown_841697E:: @ 0x841697E
gText_Shift:: @ 0x841697E
.string "SHIFT$"
gUnknown_8416984:: @ 0x8416984
gText_SendOut:: @ 0x8416984
.string "SEND OUT$"
gUnknown_841698D:: @ 0x841698D
gText_Switch2:: @ 0x841698D
.string "SWITCH$"
gUnknown_8416994:: @ 0x8416994
gText_Summary5:: @ 0x8416994
.string "SUMMARY$"
gUnknown_841699C:: @ 0x841699C
.string "つかえるわざ$"
gUnknown_84169A3:: @ 0x84169A3
gText_Enter:: @ 0x84169A3
.string "ENTER$"
gUnknown_84169A9:: @ 0x84169A9
gText_NoEntry:: @ 0x84169A9
.string "NO ENTRY$"
gUnknown_84169B2:: @ 0x84169B2
gText_Take2:: @ 0x84169B2
.string "TAKE$"
gUnknown_84169B7:: @ 0x84169B7
gText_Read2:: @ 0x84169B7
.string "READ$"
gUnknown_84169BC:: @ 0x84169BC
gText_Trade4:: @ 0x84169BC
.string "TRADE$"
gUnknown_84169C2:: @ 84169C2
gText_HP3:: @ 84169C2
.string "HP$"
gUnknown_84169C5:: @ 84169C5
gText_SpAtk3:: @ 84169C5
.string "SP. ATK$"
gUnknown_84169CD:: @ 84169CD
gText_SpDef3:: @ 84169CD
.string "SP. DEF$"
gUnknown_84169D5:: @ 84169D5
gMenuText_Confirm:: @ 84169D5
.string "OK$"
gUnknown_84169D8:: @ 0x84169D8
.string "$"
gUnknown_84169D9:: @ 84169D9
gText_PauseUntilPress:: @ 84169D9
.string "{PAUSE_UNTIL_PRESS}$"
gUnknown_84169DC:: @ 84169DC
gText_WontHaveEffect:: @ 84169DC
.string "It won't have any effect.{PAUSE_UNTIL_PRESS}$"
gUnknown_84169F8:: @ 84169F8
.string "This can't be used on\n"
.string "that POKéMON.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A1E:: @ 8416A1E
gText_PkmnCantSwitchOut:: @ 8416A1E
.string "{STR_VAR_1} can't be switched\n"
.string "out!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A3A:: @ 8416A3A
gText_PkmnAlreadyInBattle:: @ 8416A3A
.string "{STR_VAR_1} is already\n"
.string "in battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A55:: @ 8416A55
gText_PkmnAlreadySelected:: @ 8416A55
.string "{STR_VAR_1} has already been\n"
.string "selected.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A75:: @ 8416A75
gText_PkmnHasNoEnergy:: @ 8416A75
.string "{STR_VAR_1} has no energy\n"
.string "left to battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416A98:: @ 8416A98
gText_CantSwitchWithAlly:: @ 8416A98
.string "You can't switch {STR_VAR_1}'s\n"
.string "POKéMON with one of yours!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416ACB:: @ 8416ACB
gText_EggCantBattle:: @ 8416ACB
.string "An EGG can't battle!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416AE2:: @ 8416AE2
gText_CantUseUntilNewBadge:: @ 8416AE2
.string "This can't be used until a new\n"
.string "BADGE is obtained.{PAUSE_UNTIL_PRESS}$"
@@ -894,73 +894,73 @@ gUnknown_8416B3E:: @ 8416B3E
.string "No more than two POKéMON\n"
.string "may enter.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416B64:: @ 8416B64
gText_SendMailToPC:: @ 8416B64
.string "Send the removed MAIL to\n"
.string "your PC?$"
gUnknown_8416B86:: @ 8416B86
gText_MailSentToPC:: @ 8416B86
.string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416BA6:: @ 8416BA6
gText_PCMailboxFull:: @ 8416BA6
.string "Your PC's MAILBOX is full.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416BC3:: @ 8416BC3
gText_MailMessageWillBeLost:: @ 8416BC3
.string "If the MAIL is removed, the\n"
.string "message will be lost. Okay?$"
gUnknown_8416BFB:: @ 8416BFB
gText_RemoveMailBeforeItem:: @ 8416BFB
.string "MAIL must be removed before\n"
.string "holding an item.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C2A:: @ 8416C2A
gText_PkmnWasGivenItem:: @ 8416C2A
.string "{STR_VAR_1} was given the\n"
.string "{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416C49:: @ 8416C49
gText_PkmnAlreadyHoldingItemSwitch:: @ 8416C49
.string "{STR_VAR_1} is already holding\n"
.string "one {STR_VAR_2}.\p"
.string "Would you like to switch the\n"
.string "two items?$"
gUnknown_8416C8F:: @ 8416C8F
gText_PkmnNotHolding:: @ 8416C8F
.string "{STR_VAR_1} isn't holding\n"
.string "anything.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CAC:: @ 8416CAC
gText_ReceivedItemFromPkmn:: @ 8416CAC
.string "Received the {STR_VAR_2}\n"
.string "from {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CC7:: @ 8416CC7
gText_MailTakenFromPkmn:: @ 8416CC7
.string "MAIL was taken from the\n"
.string "POKéMON.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416CEA:: @ 8416CEA
gText_SwitchedPkmnItem:: @ 8416CEA
.string "The {STR_VAR_2} was taken and\n"
.string "replaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D17:: @ 8416D17
gText_PkmnHoldingItemCantHoldMail:: @ 8416D17
.string "This POKéMON is holding an\n"
.string "item. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D4F:: @ 8416D4F
gText_MailTransferredFromMailbox:: @ 8416D4F
.string "MAIL was transferred from\n"
.string "the MAILBOX.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416D78:: @ 8416D78
gText_BagFullCouldNotRemoveItem:: @ 8416D78
.string "The {STR_VAR_1} is full. The POKéMON's\n"
.string "item could not be removed.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DB3:: @ 8416DB3
gText_PkmnLearnedMove3:: @ 8416DB3
.string "{STR_VAR_1} learned\n"
.string "{STR_VAR_2}!$"
gUnknown_8416DC2:: @ 8416DC2
gText_PkmnCantLearnMove:: @ 8416DC2
.string "{STR_VAR_1} and {STR_VAR_2}\n"
.string "are not compatible.\p"
.string "{STR_VAR_2} can't be\n"
.string "learned.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416DF7:: @ 8416DF7
gText_PkmnNeedsToReplaceMove:: @ 8416DF7
.string "{STR_VAR_1} wants to learn the\n"
.string "move {STR_VAR_2}.\p"
.string "However, {STR_VAR_1} already\n"
@@ -968,74 +968,74 @@ gUnknown_8416DF7:: @ 8416DF7
.string "Should a move be deleted and\n"
.string "replaced with {STR_VAR_2}?$"
gUnknown_8416E6B:: @ 8416E6B
gText_StopLearningMove2:: @ 8416E6B
.string "Stop trying to teach\n"
.string "{STR_VAR_2}?$"
gUnknown_8416E84:: @ 8416E84
gText_MoveNotLearned:: @ 8416E84
.string "{STR_VAR_1} did not learn the\n"
.string "move {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EA4:: @ 8416EA4
gText_WhichMoveToForget:: @ 8416EA4
.string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$"
gUnknown_8416EC6:: @ 8416EC6
gText_12PoofForgotMove:: @ 8416EC6
.string "1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p"
.string "{STR_VAR_1} forgot how to\n"
.string "use {STR_VAR_2}.\p"
.string "And...{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F10:: @ 8416F10
gText_PkmnAlreadyKnows:: @ 8416F10
.string "{STR_VAR_1} already knows\n"
.string "{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F27:: @ 8416F27
gText_PkmnHPRestoredByVar2:: @ 8416F27
.string "{STR_VAR_1}'s HP was restored\n"
.string "by {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F4E:: @ 8416F4E
gText_PkmnCuredOfPoison:: @ 8416F4E
.string "{STR_VAR_1} was cured of its\n"
.string "poisoning.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F6F:: @ 8416F6F
gText_PkmnCuredOfParalysis:: @ 8416F6F
.string "{STR_VAR_1} was cured of\n"
.string "paralysis.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F8C:: @ 8416F8C
gText_PkmnWokeUp2:: @ 8416F8C
.string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416F9A:: @ 8416F9A
gText_PkmnBurnHealed:: @ 8416F9A
.string "{STR_VAR_1}'s burn was healed.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FB2:: @ 8416FB2
gText_PkmnThawedOut:: @ 8416FB2
.string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FC7:: @ 8416FC7
gText_PPWasRestored:: @ 8416FC7
.string "PP was restored.{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FDA:: @ 0x8416FDA
.string "{STR_VAR_1}は\n"
.string "げんきを とりもどした!{PAUSE_UNTIL_PRESS}$"
gUnknown_8416FED:: @ 8416FED
gText_PkmnBecameHealthy:: @ 8416FED
.string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417002:: @ 8417002
gText_MovesPPIncreased:: @ 8417002
.string "{STR_VAR_1}'s PP increased.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417017:: @ 8417017
gText_PkmnElevatedToLvVar2:: @ 8417017
.string "{STR_VAR_1} was elevated to\n"
.string "Lv. {STR_VAR_2}.$"
gUnknown_8417032:: @ 8417032
gText_PkmnBaseVar2StatIncreased:: @ 8417032
.string "{STR_VAR_1}'s base {STR_VAR_2}\n"
.string "stat was raised.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417052:: @ 8417052
gText_PkmnSnappedOutOfConfusion:: @ 8417052
.string "{STR_VAR_1} snapped out of its\n"
.string "confusion.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417075:: @ 8417075
gText_PkmnGotOverInfatuation:: @ 8417075
.string "{STR_VAR_1} got over its\n"
.string "infatuation.{PAUSE_UNTIL_PRESS}$"
@@ -1044,144 +1044,144 @@ gUnknown_8417094:: @ 0x8417094
.string "POKéMON for battle.$"
.align 2
gUnknown_84170BC:: @ 84170BC
gText_PkmnCantBeTradedNow:: @ 84170BC
.string "That POKéMON can't be traded\n"
.string "now.$"
.align 2
gUnknown_84170E0:: @ 84170E0
gText_EggCantBeTradedNow:: @ 84170E0
.string "An EGG can't be traded now.$"
.align 2
gUnknown_84170FC:: @ 0x84170FC
gText_OtherTrainersPkmnCantBeTraded:: @ 0x84170FC
.string "The other TRAINER's POKéMON\n"
.string "can't be traded now.$"
.align 2
gUnknown_8417130:: @ 0x8417130
gText_OtherTrainerCantAcceptPkmn:: @ 0x8417130
.string "The other TRAINER can't accept\n"
.string "that POKéMON now.$"
.align 2
gUnknown_8417164:: @ 0x8417164
gText_CantTradeWithTrainer:: @ 0x8417164
.string "You can't trade with that\n"
.string "TRAINER now.$"
.align 2
gUnknown_841718C:: @ 0x841718C
gText_NotPkmnOtherTrainerWants:: @ 0x841718C
.string "That isn't the type of POKéMON\n"
.string "that the other TRAINER wants.$"
.align 2
gUnknown_84171CC:: @ 0x84171CC
gText_ThatIsntAnEgg:: @ 0x84171CC
.string "That isn't an EGG.$"
gUnknown_84171DF:: @ 0x84171DF
gText_ChoosePokemon:: @ 0x84171DF
.string "Choose a POKéMON.$"
gUnknown_84171F1:: @ 0x84171F1
gText_MoveToWhere:: @ 0x84171F1
.string "Move to where?$"
gUnknown_8417200:: @ 0x8417200
gText_TeachWhichPokemon:: @ 0x8417200
.string "Teach which POKéMON?$"
gUnknown_8417215:: @ 0x8417215
gText_UseOnWhichPokemon:: @ 0x8417215
.string "Use on which POKéMON?$"
gUnknown_841722B:: @ 0x841722B
gText_GiveToWhichPokemon:: @ 0x841722B
.string "Give to which POKéMON?$"
gUnknown_8417242:: @ 0x8417242
gText_DoWhatWithPokemon:: @ 0x8417242
.string "Do what with this {PKMN}?$"
gUnknown_8417258:: @ 0x8417258
gText_NothingToCut:: @ 0x8417258
.string "There's nothing to CUT.$"
gUnknown_8417270:: @ 0x8417270
gText_CantSurfHere:: @ 0x8417270
.string "No SURFING here!$"
gUnknown_8417281:: @ 0x8417281
gText_AlreadySurfing:: @ 0x8417281
.string "You're already SURFING.$"
gUnknown_8417299:: @ 0x8417299
gText_CantUseHere:: @ 0x8417299
.string "Can't use that here.$"
gUnknown_84172AE:: @ 0x84172AE
gText_RestoreWhichMove:: @ 0x84172AE
.string "Restore which move?$"
gUnknown_84172C2:: @ 0x84172C2
gText_BoostPp:: @ 0x84172C2
.string "Boost PP of which?$"
gUnknown_84172D5:: @ 0x84172D5
gText_DoWhatWithItem:: @ 0x84172D5
.string "Do what with an item?$"
gUnknown_84172EB:: @ 0x84172EB
gText_NoPokemonForBattle:: @ 0x84172EB
.string "No battling this way!$"
gUnknown_8417301:: @ 0x8417301
gText_ChoosePokemon2:: @ 0x8417301
.string "Choose a POKéMON.$"
gUnknown_8417313:: @ 0x8417313
gText_NotEnoughHp:: @ 0x8417313
.string "Not enough HP‥$"
gUnknown_8417322:: @ 0x8417322
gText_ThreePkmnAreNeeded:: @ 0x8417322
.string "Three {PKMN} are needed.$"
gUnknown_8417337:: @ 0x8417337
gText_PokemonCantBeSame:: @ 0x8417337
.string "{PKMN} can't be the same.$"
gUnknown_841734D:: @ 0x841734D
gText_NoIdenticalHoldItems:: @ 0x841734D
.string "No same hold items!$"
gUnknown_8417361:: @ 0x8417361
gText_CurrentIsTooFast:: @ 0x8417361
.string "The current is much too fast!$"
gUnknown_841737F:: @ 0x841737F
gText_DoWhatWithMail:: @ 0x841737F
.string "Do what with the MAIL?$"
gUnknown_8417396:: @ 0x8417396
gText_ChoosePokemonCancel:: @ 0x8417396
.string "Choose POKéMON or CANCEL.$"
gUnknown_84173B0:: @ 0x84173B0
gText_ChoosePokemonConfirm:: @ 0x84173B0
.string "Choose POKéMON and confirm.$"
gUnknown_84173CC:: @ 0x84173CC
gText_TwoPokemonAreNeeded:: @ 0x84173CC
.string "Two POKéMON are needed.$"
gUnknown_84173E4:: @ 0x84173E4
gText_EnjoyCycling:: @ 0x84173E4
.string "Let's enjoy cycling!$"
gUnknown_84173F9:: @ 0x84173F9
gText_InUseAlready_PM:: @ 0x84173F9
.string "This is in use already.$"
gUnknown_8417411:: @ 0x8417411
gText_NoUse:: @ 0x8417411
.string "No use.$"
gUnknown_8417419:: @ 0x8417419
gText_Able:: @ 0x8417419
.string "ABLE$"
gUnknown_841741E:: @ 0x841741E
gText_First_PM:: @ 0x841741E
.string "FIRST$"
gUnknown_8417424:: @ 0x8417424
gText_Second_PM:: @ 0x8417424
.string "SECOND$"
gUnknown_841742B:: @ 0x841742B
gText_Third_PM:: @ 0x841742B
.string "THIRD$"
gUnknown_8417431:: @ 0x8417431
gText_Able2:: @ 0x8417431
.string "ABLE$"
gUnknown_8417436:: @ 0x8417436
gText_NotAble:: @ 0x8417436
.string "NOT ABLE$"
gUnknown_841743F:: @ 0x841743F
gText_Able3:: @ 0x841743F
.string "ABLE!$"
gUnknown_8417445:: @ 0x8417445
gText_NotAble2:: @ 0x8417445
.string "NOT ABLE!$"
gUnknown_841744F:: @ 0x841744F
gText_Learned:: @ 0x841744F
.string "LEARNED$"
gUnknown_8417457:: @ 8417457
@@ -1197,54 +1197,54 @@ gUnknown_8417494:: @ 8417494
.string "You also choose POKéMON here if\n"
.string "you want to use an item on one.{PAUSE_UNTIL_PRESS}$"
gUnknown_8417533:: @ 0x8417533
gText_CutATreeOrGrass:: @ 0x8417533
.string "Cut a tree or grass.$"
gUnknown_8417548:: @ 0x8417548
gText_FlyToAKnownTown:: @ 0x8417548
.string "Fly to a known town.$"
gUnknown_841755D:: @ 0x841755D
gText_TravelOnWater:: @ 0x841755D
.string "Travel on water.$"
gUnknown_841756E:: @ 0x841756E
gText_MoveHeavyBoulders:: @ 0x841756E
.string "Move heavy boulders.$"
gUnknown_8417583:: @ 0x8417583
gText_LightUpDarkness:: @ 0x8417583
.string "Light up darkness.$"
gUnknown_8417596:: @ 0x8417596
gText_ShatterACrackedRock:: @ 0x8417596
.string "Shatter a cracked rock.$"
gUnknown_84175AE:: @ 0x84175AE
gText_ClimbAWaterfall:: @ 0x84175AE
.string "Climb a waterfall.$"
gUnknown_84175C1:: @ 0x84175C1
.string "すいちゅうに もぐる$"
gUnknown_84175CC:: @ 0x84175CC
gText_EscapeFromHere:: @ 0x84175CC
.string "Escape from here.$"
gUnknown_84175DE:: @ 0x84175DE
gText_LureWildPokemon:: @ 0x84175DE
.string "Lure wild POKéMON.$"
gUnknown_84175F1:: @ 0x84175F1
gText_ShareHp:: @ 0x84175F1
.string "Share HP.$"
gUnknown_84175FB:: @ 0x84175FB
gText_ReturnToAHealingSpot:: @ 0x84175FB
.string "Return to a healing spot.$"
gUnknown_8417615:: @ 8417615
gText_EscapeFromHereAndReturnTo:: @ 8417615
.string "Want to escape from here and return\n"
.string "to {STR_VAR_1}?$"
gUnknown_8417640:: @ 8417640
gText_ReturnToHealingSpot:: @ 8417640
.string "Want to return to the healing spot\n"
.string "used last in {STR_VAR_1}?$"
gUnknown_8417674:: @ 8417674
gText_Attack3:: @ 8417674
.string "ATTACK$"
gUnknown_841767B:: @ 841767B
gText_Defense3:: @ 841767B
.string "DEFENSE$"
gUnknown_8417683:: @ 0x8417683
@@ -1253,16 +1253,16 @@ gUnknown_8417683:: @ 0x8417683
gUnknown_8417688:: @ 0x8417688
.string "とくぼう$"
gUnknown_841768D:: @ 841768D
gText_Speed2:: @ 841768D
.string "SPEED$"
gUnknown_8417693:: @ 0x8417693
.string "HP$"
gUnknown_8417696:: @ 8417696
gText_PkmnCantParticipate:: @ 8417696
.string "That POKéMON can't participate.{PAUSE_UNTIL_PRESS}$"
gUnknown_84176B8:: @ 84176B8
gText_CancelParticipation:: @ 84176B8
.string "Cancel participation?$"
gUnknown_84176CE:: @ 0x84176CE
@@ -3266,7 +3266,7 @@ gText_Badges:: @ 841B6EC
gTextJPDummy_Ko:: @ 841B6F3
.string "$"
gUnknown_841B6F4:: @ 0x841B6F4
gText_Register:: @ 0x841B6F4
.string "REGISTER$"
gText_HatchedFromEgg:: @ 841B6FD
@@ -3315,10 +3315,13 @@ gUnknown_841CB5A:: @ 841CB5A
gUnknown_841CB63:: @ 841CB63
.string "POKéMON JUMP RECORDS$"
gUnknown_841CB78::
.string "Jumps in a row:$"
gUnknown_841CB88::
.string "Best score:$"
gUnknown_841CB94::
.string "EXCELLENTS in a row:$"
gUnknown_841CBA9:: @ 841CBA9
@@ -3402,37 +3405,55 @@ gUnknown_841CE1C:: @ 841CE1C
gUnknown_841CE24:: @ 841CE24
.string "Communication standby…$"
.string " Are you ready to BERRY-CRUSH?\n"
.align 2
gUnknown_841CE3C:: @ 841CE3C
.string "Are you ready to BERRY-CRUSH?\n"
.string "Please pick a BERRY for use.\p"
.string "$"
.align 2
gUnknown_841CE78:: @ 841CE78
.string "Please wait while each member\n"
.string "chooses a BERRY.$"
.string " {PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n"
.align 2
gUnknown_841CEA8:: @ 841CEA8
.string "{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\n"
.string "silky-smooth BERRY POWDER.{RESUME_MUSIC}\p"
.string "Your total amount of BERRY POWDER\n"
.string "is {STR_VAR_2}.\p"
.string "$"
.string " Recording your game results in the\n"
.align 2
gUnknown_841CF14:: @ 841CF14
.string "Recording your game results in the\n"
.string "save file.\n"
.string "Please wait.$"
.string " Want to play BERRY CRUSH again?$"
.align 2
gUnknown_841CF50:: @ 841CF50
.string "Want to play BERRY CRUSH again?$"
.align 2
gUnknown_841CF70:: @ 841CF70
.string "You have no BERRIES.\n"
.string "The game will be canceled.$"
.align 2
gUnknown_841CFA0:: @ 841CFA0
.string "A member dropped out.\n"
.string "The game will be canceled.$"
.string " Time's up.\p"
.align 2
gUnknown_841CFD4:: @ 841CFD4
.string "Time's up.\p"
.string "Good BERRY POWDER could not be\n"
.string "made…\p"
.string "$"
.string " Communication standby…$"
.align 2
gUnknown_841D008:: @ 841D008
.string "Communication standby…$"
.align 2
gUnknown_841D020:: @ 841D020
@@ -3441,14 +3462,17 @@ gUnknown_841D020:: @ 841D020
gUnknown_841D02C:: @ 841D02C
.string "1. {DYNAMIC 0x00}$"
gUnknown_841D032:: @ 0x841D032
.string " times$"
.align 2
gUnknown_841D034:: @ 0x841D034
.string " times$"
gUnknown_841D03B:: @ 0x841D03B
.string " {STR_VAR_1}.{STR_VAR_2}$"
.align 2
gUnknown_841D03C:: @ 0x841D03C
.string "{STR_VAR_1}.{STR_VAR_2}$"
gUnknown_841D042:: @ 0x841D042
.string " {STR_VAR_1} BERRY$"
.align 2
gUnknown_841D044:: @ 0x841D044
.string "{STR_VAR_1} BERRY$"
.align 2
gUnknown_841D050:: @ 841D050
@@ -3489,20 +3513,25 @@ gUnknown_841D098:: @ 841D098
gUnknown_841D0A4:: @ 841D0A4
.string "{STR_VAR_1}サ$"
.align 2
gUnknown_841D0A8:: @ 841D0A8
.string "No. of Presses Rankings$"
.align 2
gUnknown_841D0C0:: @ 841D0C0
.string "Crushing Results$"
gUnknown_841D0D1:: @ 0x841D0D1
.string " Neatness Rankings$"
.align 2
gUnknown_841D0D4:: @ 0x841D0D4
.string "Neatness Rankings$"
gUnknown_841D0E6:: @ 0x841D0E6
.string " Cooperative Rankings$"
.align 2
gUnknown_841D0E8:: @ 0x841D0E8
.string "Cooperative Rankings$"
gUnknown_841D0FD:: @ 0x841D0FD
.string " Pressing-Power Rankings$"
.align 2
gUnknown_841D100:: @ 0x841D100
.string "Pressing-Power Rankings$"
gUnknown_841D118:: @ 841D118
.string "BERRY CRUSH$"
data/union_room_chat.s
+310 -22
View File
@@ -7,64 +7,352 @@
.align 2
gUnknown_845A880:: @ 845A880
.incbin "baserom.gba", 0x45A880, 0x28
.4byte sub_8128640
.4byte sub_81286C4
.4byte sub_81287B4
.4byte sub_81288D4
.4byte sub_8128DA4
.4byte sub_8128E78
.4byte sub_8128AA0
.4byte sub_8128C04
.4byte sub_8128CA8
.4byte sub_8128FB8
gUnknown_845A8A8:: @ 845A8A8
.incbin "baserom.gba", 0x45A8A8, 0x4
.byte 0x09, 0x09, 0x09, 0x09
gUnknown_845A8AC:: @ 845A8AC
.incbin "baserom.gba", 0x45A8AC, 0x100
.byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
.byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24
.byte 0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02
.byte 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
.byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
.byte 0x13, 0x14, 0x2a, 0x2b, 0x2c, 0x2d, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x36, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x53, 0x54, 0x55, 0x56, 0x00
.byte 0x00, 0x00, 0x6f, 0x5b, 0x5c, 0x5d, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x85, 0x86, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7
.byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf
.byte 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7
.byte 0xb8, 0xb9, 0xba, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9
.byte 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1
.byte 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9
.byte 0xea, 0xeb, 0xec, 0xed, 0xee, 0xbb, 0xbc, 0xbd
.byte 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5
.byte 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd
.byte 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xef
.byte 0xf0, 0xf4, 0xf5, 0xf6, 0xf1, 0xf2, 0xf3, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_845A9AC:: @ 845A9AC
.incbin "baserom.gba", 0x45A9AC, 0x78
.4byte gUnknown_847AAC1
.4byte gUnknown_847AAC7
.4byte gUnknown_847AACD
.4byte gUnknown_847AAD3
.4byte gUnknown_847AAD9
.4byte gUnknown_847AADF
.4byte gUnknown_847AAE5
.4byte gUnknown_847AAEB
.4byte gUnknown_847AAF1
.4byte gUnknown_847AAF7
.4byte gUnknown_847AAFD
.4byte gUnknown_847AB03
.4byte gUnknown_847AB09
.4byte gUnknown_847AB0F
.4byte gUnknown_847AB15
.4byte gUnknown_847AB1B
.4byte gUnknown_847AB21
.4byte gUnknown_847AB27
.4byte gUnknown_847AB2D
.4byte gUnknown_847AB33
.4byte gUnknown_847AB41
.4byte gUnknown_847AB4C
.4byte gUnknown_847AB57
.4byte gUnknown_847AB62
.4byte gUnknown_847AB6B
.4byte gUnknown_847AB76
.4byte gUnknown_847AB81
.4byte gUnknown_847AB8C
.4byte gUnknown_847AB97
.4byte gUnknown_847ABA2
gUnknown_845AA24:: @ 845AA24
.incbin "baserom.gba", 0x45AA24, 0x20
.incbin "graphics/union_room_chat/unk_845AA24.gbapal"
gUnknown_845AA44:: @ 845AA44
.incbin "baserom.gba", 0x45AA44, 0x20
.incbin "graphics/union_room_chat/unk_845AA44.gbapal"
gUnknown_845AA64:: @ 845AA64
.incbin "baserom.gba", 0x45AA64, 0x20
.incbin "graphics/union_room_chat/unk_845AA64.gbapal"
gUnknown_845AA84:: @ 845AA84
.incbin "baserom.gba", 0x45AA84, 0x10
.4byte 0x00000070
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 7,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
.4byte 0x000011fd
@ {
@ .bg = 1,
@ .charBaseIndex = 3,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 1,
@ .baseTile = 0x0000
@ }
.4byte 0x0000217a
@ {
@ .bg = 2,
@ .charBaseIndex = 2,
@ .mapBaseIndex = 23,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 2,
@ .baseTile = 0x0000
@ }
.4byte 0x000070f7
@ {
@ .bg = 3,
@ .charBaseIndex = 1,
@ .mapBaseIndex = 15,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 3,
@ .baseTile = 0x0001
@ }
gUnknown_845AA94:: @ 845AA94
.incbin "baserom.gba", 0x45AA94, 0x28
.byte 3, 8, 1, 21, 19, 15
.2byte 0x0001
.byte 1, 9, 18, 15, 2, 12
.2byte 0x007a
.byte 1, 0, 2, 6, 15, 7
.2byte 0x0020
.byte 0, 1, 2, 7, 9, 14
.2byte 0x0013
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_845AABC:: @ 845AABC
.incbin "baserom.gba", 0x45AABC, 0xA8
.2byte 0x00
.align 2
.4byte sub_8129CA0
.2byte 0x03
.align 2
.4byte sub_8129D40
.2byte 0x04
.align 2
.4byte sub_8129D78
.2byte 0x05
.align 2
.4byte sub_8129DB0
.2byte 0x01
.align 2
.4byte sub_8129E1C
.2byte 0x06
.align 2
.4byte sub_8129E28
.2byte 0x07
.align 2
.4byte sub_8129E74
.2byte 0x08
.align 2
.4byte sub_8129EB8
.2byte 0x09
.align 2
.4byte sub_8129F24
.2byte 0x0a
.align 2
.4byte sub_8129FCC
.2byte 0x0b
.align 2
.4byte sub_812A074
.2byte 0x0c
.align 2
.4byte sub_812A0B0
.2byte 0x02
.align 2
.4byte sub_812A18C
.2byte 0x0d
.align 2
.4byte sub_812A1B8
.2byte 0x12
.align 2
.4byte sub_812A1FC
.2byte 0x13
.align 2
.4byte sub_812A240
.2byte 0x0e
.align 2
.4byte sub_812A294
.2byte 0x0f
.align 2
.4byte sub_812A2E4
.2byte 0x10
.align 2
.4byte sub_812A334
.2byte 0x11
.align 2
.4byte sub_812A378
.2byte 0x14
.align 2
.4byte sub_812A3D0
gUnknown_845AB64:: @ 845AB64
.incbin "baserom.gba", 0x45AB64, 0x84
.4byte gUnknown_841B366
.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
.4byte gUnknown_841B375
.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
.4byte gUnknown_841B38A
.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
.4byte gUnknown_841B39E
.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
.4byte gUnknown_841B3E9
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.align 2
.4byte gUnknown_841B3FB
.byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00
.align 2
.4byte gUnknown_841B426
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
.align 2
.4byte gUnknown_841B469
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
.align 2
.4byte gUnknown_841B4A4
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
.align 2
.4byte gUnknown_841B4C6
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x01, 0x01
.align 2
.4byte gUnknown_841B4D9
.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
.align 2
gUnknown_845ABE8:: @ 845ABE8
.incbin "baserom.gba", 0x45ABE8, 0x4
.string "…$"
.align 2
gUnknown_845ABEC:: @ 845ABEC
.incbin "baserom.gba", 0x45ABEC, 0x2A
.4byte gUnknown_841B33D, 0
.4byte gUnknown_841B343, 0
.4byte gUnknown_841B350, 0
.4byte gUnknown_841B358, 0
.4byte gUnknown_841B361, 0
gUnknown_845AC16:: @ 845AC16
.incbin "baserom.gba", 0x45AC16, 0x342
gUnknown_845AC14:: @ 845AC14
.incbin "graphics/union_room_chat/unk_845AC14.gbapal"
gUnknown_845AC34::
.incbin "graphics/union_room_chat/unk_845AC34.4bpp.lz"
gUnknown_845AEB8::
.incbin "graphics/union_room_chat/unk_845AEB8.4bpp.lz"
gUnknown_845AED8::
.incbin "graphics/union_room_chat/unk_845AED8.4bpp.lz"
gUnknown_845AF04::
.incbin "graphics/union_room_chat/unk_845AF04.4bpp.lz"
gUnknown_845AF58:: @ 845AF58
.incbin "baserom.gba", 0x45AF58, 0x28
obj_tiles gUnknown_845AC34, 0x1000, 0
obj_tiles gUnknown_845AED8, 0x0040, 1
obj_tiles gUnknown_845AEB8, 0x0040, 2
obj_tiles gUnknown_845AF04, 0x0080, 3
obj_tiles gUnknown_8EA1A50, 0x0400, 4
gUnknown_845AF80:: @ 845AF80
.incbin "baserom.gba", 0x45AF80, 0x40
obj_pal gUnknown_845AC14, 0
gOamData_845AF88::
.4byte 0xc0004000, 0x00000400
gAnimCmd_845AF90::
obj_image_anim_frame 0x0000, 30
obj_image_anim_end
gAnimCmd_845AF98::
obj_image_anim_frame 0x0020, 30
obj_image_anim_end
gAnimCmd_845AFA0::
obj_image_anim_frame 0x0040, 30
obj_image_anim_end
gAnimCmd_845AFA8::
obj_image_anim_frame 0x0060, 30
obj_image_anim_end
gSpriteAnimTable_845AFB0::
.4byte gAnimCmd_845AF90
.4byte gAnimCmd_845AF98
.4byte gAnimCmd_845AFA0
.4byte gAnimCmd_845AFA8
gUnknown_845AFC0:: @ 845AFC0
.incbin "baserom.gba", 0x45AFC0, 0x20
spr_template 0, 0, gOamData_845AF88, gSpriteAnimTable_845AFB0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gOamData_845AFD8::
.4byte 0x00008000, 0x00000800
gUnknown_845AFE0:: @ 845AFE0
.incbin "baserom.gba", 0x45AFE0, 0x18
spr_template 2, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B09C
gUnknown_845AFF8:: @ 845AFF8
.incbin "baserom.gba", 0x45AFF8, 0x58
spr_template 1, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B0D4
gOamData_845B010::
.4byte 0x40000000, 0x00000800
gOamData_845B018::
.4byte 0x80004000, 0x00000800
gAnimCmd_845B020::
obj_image_anim_frame 0x0000, 2
obj_image_anim_end
gAnimCmd_845B028::
obj_image_anim_frame 0x0008, 2
obj_image_anim_end
gAnimCmd_845B030::
obj_image_anim_frame 0x0010, 2
obj_image_anim_end
gAnimCmd_845B038::
obj_image_anim_frame 0x0018, 2
obj_image_anim_end
gSpriteAnimTable_845B040::
.4byte gAnimCmd_845B020
.4byte gAnimCmd_845B028
.4byte gAnimCmd_845B030
.4byte gAnimCmd_845B038
gUnknown_845B050:: @ 845B050
.incbin "baserom.gba", 0x45B050, 0x18
spr_template 3, 0, gOamData_845B010, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_845B068:: @ 845B068
.incbin "baserom.gba", 0x45B068, 0x18
spr_template 4, 0, gOamData_845B018, gSpriteAnimTable_845B040, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
graphics/field_effects/unk_83BFBE4.bin
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.0 KiB

graphics/field_effects/unk_83C0408.bin
BIN
View File
Binary file not shown.
graphics/field_effects/unk_83C0C00.bin
BIN
View File
Binary file not shown.
graphics/field_effects/unk_83C139C.bin
BIN
View File
Binary file not shown.
graphics/field_effects/unk_83C1BB8.bin
BIN
View File
Binary file not shown.
graphics/field_effects/unk_83C2380.bin
BIN
View File
Binary file not shown.
graphics/field_effects/unk_83C2CE0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
172 230 255
115 205 255
74 180 255
148 148 148
197 197 197
213 213 213
222 222 222
164 164 164
255 0 255
255 0 255
255 0 255
180 180 180
230 230 230
246 246 246
255 255 255
graphics/field_effects/unk_83C2D00.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
65 148 255
180 222 255
115 205 246
131 197 255
82 189 246
172 238 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/field_effects/unk_83C2D20.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 230 139
189 131 74
238 197 123
213 164 98
164 106 49
255 246 164
222 205 164
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/field_effects/unk_83C2D40.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 941 B

graphics/field_effects/unk_83C3540.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

graphics/field_effects/unk_83C3D40.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 653 B

graphics/field_effects/unk_83C4540.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 179 B

graphics/field_effects/unk_83C4580.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

graphics/field_effects/unk_83C45C0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 366 B

graphics/field_effects/unk_83C55C0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 271 B

graphics/field_effects/unk_83C5BC0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

graphics/interface/hold_icons.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
57 205 106
255 255 255
213 213 255
148 148 180
255 246 156
222 222 115
246 82 41
164 90 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
98 98 98
graphics/interface/hold_icons.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 B

graphics/interface/party_menu_cancel_button.bin
+2
View File
@@ -0,0 +1,2 @@
           
graphics/interface/party_menu_confirm_button.bin
+1
View File
@@ -0,0 +1 @@
#$
graphics/interface/select_button.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 191 B

graphics/interface/wireless_link_icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 308 B

graphics/item_menu/bagmap_0.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_1.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_2.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_3.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_4.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_5.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_6.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_7.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_8.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_9.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_A.bin
BIN
View File
Binary file not shown.
graphics/item_menu/bagmap_B.bin
BIN
View File
Binary file not shown.
graphics/link_games/unk_846B794.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
246 246 255
0 0 0
222 222 213
255 156 24
255 222 189
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/link_games/unk_846B7B4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
106 222 156
106 230 230
139 230 255
156 238 255
197 246 255
189 213 131
230 213 115
238 230 131
246 246 156
222 222 172
106 230 172
255 0 255
255 0 255
255 0 255
255 0 255
graphics/link_games/unk_846B7D4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 582 B

graphics/link_games/unk_846BA00.bin
BIN
View File
Binary file not shown.
graphics/link_games/unk_846BBB0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
213 213 213
32 98 49
98 156 115
90 205 148
139 238 189
139 57 0
189 106 49
16 16 16
230 74 65
255 131 115
156 246 139
222 205 49
255 238 82
65 164 24
106 205 65
255 255 255
graphics/link_games/unk_846BBD0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

graphics/link_games/unk_846C520.bin
BIN
View File
Binary file not shown.
graphics/link_games/unk_846C8D8.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
148 197 115
172 222 123
213 180 57
238 205 65
230 164 131
246 189 172
98 98 82
164 148 90
205 189 82
255 238 74
156 164 230
90 90 106
172 148 106
230 205 123
180 189 246
graphics/link_games/unk_846C8F8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

graphics/link_games/unk_846D3A8.bin
BIN
View File
Binary file not shown.
graphics/link_games/unk_846D9E4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
65 148 74
82 180 74
106 205 74
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
98 98 82
205 189 82
255 246 82
255 255 255
238 172 131
238 230 131
graphics/link_games/unk_846DA04.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
49 123 57
65 139 57
82 164 57
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/link_games/unk_846DA24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

graphics/link_games/unk_846DB44.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

graphics/link_games/unk_846DD18.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

graphics/link_games/unk_846DE48.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 256 B

graphics/link_games/unk_846DF44.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 335 B

graphics/link_games/unk_846E4D0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 639 B

graphics/link_games/unk_846E7FC.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

graphics/link_games/unk_846EB78.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 342 B

graphics/link_games/unk_846ECC4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 295 B

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