Merge pull request #32 from Diegoisawesome/master

Extract baserom calls from data2.s and begin tidying up strings.s
This commit is contained in:
yenatch 2017-09-16 17:57:50 -04:00 committed by GitHub
commit d574795b72
158 changed files with 8829 additions and 3714 deletions

View File

@ -2590,7 +2590,7 @@ ReturnEmptyStringIfNull: @ 80B1C6C
push {lr}
cmp r0, 0
bne _080B1C74
ldr r0, =gUnknown_085E8D03
ldr r0, =gText_EmptyString2
_080B1C74:
pop {r1}
bx r1

View File

@ -7333,7 +7333,7 @@ _08083564:
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E
ldr r1, =gText_Space
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
@ -8165,7 +8165,7 @@ _08083C84:
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E
ldr r1, =gText_Space
bl StringAppend
ldr r0, [r7]
adds r0, 0x9F

View File

@ -666,7 +666,7 @@ _081781C8:
b _08178242
.pool
_08178230:
ldr r2, =gUnknown_085E8D34
ldr r2, =gText_ThreeMarks
str r7, [sp]
str r0, [sp, 0x4]
str r0, [sp, 0x8]
@ -724,7 +724,7 @@ itemid_copy_name: @ 8178250
b _081782C2
.pool
_081782B0:
ldr r2, =gUnknown_085E8D34
ldr r2, =gText_ThreeMarks
str r5, [sp]
str r0, [sp, 0x4]
str r0, [sp, 0x8]

View File

@ -6447,7 +6447,7 @@ sub_80DAF1C: @ 80DAF1C
adds r5, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_085E8D3E
ldr r1, =gText_Slash
add r0, sp, 0x4
bl StringCopy
lsls r1, r5, 6
@ -7100,7 +7100,7 @@ _080DB472:
ldr r1, [r0]
movs r0, 0xA
bl sub_80DEB70
ldr r1, =gUnknown_085E8D3E
ldr r1, =gText_Slash
movs r0, 0x9
bl sub_80DEB70
add sp, 0x10
@ -10296,7 +10296,7 @@ _080DCD92:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r2, 0
ldr r1, =gUnknown_085E8D40
ldr r1, =gText_OneDash
bl StringCopy
adds r2, r0, 0
_080DCDBC:
@ -10339,7 +10339,7 @@ _080DCDEA:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r2, 0
ldr r1, =gUnknown_085E8D40
ldr r1, =gText_OneDash
bl StringCopy
adds r2, r0, 0
_080DCE14:

View File

@ -296,7 +296,7 @@ _080F5A96:
adds r1, r4, 0
movs r2, 0
bl sub_80F7ED0
ldr r1, =gUnknown_085E8D3E
ldr r1, =gText_Slash
adds r0, r6, 0
bl StringCopy
adds r1, r7, 0

View File

@ -383,7 +383,7 @@ sub_813010C: @ 813010C
adds r0, r4, 0
adds r1, r5, 0
bl sub_818E868
ldr r1, =gUnknown_085E8D5E
ldr r1, =gText_Space
adds r0, r4, 0
bl StringAppend
ldr r1, =gUnknown_085B07D4

View File

@ -653,7 +653,7 @@ _08126F0C:
adds r1, r0
movs r2, 0x1E
ldrsh r0, [r1, r2]
ldr r2, =gUnknown_085E8CF0
ldr r2, =gText_Cancel
cmp r0, 0x2
bne _08126F2C
ldr r2, =gUnknown_085EB7EA
@ -1216,7 +1216,7 @@ _081273D6:
adds r4, r3
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E8CF0
ldr r1, =gText_Cancel
bl StringCopy
ldr r0, [r5]
lsls r2, r6, 3
@ -1610,7 +1610,7 @@ sub_8127744: @ 8127744
ldrb r0, [r0]
cmp r4, r0
bcc _08127770
ldr r2, =gUnknown_085E8D62
ldr r2, =gText_GoBackPrevMenu
b _08127782
.pool
_08127770:

View File

@ -1235,7 +1235,7 @@ _08173FD0:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085E8C14
ldr r2, =gText_LeagueChamp
str r5, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
@ -1858,14 +1858,14 @@ _0817454E:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8C00
ldr r1, =gText_HOFNumber
adds r0, r5, 0
bl StringExpandPlaceholders
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0
bgt _081745C0
ldr r1, =gUnknown_085E8574
ldr r1, =gText_PickCancel
movs r0, 0x1
str r0, [sp]
adds r0, r5, 0
@ -1875,7 +1875,7 @@ _0817454E:
b _081745D0
.pool
_081745C0:
ldr r1, =gUnknown_085E855C
ldr r1, =gText_PickNextCancel
movs r0, 0x1
str r0, [sp]
adds r0, r5, 0
@ -2321,14 +2321,14 @@ sub_81749A0: @ 81749A0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085E8588
ldr r0, =gText_UnkCtrlF800Exit
movs r1, 0x8
movs r2, 0x1
bl sub_8198180
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085E8BDC
ldr r2, =gText_HOFCorrupted
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -2391,7 +2391,7 @@ sub_8174A38: @ 8174A38
bl FillWindowPixelBuffer
movs r0, 0
bl PutWindowTilemap
ldr r4, =gUnknown_085E8B3E
ldr r4, =gText_WelcomeToHOF
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xD0
@ -2434,7 +2434,7 @@ sub_8174A88: @ 8174A88
lsls r0, 1
cmp r1, r0
beq _08174B30
ldr r1, =gUnknown_085E8C36
ldr r1, =gText_Number
add r0, sp, 0xC
bl StringCopy
adds r6, r0, 0
@ -2604,7 +2604,7 @@ _08174C0A:
movs r2, 0x80
movs r3, 0x1
bl box_print
ldr r1, =gUnknown_085E8C3B
ldr r1, =gText_Level
add r0, sp, 0xC
bl StringCopy
adds r6, r0, 0
@ -2622,7 +2622,7 @@ _08174C0A:
movs r2, 0x24
movs r3, 0x11
bl box_print
ldr r1, =gUnknown_085E8C4D
ldr r1, =gText_IDNumber
add r0, sp, 0xC
bl StringCopy
adds r6, r0, 0
@ -2675,7 +2675,7 @@ sub_8174C98: @ 8174C98
negs r1, r1
mov r9, r1
str r1, [sp, 0x4]
ldr r0, =gUnknown_085E8C48
ldr r0, =gText_Name
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -2711,7 +2711,7 @@ sub_8174C98: @ 8174C98
str r0, [sp]
movs r7, 0
str r7, [sp, 0x4]
ldr r0, =gUnknown_085E8C4D
ldr r0, =gText_IDNumber
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -2787,7 +2787,7 @@ sub_8174C98: @ 8174C98
str r0, [sp]
mov r1, r9
str r1, [sp, 0x4]
ldr r0, =gUnknown_085E84CE
ldr r0, =gText_MainMenuTime
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1

View File

@ -157,7 +157,7 @@ DisplayCannotUseItemMessage: @ 80FD164
b _080FD1BE
.pool
_080FD1A0:
ldr r1, =gUnknown_085E8F31
ldr r1, =gText_DadsAdvice
ldr r2, =sub_81C6714
adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid
@ -183,7 +183,7 @@ DisplayDadsAdviceCannotUseItemMessage: @ 80FD1C8
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_085E8F31
ldr r2, =gText_DadsAdvice
bl DisplayCannotUseItemMessage
pop {r0}
bx r0
@ -198,7 +198,7 @@ DisplayCannotDismountBikeMessage: @ 80FD1E0
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
ldr r2, =gUnknown_085E8F6E
ldr r2, =gText_CantDismountBike
bl DisplayCannotUseItemMessage
pop {r0}
bx r0
@ -571,7 +571,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
b _080FD4F6
.pool
_080FD4EC:
ldr r1, =gUnknown_085E9002
ldr r1, =gText_ItemFinderNothing
ldr r2, =sub_80FD5CC
adds r0, r4, 0
bl DisplayItemMessageOnField
@ -1363,7 +1363,7 @@ sub_80FDA94: @ 80FDA94
lsrs r0, 24
cmp r0, 0x1
bne _080FDACA
ldr r1, =gUnknown_085E8F93
ldr r1, =gText_ItemFinderNearby
ldr r2, =sub_80FD5CC
adds r0, r4, 0
bl DisplayItemMessageOnField
@ -1427,7 +1427,7 @@ _080FDB1C:
asrs r0, 16
cmp r0, 0x4
bne _080FDB50
ldr r1, =gUnknown_085E8FDB
ldr r1, =gText_ItemFinderOnTop
ldr r2, =sub_80FD5CC
adds r0, r5, 0
bl DisplayItemMessageOnField
@ -1542,7 +1542,7 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9026
ldr r1, =gText_CoinCase
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r1, =gTasks
@ -1586,7 +1586,7 @@ ItemUseOutOfBattle_PowderJar: @ 80FDCA4
movs r3, 0x5
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9138
ldr r1, =gText_PowderQty
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r1, =gTasks
@ -1892,7 +1892,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
lsls r0, 1
cmp r1, r0
bls _080FDF74
ldr r2, =gUnknown_085E9047
ldr r2, =gText_BootedUpHM
ldr r3, =sub_80FDF90
adds r0, r4, 0
movs r1, 0x1
@ -1900,7 +1900,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
b _080FDF80
.pool
_080FDF74:
ldr r2, =gUnknown_085E9037
ldr r2, =gText_BootedUpTM
ldr r3, =sub_80FDF90
adds r0, r4, 0
movs r1, 0x1
@ -1957,7 +1957,7 @@ task08_0809AD8C: @ 80FDFBC
adds r0, r4, 0
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9058
ldr r1, =gText_TMHMContainedVar1
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =sub_80FE024
@ -2010,7 +2010,7 @@ sub_80FE058: @ 80FE058
ldr r1, =gStringVar2
bl CopyItemName
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9080
ldr r1, =gText_PlayerUsedVar2
bl StringExpandPlaceholders
bl InBattlePyramid
lsls r0, 24
@ -2062,7 +2062,7 @@ _080FE0EC:
lsls r0, 24
cmp r0, 0
bne _080FE10C
ldr r2, =gUnknown_085E9092
ldr r2, =gText_RepelEffectsLingered
ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0
movs r1, 0x1
@ -2070,7 +2070,7 @@ _080FE0EC:
b _080FE116
.pool
_080FE10C:
ldr r1, =gUnknown_085E9092
ldr r1, =gText_RepelEffectsLingered
ldr r2, =sub_81C6714
adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid
@ -2217,7 +2217,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r0, =0x000008ae
bl FlagReset
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90C6
ldr r1, =gText_UsedVar2WildLured
bl StringExpandPlaceholders
b _080FE28C
.pool
@ -2227,7 +2227,7 @@ _080FE278:
ldr r0, =0x000008ad
bl FlagReset
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90F4
ldr r1, =gText_UsedVar2WildRepelled
bl StringExpandPlaceholders
_080FE28C:
ldr r1, =gTasks
@ -2382,7 +2382,7 @@ _080FE3D0:
lsls r0, 24
cmp r0, 0
bne _080FE3F0
ldr r2, =gUnknown_085E9125
ldr r2, =gText_BoxFull
ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0
movs r1, 0x1
@ -2390,7 +2390,7 @@ _080FE3D0:
b _080FE3FA
.pool
_080FE3F0:
ldr r1, =gUnknown_085E9125
ldr r1, =gText_BoxFull
ldr r2, =sub_81C6714
adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid

View File

@ -57,12 +57,12 @@ sub_8009414: @ 8009414
lsrs r7, r3, 24
lsls r4, 16
lsrs r4, 16
ldr r0, =gUnknown_082ECF20
ldr r0, =gLinkTestDigitsPal
lsls r1, r5, 4
movs r2, 0x20
bl LoadPalette
ldr r3, =0x040000d4
ldr r0, =gUnknown_082ECF40
ldr r0, =gLinkTestDigitsGfx
str r0, [r3]
lsls r2, r7, 14
lsls r0, r4, 5
@ -158,13 +158,13 @@ sub_80094EC: @ 80094EC
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
ldr r0, =gUnknown_082ECF20
ldr r0, =gLinkTestDigitsPal
mov r2, r8
lsls r1, r2, 4
movs r2, 0x20
bl LoadPalette
ldr r2, =0x040000d4
ldr r0, =gUnknown_082ECF40
ldr r0, =gLinkTestDigitsGfx
str r0, [r2]
lsls r0, r5, 14
movs r1, 0xC0
@ -866,7 +866,7 @@ _08009B68:
stm r2!, {r3,r6,r7}
ldr r1, [r1]
str r1, [r2]
ldr r4, =gUnknown_082ED1D4
ldr r4, =gASCIIGameFreakInc
adds r2, r0, 0
adds r1, r4, 0
ldm r1!, {r5-r7}
@ -1025,7 +1025,7 @@ _08009C70:
_08009CCA:
adds r0, r2, 0
bl sub_800B524
ldr r5, =gUnknown_082ED1D4
ldr r5, =gASCIIGameFreakInc
mov r0, r8
adds r1, r5, 0
bl strcmp
@ -2521,7 +2521,7 @@ _0800A838:
task00_link_test: @ 800A850
push {r4-r6,lr}
sub sp, 0x20
ldr r1, =gUnknown_082ED1E4
ldr r1, =gASCIITestPrint
mov r0, sp
bl strcpy
mov r0, sp
@ -3450,26 +3450,26 @@ _0800B03C:
sub_800B080: @ 800B080
push {r4,r5,lr}
sub sp, 0xC
ldr r1, =gUnknown_082ED168
ldr r1, =g2BlankTilesGfx
movs r0, 0
movs r2, 0x20
movs r3, 0
bl LoadBgTiles
ldr r1, =gUnknown_082EC88C
ldr r1, =gWirelessLinkDisplayGfx
movs r5, 0
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
ldr r1, =gUnknown_082ECD34
ldr r1, =gWirelessLinkDisplayTilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
movs r0, 0x1
bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_082EC86C
ldr r0, =gWirelessLinkDisplayPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
@ -3519,7 +3519,7 @@ sub_800B080: @ 800B080
sub_800B138: @ 800B138
push {lr}
sub sp, 0xC
ldr r1, =gUnknown_082ED168
ldr r1, =g2BlankTilesGfx
movs r0, 0
movs r2, 0x20
movs r3, 0
@ -3781,7 +3781,7 @@ sub_800B348: @ 800B348
stm r2!, {r3,r4,r6}
ldr r0, [r0]
str r0, [r2]
ldr r3, =gUnknown_082ED1D4
ldr r3, =gASCIIGameFreakInc
adds r2, r1, 0
adds r0, r3, 0
ldm r0!, {r4-r6}
@ -3831,7 +3831,7 @@ sub_800B3A4: @ 800B3A4
str r0, [r1]
adds r0, r2, 0
bl sub_800B524
ldr r5, =gUnknown_082ED1D4
ldr r5, =gASCIIGameFreakInc
adds r0, r4, 0
adds r1, r5, 0
bl strcmp
@ -17895,7 +17895,7 @@ sub_80125BC: @ 80125BC
movs r1, 0x1
movs r3, 0
bl sub_80173E0
ldr r1, =gUnknown_082ED8CC
ldr r1, =gText_UnkCtrlCodeF907
add r0, sp, 0x8
bl StringCopy
adds r5, r0, 0
@ -17973,7 +17973,7 @@ _08012648:
.4byte _080126B8
_080126B8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED960
ldr r1, =gText_AwaitingCommunication
bl StringExpandPlaceholders
_080126C0:
pop {r0}
@ -18294,13 +18294,13 @@ _080129C8:
cmp r0, 0
beq _08012A18
ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED990
ldr r1, =gText_AwaitingLink
bl StringExpandPlaceholders
b _08012A34
.pool
_08012A18:
ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED960
ldr r1, =gText_AwaitingCommunication
bl StringExpandPlaceholders
b _08012A34
.pool
@ -22289,7 +22289,7 @@ _08014E16:
_08014E4E:
adds r0, r5, 0
adds r0, 0xD
ldr r1, =gUnknown_082ED8D0
ldr r1, =gText_PleaseStartOver
bl mevent_0814257C
cmp r0, 0
beq _08014EF2
@ -22719,7 +22719,7 @@ _0801523A:
.pool
_08015260:
bl sub_800E084
ldr r0, =gUnknown_082ED8D0
ldr r0, =gText_PleaseStartOver
bl sub_8018884
_0801526A:
adds r0, r6, 0
@ -23078,7 +23078,7 @@ _0801559A:
_080155A8:
adds r0, r5, 0
adds r0, 0x9
ldr r1, =gUnknown_082ED8F8
ldr r1, =gText_WirelessSearchCanceled
b _080155C2
.pool
_080155B4:
@ -27066,7 +27066,7 @@ sub_80177B8: @ 80177B8
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8C8
ldr r1, =gText_Colon
adds r0, r5, 0
bl StringAppend
str r7, [sp]
@ -27111,7 +27111,7 @@ sub_80177B8: @ 80177B8
movs r2, 0x2
movs r3, 0x5
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8CC
ldr r1, =gText_UnkCtrlCodeF907
adds r0, r5, 0
bl StringCopy
adds r0, r5, 0
@ -27186,7 +27186,7 @@ sub_80178A0: @ 80178A0
movs r2, 0x2
movs r3, 0x5
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8CC
ldr r1, =gText_UnkCtrlCodeF907
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0
@ -28719,7 +28719,7 @@ _08018482:
b _08018610
.pool
_08018574:
ldr r0, =gUnknown_082F0548
ldr r0, =gUnkTextboxBorderPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
@ -31126,7 +31126,7 @@ bgid_upload_textbox_1: @ 8019938
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_082F0568
ldr r1, =gUnkTextboxBorderGfx
movs r2, 0x80
lsls r2, 1
movs r3, 0
@ -32602,14 +32602,14 @@ sub_801A43C: @ 801A43C
adds r1, r0, 0
movs r0, 0
bl SetBgTilemapBuffer
ldr r1, =gUnknown_082F0990
ldr r1, =gWirelessInfoScreenGfx
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
ldr r1, =gUnknown_082F0BA0
ldr r1, =gWirelessInfoScreenTilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
@ -32653,7 +32653,7 @@ sub_801A43C: @ 801A43C
movs r1, 0
movs r2, 0
bl ChangeBgY
ldr r0, =gUnknown_082F0790
ldr r0, =gWirelessInfoScreenPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
@ -32738,7 +32738,7 @@ _0801A5E4:
ldrsh r0, [r1, r2]
adds r0, 0x2
lsls r0, 5
ldr r1, =gUnknown_082F0790
ldr r1, =gWirelessInfoScreenPal
adds r0, r1
movs r1, 0
movs r2, 0x10
@ -44323,7 +44323,7 @@ _080202AC:
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
ldr r0, =gUnknown_082F2DC4
ldr r0, =gText_Ellipsis
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0
@ -45129,7 +45129,7 @@ sub_80209AC: @ 80209AC
push {r4,lr}
adds r4, r0, 0
lsls r4, 2
ldr r0, =gUnknown_082F2DF2
ldr r0, =gUnknown_082F2DF0+2
adds r4, r0
movs r0, 0
bl IndexOfSpritePaletteTag
@ -46151,17 +46151,17 @@ _0802121C:
lsls r2, 1
movs r1, 0
bl LoadPalette
ldr r1, =gUnknown_082F3C8C
ldr r1, =gBerryCrushGrinderTopTilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082F3DBC
ldr r1, =gBerryCrushContainerCapTilemap
movs r0, 0x2
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082F3F54
ldr r1, =gBerryCrushBackgroundTilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@ -46800,7 +46800,7 @@ _0802175A:
asrs r0, 24
strh r0, [r2, 0x24]
ldr r2, [r3]
ldr r3, =gUnknown_082F41CD
ldr r3, =gUnknown_082F41CC+1
adds r1, r3
movs r0, 0
ldrsb r0, [r1, r0]
@ -46860,7 +46860,7 @@ _080217E8:
ldr r0, =sub_8022B28
str r0, [r2, 0x1C]
lsls r1, r4, 1
ldr r3, =gUnknown_082F41D2
ldr r3, =gUnknown_082F41CC+6
adds r0, r1, r3
movs r4, 0
ldrsb r4, [r0, r4]
@ -46868,7 +46868,7 @@ _080217E8:
adds r0, 0x78
strh r0, [r2, 0x20]
ldr r2, [r7]
ldr r0, =gUnknown_082F41D3
ldr r0, =gUnknown_082F41CC+7
adds r1, r0
movs r6, 0
ldrsb r6, [r1, r6]
@ -48771,7 +48771,7 @@ _080227AA:
bcc _080227AA
_08022822:
movs r5, 0
ldr r4, =gUnknown_082F41D2
ldr r4, =gUnknown_082F41CC+6
adds r7, r4, 0x1
_08022828:
lsls r2, r5, 1
@ -56589,7 +56589,7 @@ _08026676:
lsrs r0, 24
cmp r0, 0x1
bhi _080266D4
ldr r0, =gUnknown_082F45AF
ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@ -56625,7 +56625,7 @@ _080266D0:
movs r0, 0x1
b _0802670C
_080266D4:
ldr r0, =gUnknown_082F45AF
ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@ -57508,7 +57508,7 @@ _08026D76:
sub_8026D8C: @ 8026D8C
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_082F4648
ldr r3, =gUnknown_082F449C+0x1AC
ldr r1, =gUnknown_02022C98
ldr r1, [r1]
adds r1, 0x24
@ -57539,7 +57539,7 @@ sub_8026DB0: @ 8026DB0
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, =gUnknown_082F45FA
ldr r3, =gUnknown_082F449C+0x15E
lsls r1, r0, 1
adds r1, r0
lsls r0, r2, 4
@ -57556,7 +57556,7 @@ sub_8026DB0: @ 8026DB0
ldrb r1, [r1]
mov r8, r1
movs r3, 0
ldr r1, =gUnknown_082F467F
ldr r1, =gUnknown_082F449C+0x1E3
lsls r0, r2, 2
adds r2, r0, r2
adds r0, r2, r1
@ -60392,7 +60392,7 @@ sub_80283A8: @ 80283A8
ldr r0, [r0]
str r0, [sp, 0x10]
str r1, [sp, 0x14]
ldr r0, =gUnknown_082F98BC
ldr r0, =gDodrioBerryPkmnGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@ -60848,7 +60848,7 @@ sub_8028734: @ 8028734
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =gUnknown_082F96E0
ldr r0, =gDodrioBerryStatusGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@ -61225,7 +61225,7 @@ sub_8028A34: @ 8028A34
ldr r0, [r0]
str r0, [sp, 0x8]
str r1, [sp, 0xC]
ldr r0, =gUnknown_082F7EB0
ldr r0, =gDodrioBerrySpritesGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@ -61611,7 +61611,7 @@ sub_8028D44: @ 8028D44
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =gUnknown_082F9774
ldr r0, =gDodrioBerryPlatformGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@ -62386,17 +62386,17 @@ _0802937A:
b _0802941C
.pool
_08029394:
ldr r1, =gUnknown_082FAAD8
ldr r1, =gDodrioBerryBgTilemap1
movs r0, 0x3
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082FAF94
ldr r1, =gDodrioBerryBgTilemap2Left
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082FAD44
ldr r1, =gDodrioBerryBgTilemap2Right
movs r0, 0x2
movs r2, 0
movs r3, 0
@ -63848,7 +63848,7 @@ _0802A0CC:
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
ldr r2, =gUnknown_085E8D60
ldr r2, =gText_SelectorArrow2
str r6, [sp]
mov r3, r9
str r3, [sp, 0x4]
@ -63940,7 +63940,7 @@ _0802A1DC:
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
ldr r2, =gUnknown_085E8D60
ldr r2, =gText_SelectorArrow2
subs r1, r5, 0x1
lsls r1, 4
adds r1, 0x1
@ -64749,7 +64749,7 @@ _0802A910:
.4byte _0802A964
.4byte _0802A972
_0802A928:
ldr r0, =gUnknown_082F7DF0
ldr r0, =gDodrioBerryBgPal1
movs r1, 0
movs r2, 0x40
bl LoadPalette
@ -64759,14 +64759,14 @@ _0802A938:
bl reset_temp_tile_data_buffers
b _0802A98A
_0802A93E:
ldr r1, =gUnknown_082F8084
ldr r1, =gDodrioBerryBgGfx1
movs r0, 0
str r0, [sp]
movs r0, 0x3
b _0802A954
.pool
_0802A94C:
ldr r1, =gUnknown_082F8914
ldr r1, =gDodrioBerryBgGfx2
movs r0, 0
str r0, [sp]
movs r0, 0x1
@ -64995,7 +64995,7 @@ sub_802AB20: @ 802AB20
ldr r7, =gUnknown_02022CFC
movs r6, 0
movs r5, 0
ldr r0, =gUnknown_082FB464
ldr r0, =gPkmnJumpSpecies
mov r8, r0
movs r4, 0x4
_0802AB32:
@ -65091,7 +65091,7 @@ sub_802AC00: @ 802AC00
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0
ldr r2, =gUnknown_082FB464
ldr r2, =gPkmnJumpSpecies
_0802AC0A:
ldrh r0, [r2]
cmp r0, r3
@ -69939,56 +69939,56 @@ _0802D178:
ldr r0, [r6]
bl sub_802C974
bl sub_802DD08
ldr r0, =gUnknown_082FC044
ldr r0, =gPkmnJumpBgPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FC064
ldr r1, =gPkmnJumpBgGfx
str r5, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FC290
ldr r1, =gPkmnJumpBgTilemap
movs r4, 0x1
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FC440
ldr r0, =gPkmnJumpVenusaurPal
movs r1, 0x30
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FC460
ldr r1, =gPkmnJumpVenusaurGfx
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FCDB0
ldr r1, =gPkmnJumpVenusaurTilemap
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FD168
ldr r0, =gPkmnJumpResultsPal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FD188
ldr r1, =gPkmnJumpResultsGfx
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FDC38
ldr r1, =gPkmnJumpResultsTilemap
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FC024
ldr r0, =gPkmnJumpPal3
movs r1, 0x20
movs r2, 0x20
bl LoadPalette

View File

@ -312,7 +312,7 @@ _0802F982:
b _0802F9FC
.pool
_0802F990:
ldr r0, =gUnknown_085E8405
ldr r0, =gText_SaveFileErased
bl CreateMainMenuErrorWindow
strh r5, [r4]
mov r0, r8
@ -321,7 +321,7 @@ _0802F990:
b _0802F9FA
.pool
_0802F9A4:
ldr r0, =gUnknown_085E83C2
ldr r0, =gText_SaveFileCorrupted
bl CreateMainMenuErrorWindow
mov r0, r8
subs r0, 0x8
@ -350,7 +350,7 @@ _0802F9D0:
b _0802F9FC
.pool
_0802F9EC:
ldr r0, =gUnknown_085E8440
ldr r0, =gJPText_No1MSubCircuit
bl CreateMainMenuErrorWindow
mov r0, r8
subs r0, 0x8
@ -495,7 +495,7 @@ Task_MainMenuCheckBattery: @ 802FAB0
b _0802FB3C
.pool
_0802FB28:
ldr r0, =gUnknown_085E8453
ldr r0, =gText_BatteryRunDry
bl CreateMainMenuErrorWindow
ldr r1, =gTasks
lsls r0, r5, 2
@ -679,7 +679,7 @@ _0802FCBC:
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C
ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x1
@ -688,7 +688,7 @@ _0802FCBC:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E
ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -728,7 +728,7 @@ _0802FD44:
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285
ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0x1
@ -737,7 +737,7 @@ _0802FD44:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C
ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -746,7 +746,7 @@ _0802FD44:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E
ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -799,7 +799,7 @@ _0802FE00:
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285
ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0x1
@ -808,7 +808,7 @@ _0802FE00:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C
ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -817,7 +817,7 @@ _0802FE00:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8295
ldr r0, =gText_MainMenuMysteryGift
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -826,7 +826,7 @@ _0802FE00:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E
ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8]
movs r0, 0x5
movs r1, 0x1
@ -895,7 +895,7 @@ _0802FEFC:
movs r4, 0x1
negs r4, r4
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285
ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0x1
@ -904,7 +904,7 @@ _0802FEFC:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C
ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -913,7 +913,7 @@ _0802FEFC:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E82A2
ldr r0, =gText_MainMenuMysteryGift2
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -922,7 +922,7 @@ _0802FEFC:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E82AF
ldr r0, =gText_MainMenuMysteryEvents
str r0, [sp, 0x8]
movs r0, 0x5
movs r1, 0x1
@ -931,7 +931,7 @@ _0802FEFC:
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E
ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8]
movs r0, 0x6
movs r1, 0x1
@ -1671,17 +1671,17 @@ _080305FC:
beq _0803061C
b _08030622
_08030602:
ldr r0, =gUnknown_085E82BE
ldr r0, =gText_WirelessNotConnected
bl CreateMainMenuErrorWindow
b _08030622
.pool
_08030610:
ldr r0, =gUnknown_085E82E5
ldr r0, =gText_MysteryGiftCantUse
bl CreateMainMenuErrorWindow
b _08030622
.pool
_0803061C:
ldr r0, =gUnknown_085E8328
ldr r0, =gText_MysteryEventsCantUse
bl CreateMainMenuErrorWindow
_08030622:
ldr r0, =gTasks
@ -2123,7 +2123,7 @@ task_new_game_prof_birch_speech_4: @ 80309CC
ldr r1, =task_new_game_prof_birch_speech_5
str r1, [r0]
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E8692
ldr r1, =gText_ThisIsAPokemon
bl StringExpandPlaceholders
ldr r1, =sub_80323A0
movs r0, 0x1

View File

@ -669,14 +669,14 @@ sub_8153CC8: @ 8153CC8
cmp r4, r0
bne _08153D18
ldr r0, =gStringVar1
ldr r1, =gEggNickname
ldr r1, =gText_EggNickname
movs r2, 0xB
bl StringCopyN
b _08153D22
.pool
_08153D18:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8268
ldr r1, =gText_Pokemon
movs r2, 0xB
bl StringCopyN
_08153D22:

View File

@ -3387,7 +3387,7 @@ sub_80E49BC: @ 80E49BC
push {r4,r5,lr}
sub sp, 0x10
movs r4, 0
ldr r1, =gUnknown_085E8D49
ldr r1, =gText_MaleSymbol
add r0, sp, 0xC
bl StringCopy
ldr r5, =gUnknown_02039F94
@ -3399,7 +3399,7 @@ sub_80E49BC: @ 80E49BC
beq _080E4A0C
cmp r0, 0xFE
bne _080E49E6
ldr r1, =gUnknown_085E8D4B
ldr r1, =gText_FemaleSymbol
add r0, sp, 0xC
bl StringCopy
movs r4, 0x1

View File

@ -69,7 +69,7 @@ sub_816AE58: @ 816AE58
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8D80
ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8
bl DisplayItemMessageOnField
pop {r0}
@ -91,7 +91,7 @@ sub_816AE98: @ 816AE98
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8D80
ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8
bl DisplayItemMessageOnField
pop {r0}
@ -266,7 +266,7 @@ sub_816B060: @ 816B060
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8D80
ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8
bl DisplayItemMessageOnField
pop {r0}
@ -1601,7 +1601,7 @@ sub_816BBB8: @ 816BBB8
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085E8DE9
ldr r1, =gText_NoPokemon
ldr r2, =sub_816BBD4
bl DisplayItemMessageOnField
pop {r0}
@ -1808,7 +1808,7 @@ _0816BD58:
adds r4, r3
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E8CF7
ldr r1, =gText_Cancel2
bl StringCopy
ldr r0, [r5]
lsls r2, r6, 3
@ -1950,7 +1950,7 @@ _0816BE8E:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@ -2144,7 +2144,7 @@ _0816C030:
lsls r0, r2, 24
asrs r0, 24
str r0, [sp, 0xC]
ldr r0, =gUnknown_085E8D60
ldr r0, =gText_SelectorArrow2
str r0, [sp, 0x10]
adds r0, r5, 0
movs r1, 0x1
@ -2379,7 +2379,7 @@ _0816C248:
.4byte _0816C274
.4byte _0816C26C
_0816C26C:
ldr r0, =gUnknown_085E8D62
ldr r0, =gText_GoBackPrevMenu
b _0816C2BA
.pool
_0816C274:
@ -2391,11 +2391,11 @@ _0816C27C:
b _0816C2BA
.pool
_0816C284:
ldr r0, =gUnknown_085E8EE0
ldr r0, =gText_TossHowManyVar1s
b _0816C2BA
.pool
_0816C28C:
ldr r0, =gUnknown_085E8EF9
ldr r0, =gText_ThrewAwayVar2Var1s
b _0816C2BA
.pool
_0816C294:
@ -2403,15 +2403,15 @@ _0816C294:
b _0816C2BA
.pool
_0816C29C:
ldr r0, =gUnknown_085E8EB9
ldr r0, =gText_TooImportantToToss
b _0816C2BA
.pool
_0816C2A4:
ldr r0, =gUnknown_085E8F0E
ldr r0, =gText_ConfirmTossItems
b _0816C2BA
.pool
_0816C2AC:
ldr r0, =gUnknown_085E8DFE
ldr r0, =gText_MoveVar1Where
b _0816C2BA
.pool
_0816C2B4:
@ -2892,7 +2892,7 @@ sub_816C6BC: @ 816C6BC
ldr r0, =gStringVar1
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1

View File

@ -7310,7 +7310,7 @@ _080BF38C:
b _080BF582
.pool
_080BF3A0:
ldr r0, =gUnknown_085E871B
ldr r0, =gText_CryOf
movs r1, 0x52
movs r2, 0x21
bl sub_80BE8DC
@ -7893,7 +7893,7 @@ _080BF910:
b _080BFB4E
.pool
_080BF93C:
ldr r1, =gUnknown_085E8723
ldr r1, =gText_SizeComparedTo
add r0, sp, 0x4
bl StringCopy
ldr r0, =gSaveBlock2Ptr
@ -8891,7 +8891,7 @@ sub_80C020C: @ 80C020C
adds r7, r2, 0
cmp r3, 0
beq _080C0234
ldr r4, =gUnknown_085E8735
ldr r4, =gText_PokedexRegistration
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xF0
@ -8916,7 +8916,7 @@ _080C024C:
adds r5, r6, 0
lsls r4, r6, 16
_080C0250:
ldr r1, =gUnknown_085E8D4F
ldr r1, =gText_UnkCtrlF908Clear01
mov r0, sp
bl StringCopy
adds r1, r5, 0
@ -8955,16 +8955,16 @@ _080C028E:
b _080C02AE
.pool
_080C02AC:
ldr r0, =gUnknown_085E86B8
ldr r0, =gText_5MarksPokemon
_080C02AE:
movs r1, 0x64
movs r2, 0x29
bl sub_80BE8DC
ldr r0, =gUnknown_085E8755
ldr r0, =gText_HTHeight
movs r1, 0x60
movs r2, 0x39
bl sub_80BE8DC
ldr r0, =gUnknown_085E8758
ldr r0, =gText_WTWeight
movs r1, 0x60
movs r2, 0x49
bl sub_80BE8DC
@ -8984,11 +8984,11 @@ _080C02AE:
b _080C0310
.pool
_080C02FC:
ldr r0, =gUnknown_085E86C6
ldr r0, =gText_UnkHeight
movs r1, 0x81
movs r2, 0x39
bl sub_80BE8DC
ldr r0, =gUnknown_085E86D0
ldr r0, =gText_UnkWeight
movs r1, 0x81
movs r2, 0x49
bl sub_80BE8DC
@ -11626,7 +11626,7 @@ _080C17E8:
b _080C1994
.pool
_080C183C:
ldr r0, =gUnknown_085E875B
ldr r0, =gText_SearchingPleaseWait
bl sub_80C2618
ldr r0, =sub_80C19A4
str r0, [r6]
@ -11880,7 +11880,7 @@ sub_80C1A4C: @ 80C1A4C
beq _080C1A84
movs r0, 0x1F
bl PlaySE
ldr r0, =gUnknown_085E8773
ldr r0, =gText_SearchCompleted
bl sub_80C2618
b _080C1A90
.pool
@ -13334,7 +13334,7 @@ sub_80C2638: @ 80C2638
sub_80C2650: @ 80C2650
push {lr}
adds r2, r0, 0
ldr r0, =gUnknown_085E8B3A
ldr r0, =gText_SelectorArrow
lsls r2, 4
adds r2, 0x9
movs r1, 0x90

View File

@ -5,7 +5,6 @@
.text
thumb_func_start CopyPlayerPartyMonToBattleData
CopyPlayerPartyMonToBattleData: @ 806B9FC
push {r4-r7,lr}

View File

@ -3452,7 +3452,7 @@ _0812480C:
movs r0, 0x2
movs r1, 0
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8CB4
ldr r2, =gText_FlyToWhere
movs r0, 0x1
str r0, [sp]
movs r0, 0

View File

@ -10753,7 +10753,7 @@ _0813AE1E:
ldrh r0, [r6, 0x22]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_085E8B3A
ldr r2, =gText_SelectorArrow
mov r3, r9
ldrh r1, [r3]
lsls r1, 28

View File

@ -1533,7 +1533,7 @@ _08072F52:
mov r3, r8
cmp r3, 0
bne _08072F82
ldr r1, =gUnknown_085E8D3E
ldr r1, =gText_Slash
bl StringCopy
_08072F82:
ldr r0, =gBattleSpritesGfx

View File

@ -14847,7 +14847,7 @@ _080CEE94:
_080CEEC0:
ldr r2, =0x00000cf9
adds r0, r1, r2
ldr r1, =gEggNickname
ldr r1, =gText_EggNickname
movs r2, 0
movs r3, 0x8
bl StringCopyPadded

View File

@ -13903,7 +13903,7 @@ _081612F6:
adds r1, r2, 0
adds r1, 0x48
adds r1, r0
ldr r0, =gUnknown_085E8CF0
ldr r0, =gText_Cancel
str r0, [r1]
ldrb r0, [r3]
lsls r0, 3

View File

@ -54438,7 +54438,7 @@ _081AAF0C:
b _081AB012
.pool
_081AAF1C:
ldr r1, =gUnknown_085E91FC
ldr r1, =gPocketNames
ldr r4, =gUnknown_0203CE58
ldrb r0, [r4, 0x5]
lsls r0, 2
@ -54848,7 +54848,7 @@ _081AB2B6:
lsls r4, 3
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E8DB4
ldr r1, =gText_CloseBag
bl StringCopy
ldr r0, =gUnknown_0203CE74
ldr r0, [r0]
@ -55185,7 +55185,7 @@ _081AB5BE:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@ -55218,7 +55218,7 @@ _081AB610:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@ -55306,7 +55306,7 @@ _081AB6E0:
ldr r1, [r1]
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E91C0
ldr r1, =gText_ReturnToVar1
adds r0, r4, 0
bl StringExpandPlaceholders
_081AB6FC:
@ -55380,7 +55380,7 @@ bag_menu_print_cursor: @ 81AB75C
bl FillWindowPixelRect
b _081AB7AE
_081AB798:
ldr r2, =gUnknown_085E8D60
ldr r2, =gText_SelectorArrow2
str r5, [sp]
movs r0, 0
str r0, [sp, 0x4]
@ -55980,7 +55980,7 @@ _081ABC6C:
movs r2, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -56023,7 +56023,7 @@ _081ABCD4:
movs r2, 0x2
bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r6, 0
bl StringExpandPlaceholders
lsls r4, 24
@ -56424,7 +56424,7 @@ _081AC026:
adds r5, r0, 0
cmp r1, 0x1
bne _081AC07C
ldr r2, =gUnknown_085E91FC
ldr r2, =gPocketNames
ldrb r0, [r4, 0x5]
lsls r0, 2
adds r0, r2
@ -56440,7 +56440,7 @@ _081AC026:
b _081AC09A
.pool
_081AC07C:
ldr r2, =gUnknown_085E91FC
ldr r2, =gPocketNames
add r0, sp, 0x8
ldrb r0, [r0]
lsls r0, 2
@ -56775,7 +56775,7 @@ bag_menu_swap_items: @ 81AC2E8
bl CopyItemName
ldr r0, =gStringVar4
mov r8, r0
ldr r1, =gUnknown_085E8DFE
ldr r1, =gText_MoveVar1Where
bl StringExpandPlaceholders
movs r0, 0x1
movs r1, 0
@ -57490,7 +57490,7 @@ _081ACA50:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DBE
ldr r1, =gText_Var1IsSelected
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -58061,7 +58061,7 @@ _081ACF24:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8EE0
ldr r1, =gText_TossHowManyVar1s
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -58117,7 +58117,7 @@ BagMenuConfirmToss: @ 81ACF88
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8F0E
ldr r1, =gText_ConfirmTossItems
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -58254,7 +58254,7 @@ BagMenuActuallyToss: @ 81AD0CC
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8EF9
ldr r1, =gText_ThrewAwayVar2Var1s
adds r0, r6, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -58419,7 +58419,7 @@ ItemMenu_Give: @ 81AD278
lsls r0, 24
cmp r0, 0
bne _081AD2AC
ldr r2, =gUnknown_085E8DCE
ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350
adds r0, r4, 0
movs r1, 0x1
@ -58462,7 +58462,7 @@ bag_menu_print_there_is_no_pokemon: @ 81AD2F0
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_085E8DE9
ldr r2, =gText_NoPokemon
ldr r3, =sub_81AD350
movs r1, 0x1
bl DisplayItemMessage
@ -58482,7 +58482,7 @@ bag_menu_print_cant_be_held_msg: @ 81AD30C
ldr r1, =gStringVar1
bl CopyItemName
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8E11
ldr r1, =gText_Var1CantBeHeld
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r3, =sub_81AD350
@ -58608,7 +58608,7 @@ item_menu_type_2: @ 81AD41C
lsls r0, 24
cmp r0, 0
bne _081AD44C
ldr r2, =gUnknown_085E8DCE
ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350
adds r0, r5, 0
movs r1, 0x1
@ -58625,7 +58625,7 @@ _081AD44C:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E27
ldr r1, =gText_Var1CantBeHeldHere
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =sub_81AD350
@ -58670,7 +58670,7 @@ item_menu_type_b: @ 81AD4B4
lsrs r0, 24
cmp r0, 0x1
bne _081AD4E4
ldr r2, =gUnknown_085E8DCE
ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350
adds r0, r4, 0
movs r1, 0x1
@ -59247,7 +59247,7 @@ _081ADA18:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E42
ldr r1, =gText_DepositHowManyVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -59374,7 +59374,7 @@ sub_81ADB14: @ 81ADB14
lsrs r5, r0, 24
cmp r5, 0
beq _081ADB6C
ldr r2, =gUnknown_085E8E8E
ldr r2, =gText_CantStoreImportantItems
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -59405,7 +59405,7 @@ _081ADB6C:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E5A
ldr r1, =gText_DepositedVar2Var1s
adds r0, r4, 0
bl StringExpandPlaceholders
str r6, [sp]
@ -59425,7 +59425,7 @@ _081ADB6C:
b _081ADBF2
.pool
_081ADBD4:
ldr r2, =gUnknown_085E8E6E
ldr r2, =gText_NoRoomForItems
movs r0, 0x1
str r0, [sp]
str r5, [sp, 0x4]
@ -60320,7 +60320,7 @@ _081AE31A:
movs r0, 0x4
str r0, [sp, 0x10]
movs r1, 0x1
ldr r2, =gUnknown_085E8D45
ldr r2, =gText_ThreeDashes
movs r3, 0x7
bl bag_menu_print
adds r0, r4, 0x1
@ -60354,7 +60354,7 @@ _081AE354:
ldrb r0, [r5, 0x1]
cmp r0, 0x1
bhi _081AE38C
ldr r2, =gUnknown_085E8D45
ldr r2, =gText_ThreeDashes
b _081AE39C
.pool
_081AE38C:
@ -60387,7 +60387,7 @@ _081AE39C:
adds r6, r1, 0
cmp r0, 0
bne _081AE3D8
ldr r2, =gUnknown_085E8D45
ldr r2, =gText_ThreeDashes
b _081AE3E8
.pool
_081AE3D8:
@ -61406,7 +61406,7 @@ _081AEB66:
beq _081AEBCC
b _081AEC0C
_081AEB70:
ldr r1, =gUnknown_085E8D60
ldr r1, =gText_SelectorArrow2
adds r0, r6, 0
mov r2, r8
adds r3, r7, 0
@ -68511,7 +68511,7 @@ _081B243E:
adds r0, r4, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085E8CE3
ldr r5, =gText_Confirm
movs r0, 0
adds r1, r5, 0
movs r2, 0x30
@ -68559,7 +68559,7 @@ _081B24C0:
ands r0, r1
cmp r0, 0xA
beq _081B2514
ldr r4, =gUnknown_085E8CF0
ldr r4, =gText_Cancel
movs r0, 0
adds r1, r4, 0
movs r2, 0x30
@ -68582,7 +68582,7 @@ _081B24C0:
b _081B2540
.pool
_081B2514:
ldr r4, =gUnknown_085E8CF7
ldr r4, =gText_Cancel2
movs r0, 0
adds r1, r4, 0
movs r2, 0x30
@ -69314,7 +69314,7 @@ sub_81B2B40: @ 81B2B40
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D4D
ldr r1, =gText_LevelSymbol
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0
@ -69442,7 +69442,7 @@ _081B2C48:
movs r2, 0x2
bl LoadPalette
ldrb r0, [r7, 0x8]
ldr r1, =gUnknown_085E8D49
ldr r1, =gText_MaleSymbol
ldr r3, [r7]
adds r3, 0xC
movs r2, 0x2
@ -69465,7 +69465,7 @@ _081B2C88:
movs r2, 0x2
bl LoadPalette
ldrb r0, [r7, 0x8]
ldr r1, =gUnknown_085E8D4B
ldr r1, =gText_FemaleSymbol
ldr r3, [r7]
adds r3, 0xC
movs r2, 0x2
@ -69630,7 +69630,7 @@ sub_81B2DDC: @ 81B2DDC
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D3E
ldr r1, =gText_Slash
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0

View File

@ -7339,7 +7339,7 @@ sub_81C2628: @ 81C2628
cmp r5, r0
beq _081C26CE
ldr r6, =gStringVar1
ldr r1, =gUnknown_085E8D4F
ldr r1, =gText_UnkCtrlF908Clear01
adds r0, r6, 0
bl StringCopy
ldr r4, =gStringVar2
@ -7401,7 +7401,7 @@ _081C26E8:
bl sub_81C228C
_081C26EE:
ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D4D
ldr r1, =gText_LevelSymbol
adds r0, r4, 0
bl StringCopy
ldr r5, =gStringVar2
@ -7517,7 +7517,7 @@ sub_81C27DC: @ 81C27DC
beq _081C2818
b _081C282C
_081C27FE:
ldr r1, =gUnknown_085E8D49
ldr r1, =gText_MaleSymbol
str r0, [sp]
movs r0, 0x3
str r0, [sp, 0x4]
@ -7528,7 +7528,7 @@ _081C27FE:
b _081C282C
.pool
_081C2818:
ldr r1, =gUnknown_085E8D4B
ldr r1, =gText_FemaleSymbol
movs r0, 0
str r0, [sp]
movs r0, 0x4
@ -7606,7 +7606,7 @@ sub_81C286C: @ 81C286C
movs r2, 0x2
movs r3, 0x1
bl sub_81C25A4
ldr r7, =gUnknown_085E8CF7
ldr r7, =gText_Cancel2
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x3E
@ -8354,7 +8354,7 @@ sub_81C2F5C: @ 81C2F5C
cmp r0, 0x1
beq _081C2FC0
ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59
ldr r1, =gText_UnkCtrlF907F908
adds r0, r5, 0
bl StringCopy
ldr r1, =gUnknown_0203CF1C
@ -8829,7 +8829,7 @@ sub_81C335C: @ 81C335C
movs r2, 0
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085E8D38
ldr r1, =gText_FiveMarks
lsls r5, 24
lsrs r5, 24
mov r0, r9
@ -8854,10 +8854,10 @@ sub_81C33CC: @ 81C33CC
push {r4,r5,lr}
sub sp, 0x8
ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59
ldr r1, =gText_UnkCtrlF907F908
adds r0, r5, 0
bl StringCopy
ldr r1, =gUnknown_085E8D38
ldr r1, =gText_FiveMarks
adds r0, r5, 0
bl StringAppend
movs r0, 0x1
@ -9126,7 +9126,7 @@ _081C3628:
ldrh r0, [r1]
cmp r0, 0
bne _081C3644
ldr r5, =gUnknown_085E8D26
ldr r5, =gText_None
b _081C3650
.pool
_081C3644:
@ -9174,7 +9174,7 @@ sub_81C3690: @ 81C3690
ldrb r0, [r1]
cmp r0, 0
bne _081C36B0
ldr r5, =gUnknown_085E8D26
ldr r5, =gText_None
b _081C36C8
.pool
_081C36B0:
@ -9747,7 +9747,7 @@ sub_81C3B08: @ 81C3B08
b _081C3C26
.pool
_081C3C00:
ldr r1, =gUnknown_085E8D40
ldr r1, =gText_OneDash
lsls r4, r7, 4
adds r3, r4, 0x1
lsls r3, 24
@ -9758,7 +9758,7 @@ _081C3C00:
mov r0, r8
movs r2, 0
bl sub_81C25A4
ldr r7, =gUnknown_085E8D42
ldr r7, =gText_TwoDashes
movs r5, 0xC
movs r0, 0x1
adds r1, r7, 0
@ -9815,7 +9815,7 @@ sub_81C3C5C: @ 81C3C5C
adds r6, r1, 0
cmp r0, 0x1
bhi _081C3C9C
ldr r1, =gUnknown_085E8D45
ldr r1, =gText_ThreeDashes
b _081C3CAC
.pool
_081C3C9C:
@ -9841,7 +9841,7 @@ _081C3CAC:
ldrb r0, [r1, 0x3]
cmp r0, 0
bne _081C3CDC
ldr r1, =gUnknown_085E8D45
ldr r1, =gText_ThreeDashes
b _081C3CEC
.pool
_081C3CDC:
@ -10143,7 +10143,7 @@ sub_81C3F44: @ 81C3F44
ldrh r2, [r0]
cmp r2, 0
bne _081C3F9C
ldr r1, =gUnknown_085E8CF0
ldr r1, =gText_Cancel
str r2, [sp]
movs r0, 0x1
str r0, [sp, 0x4]
@ -12533,7 +12533,7 @@ _081C5382:
adds r4, r1
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E8DB4
ldr r1, =gText_CloseBag
bl StringCopy
ldr r1, [r5]
lsls r2, r6, 3
@ -12739,7 +12739,7 @@ _081C5560:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@ -12806,7 +12806,7 @@ _081C561C:
ldr r1, [r1]
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E91C0
ldr r1, =gText_ReturnToVar1
adds r0, r4, 0
bl StringExpandPlaceholders
_081C5638:
@ -13393,7 +13393,7 @@ sub_81C5AB8: @ 81C5AB8
bl FillWindowPixelRect
b _081C5B08
_081C5AF4:
ldr r1, =gUnknown_085E8D60
ldr r1, =gText_SelectorArrow2
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@ -13716,7 +13716,7 @@ _081C5DDA:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DBE
ldr r1, =gText_Var1IsSelected
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -14203,7 +14203,7 @@ sub_81C61E0: @ 81C61E0
bne _081C6228
_081C620C:
bl sub_81C61A8
ldr r1, =gUnknown_085E8F31
ldr r1, =gText_DadsAdvice
ldr r2, =sub_81C6714
adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid
@ -14309,7 +14309,7 @@ _081C62F4:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8EE0
ldr r1, =gText_TossHowManyVar1s
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -14362,7 +14362,7 @@ sub_81C6350: @ 81C6350
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8F0E
ldr r1, =gText_ConfirmTossItems
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -14423,7 +14423,7 @@ sub_81C6404: @ 81C6404
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x3
@ -14463,7 +14463,7 @@ sub_81C645C: @ 81C645C
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -14577,7 +14577,7 @@ sub_81C654C: @ 81C654C
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8EF9
ldr r1, =gText_ThrewAwayVar2Var1s
adds r0, r6, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -14667,7 +14667,7 @@ sub_81C6648: @ 81C6648
lsrs r0, 24
cmp r0, 0x1
bne _081C667C
ldr r1, =gUnknown_085E8DCE
ldr r1, =gText_CantWriteMail
ldr r2, =sub_81C66EC
adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid
@ -14707,7 +14707,7 @@ sub_81C66AC: @ 81C66AC
ldr r1, =gStringVar1
bl CopyItemName
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8E11
ldr r1, =gText_Var1CantBeHeld
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r2, =sub_81C66EC
@ -14780,7 +14780,7 @@ sub_81C674C: @ 81C674C
lsls r0, 24
cmp r0, 0
bne _081C677C
ldr r1, =gUnknown_085E8DCE
ldr r1, =gText_CantWriteMail
ldr r2, =sub_81C66EC
adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid
@ -14879,7 +14879,7 @@ sub_81C67CC: @ 81C67CC
ldr r1, =gStringVar1
bl CopyItemName
ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8DFE
ldr r1, =gText_MoveVar1Where
adds r0, r6, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -28902,7 +28902,7 @@ sub_81CD624: @ 81CD624
bl sub_81D2C68
cmp r0, 0
beq _081CD690
ldr r1, =gEggNickname
ldr r1, =gText_EggNickname
adds r0, r5, 0
movs r2, 0
movs r3, 0xC
@ -37978,7 +37978,7 @@ sub_81D1DC0: @ 81D1DC0
adds r5, r0, 0
movs r3, 0
ldr r7, =gUnknown_0203CF4C
ldr r0, =gUnknown_085E8CF7
ldr r0, =gText_Cancel2
mov r12, r0
ldr r4, =gUnknown_03006310
ldr r1, =gUnknown_0203CF48
@ -39591,7 +39591,7 @@ _081D29C4:
ldrb r0, [r6, 0x1]
cmp r0, 0x1
bhi _081D2A3C
ldr r5, =gUnknown_085E8D45
ldr r5, =gText_ThreeDashes
b _081D2A4A
.pool
_081D2A3C:
@ -39615,7 +39615,7 @@ _081D2A4A:
ldrb r0, [r6, 0x3]
cmp r0, 0
bne _081D2A70
ldr r5, =gUnknown_085E8D45
ldr r5, =gText_ThreeDashes
b _081D2A7E
.pool
_081D2A70:
@ -39944,7 +39944,7 @@ sub_81D2CD0: @ 81D2CD0
bl sub_81D2C68
cmp r0, 0
beq _081D2D20
ldr r1, =gEggNickname
ldr r1, =gText_EggNickname
adds r0, r5, 0
movs r2, 0
movs r3, 0xC
@ -56467,7 +56467,7 @@ sub_81DB468: @ 81DB468
movs r1, 0
strb r1, [r0]
adds r0, 0x1
ldr r1, =gUnknown_085E8268
ldr r1, =gText_Pokemon
bl StringCopy
pop {r0}
bx r0

View File

@ -2268,7 +2268,7 @@ _080E9D7C:
ldr r1, [r4]
lsls r3, r6, 3
adds r2, r1, r3
ldr r0, =gUnknown_085E8CF0
ldr r0, =gText_Cancel
str r0, [r2]
adds r1, 0x4
adds r1, r3

View File

@ -589,7 +589,7 @@ _080DFF78:
lsls r5, r6, 4
ldr r0, [r4]
adds r0, r5
ldr r1, =gUnknown_085E8CF7
ldr r1, =gText_Cancel2
bl StringCopy
ldr r2, =gUnknown_02039F74
ldr r0, [r2]
@ -927,7 +927,7 @@ BuyMenuPrintCursor: @ 80E0250
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
ldr r1, =gUnknown_085E8D60
ldr r1, =gText_SelectorArrow2
movs r0, 0
str r0, [sp]
str r4, [sp, 0x4]
@ -2642,7 +2642,7 @@ BuyMenuPrintItemQuantityAndPrice: @ 80E10EC
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0
ldr r1, =gText_xVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0

View File

@ -328,7 +328,7 @@ sub_81341FC: @ 81341FC
movs r1, 0
movs r3, 0xD
bl SetWindowBorderStyle
ldr r2, =gUnknown_085E8C53
ldr r2, =gText_BirchInTrouble
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -507,7 +507,7 @@ sub_8134390: @ 8134390
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8C90
ldr r2, =gText_ConfirmStarterChoice
movs r0, 0x1
str r0, [sp]
movs r0, 0

View File

@ -92,7 +92,7 @@ sub_8133A78: @ 8133A78
movs r2, 0
bl GetStringWidth
adds r6, r0, 0
ldr r1, =gUnknown_085E8D38
ldr r1, =gText_FiveMarks
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -163,7 +163,7 @@ _08133B3C:
movs r1, 0
str r1, [sp, 0x8]
movs r1, 0x1
ldr r2, =gUnknown_085E8D38
ldr r2, =gText_FiveMarks
movs r3, 0x8
bl PrintTextOnWindow
b _08133B94

View File

@ -431,21 +431,21 @@ RESUME_MUSIC = FC 18
@ colors
TRANSPARENT = 00
DARK_GREY = 01
RED = 02
GREEN = 03
BLUE = 04
YELLOW = 05
CYAN = 06
MAGENTA = 07
LIGHT_GREY = 08
BLACK = 09
BLACK2 = 0A @ duplicate of black?
SILVER = 0B
WHITE = 0C
SKY_BLUE = 0D
LIGHT_BLUE = 0E
WHITE2 = 0F @ duplicate of white?
WHITE = 01
DARK_GREY = 02
LIGHT_GREY = 03
RED = 04
LIGHT_RED = 05
GREEN = 06
LIGHT_GREEN = 07
BLUE = 08
LIGHT_BLUE = 09
BORDER_COLOR1 = 0A @ white
BORDER_COLOR2 = 0B @ white with a tinge of green
BORDER_COLOR3 = 0C @ white 2
BORDER_COLOR4 = 0D @ aquamarine
BORDER_COLOR5 = 0E @ blue-green
BORDER_COLOR6 = 0F @ cerulean
@ sound and music
@ -686,6 +686,19 @@ BGM_BATTLE35 = D0 01
BGM_BATTLE38 = D1 01
BGM_BATTLE30 = D2 01
UNK_CTRL_F800 = F8 00
UNK_CTRL_F801 = F8 01
UNK_CTRL_F80A = F8 0A
UNK_CTRL_F80C = F8 0C
UNK_CTRL_F9 = F9
UNK_CTRL_F904 = F9 04
UNK_CTRL_F905 = F9 05
UNK_CTRL_F907 = F9 07
UNK_CTRL_F908 = F9 08
UNK_CTRL_F9DD = F9 DD
UNK_CTRL_F9F9 = F9 F9
'\l' = FA @ scroll up window text
'\p' = FB @ new paragraph
'\n' = FE @ new line

View File

@ -3,6 +3,7 @@
.section .rodata
.align 2
gUnknown_085EFCF0:: @ 85EFCF0
.incbin "baserom.gba", 0x5efcf0, 0x10

File diff suppressed because it is too large Load Diff

View File

@ -75,7 +75,13 @@ gUnknown_082FF178:: @ 82FF178
.incbin "baserom.gba", 0x2ff178, 0x50
gUnknown_082FF1C8:: @ 82FF1C8
.incbin "baserom.gba", 0x2ff1c8, 0x450
.incbin "baserom.gba", 0x2ff1c8, 0x10
gUnknown_082FF1D8:: @ 82FF1D8
.incbin "baserom.gba", 0x2ff1d8, 0x20
gUnknown_082FF1F8:: @ 82FF1F8
.incbin "baserom.gba", 0x2ff1f8, 0x420
gUnknown_082FF618:: @ 82FF618
.incbin "baserom.gba", 0x2ff618, 0x7c

View File

@ -1395,7 +1395,294 @@ gUnknown_0852489C:: @ 852489C
.incbin "baserom.gba", 0x52489c, 0x20
sFanfares:: @ 85248BC
.incbin "baserom.gba", 0x5248bc, 0x288
.incbin "baserom.gba", 0x5248bc, 0x48
gUnknown_08524904:: @ 8524904
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852490C:: @ 852490C
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524914:: @ 8524914
.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852491C:: @ 852491C
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524924:: @ 8524924
.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852492C:: @ 852492C
.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524934:: @ 8524934
.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852493C:: @ 852493C
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524944:: @ 8524944
.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852494C:: @ 852494C
.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524954:: @ 8524954
.byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852495C:: @ 852495C
.byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524964:: @ 8524964
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852496C:: @ 852496C
.byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524974:: @ 8524974
.byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852497C:: @ 852497C
.byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524984:: @ 8524984
.byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852498C:: @ 852498C
.byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524994:: @ 8524994
.byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_0852499C:: @ 852499C
.byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249A4:: @ 85249A4
.byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249AC:: @ 85249AC
.byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249B4:: @ 85249B4
.byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249BC:: @ 85249BC
.byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249C4:: @ 85249C4
.byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249CC:: @ 85249CC
.byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249D4:: @ 85249D4
.byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249DC:: @ 85249DC
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249E4:: @ 85249E4
.byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249EC:: @ 85249EC
.byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249F4:: @ 85249F4
.byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_085249FC:: @ 85249FC
.byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A04:: @ 8524A04
.byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A0C:: @ 8524A0C
.byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A14:: @ 8524A14
.byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A1C:: @ 8524A1C
.byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A24:: @ 8524A24
.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A2C:: @ 8524A2C
.byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A34:: @ 8524A34
.byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A3C:: @ 8524A3C
.byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A44:: @ 8524A44
.byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A4C:: @ 8524A4C
.byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A54:: @ 8524A54
.byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A5C:: @ 8524A5C
.byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A64:: @ 8524A64
.byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A6C:: @ 8524A6C
.byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A74:: @ 8524A74
.byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A7C:: @ 8524A7C
.byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A84:: @ 8524A84
.byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A8C:: @ 8524A8C
.byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A94:: @ 8524A94
.byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524A9C:: @ 8524A9C
.byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AA4:: @ 8524AA4
.byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AAC:: @ 8524AAC
.byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AB4:: @ 8524AB4
.byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ABC:: @ 8524ABC
.byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AC4:: @ 8524AC4
.byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ACC:: @ 8524ACC
.byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AD4:: @ 8524AD4
.byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524ADC:: @ 8524ADC
.byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AE4:: @ 8524AE4
.byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AEC:: @ 8524AEC
.byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AF4:: @ 8524AF4
.byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524AFC:: @ 8524AFC
.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B04:: @ 8524B04
.byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B0C:: @ 8524B0C
.byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B14:: @ 8524B14
.byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B1C:: @ 8524B1C
.byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B24:: @ 8524B24
.byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B2C:: @ 8524B2C
.byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B34:: @ 8524B34
.byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
.align 2
gUnknown_08524B3C:: @ 8524B3C
.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
gUnknown_08524B44:: @ 8524B44
.incbin "baserom.gba", 0x524b44, 0x1d0

View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
@ unknown unreferenced data
.incbin "baserom.gba", 0x58d977, 0x2a1

View File

@ -5,6 +5,9 @@
.section .rodata
.align 2
.incbin "baserom.gba", 0x58d978, 0x2a0
.align 2
gFieldEffectObjectPalette7:: @ 858DC18
.incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal"

View File

@ -932,6 +932,114 @@ gUnknown_0862B7E8:: @ 862B7E8
.incbin "baserom.gba", 0x62b7e8, 0x14
gUnknown_0862B7FC:: @ 862B7FC
.incbin "baserom.gba", 0x62b7fc, 0x2e8
.incbin "baserom.gba", 0x62b7fc, 0x14
.align 2
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
.string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
.string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}{CLEAR 16}{CLEAR 16}/{CLEAR 17}-$"
.string "{CLEAR 11}{CLEAR 16}{CLEAR 16}{CLEAR 18}{CLEAR 19}{CLEAR 18} $"
gUnknown_0862B9F9:: @ 862B9F9
.string "ABCDE$"
gUnknown_0862B9FF:: @ 862B9FF
.string "FGHIJ$"
gUnknown_0862BA05:: @ 862BA05
.string "KLMNO$"
gUnknown_0862BA0B:: @ 862BA0B
.string "PQRST$"
gUnknown_0862BA11:: @ 862BA11
.string "UVWXY$"
gUnknown_0862BA17:: @ 862BA17
.string "Z $"
gUnknown_0862BA1D:: @ 862BA1D
.string "01234$"
gUnknown_0862BA23:: @ 862BA23
.string "56789$"
gUnknown_0862BA29:: @ 862BA29
.string ".,!? $"
gUnknown_0862BA2F:: @ 862BA2F
.string "-/& $"
gUnknown_0862BA35:: @ 862BA35
.string "abcde$"
gUnknown_0862BA3B:: @ 862BA3B
.string "fghij$"
gUnknown_0862BA41:: @ 862BA41
.string "klmno$"
gUnknown_0862BA47:: @ 862BA47
.string "pqrst$"
gUnknown_0862BA4D:: @ 862BA4D
.string "uvwxy$"
gUnknown_0862BA53:: @ 862BA53
.string "z $"
gUnknown_0862BA59:: @ 862BA59
.string "01234$"
gUnknown_0862BA5F:: @ 862BA5F
.string "56789$"
gUnknown_0862BA65:: @ 862BA65
.string ".,!? $"
gUnknown_0862BA6B:: @ 862BA6B
.string "-/& $"
.string "$$$$$$$$"
gUnknown_0862BA79:: @ 862BA79
.string "{UNK_CTRL_F9 245}{UNK_CTRL_F9 246}{UNK_CTRL_F9 247}{UNK_CTRL_F9 248}{UNK_CTRL_F9 254}$"
gUnknown_0862BA84:: @ 862BA84
.string "{UNK_CTRL_F9 249}{UNK_CTRL_F9 250}{UNK_CTRL_F9 252}{UNK_CTRL_F9 251}{UNK_CTRL_F9 253}$"
gUnknown_0862BA8F:: @ 862BA8F
.string "{UNK_CTRL_F9 236}{UNK_CTRL_F9 237}{UNK_CTRL_F9 238}{UNK_CTRL_F9 235}{UNK_CTRL_F9 234}$"
gUnknown_0862BA9A:: @ 862BA9A
.string "{UNK_CTRL_F9 212}{UNK_CTRL_F9 213}{UNK_CTRL_F9 211}$"
gUnknown_0862BAA3:: @ 862BAA3
.string "{UNK_CTRL_F9 216}{UNK_CTRL_F9 217}{UNK_CTRL_F9 242}{UNK_CTRL_F9 243}{UNK_CTRL_F9 244}$"
gUnknown_0862BAAE:: @ 862BAAE
.string "{UNK_CTRL_F9 218}{UNK_CTRL_F9 241}{UNK_CTRL_F9 224}{UNK_CTRL_F9 226}{UNK_CTRL_F9 227}$"
gUnknown_0862BAB9:: @ 862BAB9
.string "{UNK_CTRL_F9 240}{UNK_CTRL_F9 239}{UNK_CTRL_F9 225}{UNK_CTRL_F9 214}{UNK_CTRL_F9 215}$"
gUnknown_0862BAC4:: @ 862BAC4
.string "{UNK_CTRL_F9 228}{UNK_CTRL_F9 229}{UNK_CTRL_F9 230}{UNK_CTRL_F9 231}{UNK_CTRL_F9 232}$"
gUnknown_0862BACF:: @ 862BACF
.string "{UNK_CTRL_F9 233}{UNK_CTRL_F9 220}{UNK_CTRL_F9 221}{UNK_CTRL_F9 222}{UNK_CTRL_F9 209}$"
gUnknown_0862BADA:: @ 862BADA
.string "{UNK_CTRL_F9 210}{UNK_CTRL_F9 208}: $"

View File

@ -7,6 +7,7 @@
gFont8LatinGlyphs:: @ 862BAE4
.incbin "data/graphics/fonts/font8.latfont"
.align 2
gFont8LatinGlyphWidths:: @ 8633AE4
.include "data/graphics/fonts/font8_latin_widths.inc"
@ -14,6 +15,7 @@ gFont8LatinGlyphWidths:: @ 8633AE4
gFont0LatinGlyphs:: @ 8633CE4
.incbin "data/graphics/fonts/font0.latfont"
.align 2
gFont0LatinGlyphWidths:: @ 863BCE4
.include "data/graphics/fonts/font0_latin_widths.inc"
@ -21,6 +23,7 @@ gFont0LatinGlyphWidths:: @ 863BCE4
gFont7LatinGlyphs:: @ 863BEE4
.incbin "data/graphics/fonts/font7.latfont"
.align 2
gFont7LatinGlyphWidths:: @ 8643EE4
.include "data/graphics/fonts/font7_latin_widths.inc"
@ -28,6 +31,7 @@ gFont7LatinGlyphWidths:: @ 8643EE4
gFont2LatinGlyphs:: @ 86440E4
.incbin "data/graphics/fonts/font2.latfont"
.align 2
gFont2LatinGlyphWidths:: @ 864C0E4
.include "data/graphics/fonts/font2_latin_widths.inc"
@ -35,6 +39,7 @@ gFont2LatinGlyphWidths:: @ 864C0E4
gFont1LatinGlyphs:: @ 864C2E4
.incbin "data/graphics/fonts/font1.latfont"
.align 2
gFont1LatinGlyphWidths:: @ 86542E4
.include "data/graphics/fonts/font1_latin_widths.inc"
@ -50,6 +55,7 @@ gFont1JapaneseGlyphs:: @ 86584E4
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
.incbin "data/graphics/fonts/unused_frlg_male.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
.include "data/graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
@ -57,6 +63,7 @@ gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
.incbin "data/graphics/fonts/unused_frlg_female.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
.include "data/graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
@ -64,5 +71,6 @@ gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
gFont2JapaneseGlyphs:: @ 866C8E4
.incbin "data/graphics/fonts/font2.fwjpnfont"
.align 2
gFont2JapaneseGlyphWidths:: @ 86748E4
.include "data/graphics/fonts/font2_japanese_widths.inc"

View File

@ -952,7 +952,11 @@ gUnknown_08DD4BF0:: @ 8DD4BF0
.incbin "baserom.gba", 0xdd4bf0, 0x5c
gUnknown_08DD4C4C:: @ 8DD4C4C
.incbin "baserom.gba", 0xdd4c4c, 0x1c4
.incbin "baserom.gba", 0xdd4c4c, 0xac
.align 2
gUnknown_08DD4CF8:: @ 8DD4CF8
.incbin "graphics/interface/unk_change_case.4bpp.lz"
.align 2
gTilesetPalettes_General:: @ 8DD4E10

View File

@ -7,7 +7,22 @@
.align 2
gUnref_82EC784:: @ 82EC784
.incbin "baserom.gba", 0x2EC784, 0x40
.4byte 0x00000000
.4byte 0x00000000
.4byte 0x04000008
.4byte 0x0400000A
.4byte 0x0400000C
.4byte 0x0400000E
.4byte 0x04000010
.4byte 0x04000014
.4byte 0x04000018
.4byte 0x0400001C
.4byte 0x04000012
.4byte 0x04000016
.4byte 0x0400001A
.4byte 0x0400001E
.4byte 0x02000100
.4byte 0x08000400
gUnknown_82EC7C4:: @ 82EC7C4
.2byte 0x0100

4861
data/link.s Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 189 189
148 131 82
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
255 255 238
98 106 115
115 123 131
0 0 0
0 90 16
255 0 0
49 82 205
172 164 131
65 74 90

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 189 189
255 238 172
255 255 0
255 230 74
255 139 0
197 255 255
139 213 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
197 255 205
255 213 131
255 255 156
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
148 222 164
164 230 172
180 238 189
197 246 205
213 255 222
238 255 238
205 106 255
172 82 222
148 148 148
123 123 123
255 0 255
255 0 255
255 0 255
180 189 189
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 255 255
65 65 65
156 156 230
115 115 189
139 246 213
98 213 172
255 213 57
246 172 57
238 238 238
0 148 213
230 131 49
0 156 189
255 148 139
0 230 255
213 98 90
0 238 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 246 255
82 180 172
82 205 189
156 156 131
106 156 148
123 123 98
189 172 98
189 189 139
74 172 156
172 172 131
74 156 123
115 115 82
139 139 106
164 164 115
197 197 148
230 246 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 246 255
246 246 222
230 230 180
139 238 139
246 246 189
197 246 164
246 230 197
230 246 255
230 213 180
205 197 164
148 222 148
222 238 255
139 205 139
213 238 246
222 246 255
213 205 164

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
238 255 238
41 41 41
255 197 115
230 164 74
115 90 65
246 131 164
172 74 74
255 238 189
213 197 148
115 106 82
148 148 148
106 98 90
255 205 230
180 139 90
0 0 0
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
230 246 255
255 255 255
238 255 255
246 255 255
230 230 246
222 238 246
222 246 246
238 238 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
238 255 238
41 41 41
213 222 90
172 180 49
90 98 16
246 131 164
197 82 82
255 255 156
255 205 98
139 106 16
148 148 148
82 82 82
255 205 230
131 139 16
0 0 0
255 255 255

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 255 255
65 65 65
255 255 189
255 238 115
255 197 0
197 197 213
164 164 180
131 131 148
255 197 197
255 139 139
255 49 49
0 0 0
0 0 0
0 0 0
0 0 0
255 49 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
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
0 0 0
0 0 0
0 0 0
0 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 230
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
32 32 32
131 49 49
230 65 41
156 65 65
255 90 74
172 115 57
255 189 74
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 778 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 230
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
32 32 32
131 49 49
230 65 41
156 65 65
255 90 74
172 115 57
255 189 74
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

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

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

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

Binary file not shown.

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
graphics/interface/test.bin Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
255 255 255
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
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
246 246 255
0 0 0
205 205 230
49 213 0
222 230 213
0 0 255
205 213 222
255 0 0
222 213 197
255 189 0
230 230 222
197 197 197
41 32 32
0 0 0
57 57 57

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 197 98
255 49 49
156 49 49
49 98 255
0 0 98
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
230 230 255
213 213 255
172 172 172
115 115 115
255 255 255
65 65 65

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
148 148 148
148 189 255
156 230 255
205 255 255
98 106 246
164 180 172
197 205 197
222 230 222
255 255 255
0 0 0
0 0 0
0 0 0
98 98 98
148 148 148
197 197 197
0 0 0

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