ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from DizzyEggg/dump_things

Browse Source 
Get rid of a couple of baseroms
This commit is contained in:
Diegoisawesome 2017-11-13 12:46:40 -06:00 committed by GitHub
commit d1fe93bf4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 974 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
asm/berry_blender.s
View File

@ -127,7 +127,7 @@ _0807F824:
b _0807F966 b _0807F966
.pool .pool
_0807F854: _0807F854:
ldr r1, =gUnknown_083390F4 ldr r1, =sBlenderCenterMap
movs r2, 0x80 movs r2, 0x80
lsls r2, 3 lsls r2, 3
movs r0, 0x2 movs r0, 0x2
@ -135,7 +135,7 @@ _0807F854:
bl CopyToBgTilemapBuffer bl CopyToBgTilemapBuffer
movs r0, 0x2 movs r0, 0x2
bl CopyBgTilemapBufferToVram bl CopyBgTilemapBufferToVram
ldr r0, =gUnknown_083390D4 ldr r0, =sBlenderCenterPal
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
movs r1, 0 movs r1, 0
@ -216,14 +216,14 @@ _0807F910:
b _0807F966 b _0807F966
.pool .pool
_0807F940: _0807F940:
ldr r0, =gUnknown_083394F4 ldr r0, =sBlenderOuterPal
movs r1, 0x80 movs r1, 0x80
movs r2, 0x20 movs r2, 0x20
bl LoadPalette bl LoadPalette
b _0807F962 b _0807F962
.pool .pool
_0807F950: _0807F950:
ldr r0, =gUnknown_08339AC0 ldr r0, =sSpriteSheet_BlenderArrow
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339BD8 ldr r0, =gUnknown_08339BD8
bl LoadSpriteSheet bl LoadSpriteSheet
@ -243,9 +243,9 @@ _0807F980:
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339C58 ldr r0, =gUnknown_08339C58
bl LoadSpriteSheet bl LoadSpriteSheet
ldr r0, =gUnknown_08339AD0 ldr r0, =sSpritePal_BlenderArrow
bl LoadSpritePalette bl LoadSpritePalette
ldr r0, =gUnknown_08339AC8 ldr r0, =sSpritePal_BlenderMisc
bl LoadSpritePalette bl LoadSpritePalette
ldr r4, =gUnknown_020322A4 ldr r4, =gUnknown_020322A4
ldr r0, [r4] ldr r0, [r4]
@ -482,12 +482,12 @@ _0807FBAC:
b _0807FCE2 b _0807FCE2
_0807FBB8: _0807FBB8:
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_083399C8 ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_0807FBBE: _0807FBBE:
ldrb r1, [r5] ldrb r1, [r5]
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -553,7 +553,7 @@ _0807FC64:
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x000011b8 ldr r0, =0x000011b8
adds r4, r0 adds r4, r0
ldr r5, =gUnknown_0833973A ldr r5, =gText_BerryBlenderStart
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -833,7 +833,7 @@ _0807FE7C:
bne _0807FEC8 bne _0807FEC8
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =sBlenderOpponentsNames
ldr r1, [r1, 0xC] ldr r1, [r1, 0xC]
bl StringCopy bl StringCopy
b _0807FED4 b _0807FED4
@ -841,7 +841,7 @@ _0807FE7C:
_0807FEC8: _0807FEC8:
adds r0, r4, 0 adds r0, r4, 0
adds r0, 0x1C adds r0, 0x1C
ldr r1, =gUnknown_083397D0 ldr r1, =sBlenderOpponentsNames
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
_0807FED4: _0807FED4:
@ -866,7 +866,7 @@ _0807FEE8:
bl StringCopy bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x10] ldr r1, [r4, 0x10]
bl StringCopy bl StringCopy
adds r0, r6, 0 adds r0, r6, 0
@ -896,7 +896,7 @@ _0807FF3C:
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x1C adds r0, 0x1C
ldr r4, =gUnknown_083397D0 ldr r4, =sBlenderOpponentsNames
ldr r1, [r4, 0x14] ldr r1, [r4, 0x14]
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
@ -1086,12 +1086,12 @@ _0808010C:
.pool .pool
_08080120: _08080120:
movs r5, 0 movs r5, 0
ldr r4, =gUnknown_083399C8 ldr r4, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_08080126: _08080126:
ldrb r1, [r4] ldrb r1, [r4]
ldrb r2, [r4, 0x1] ldrb r2, [r4, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -1160,7 +1160,7 @@ _080801C8:
ldr r0, [r4] ldr r0, [r4]
ldr r3, =0x000011b8 ldr r3, =0x000011b8
adds r0, r3 adds r0, r3
ldr r1, =gUnknown_0833981A ldr r1, =sText_CommunicationStandby
movs r2, 0 movs r2, 0
bl sub_808417C bl sub_808417C
ldr r1, [r4] ldr r1, [r4]
@ -2121,12 +2121,12 @@ _080809F0:
.pool .pool
_08080A04: _08080A04:
movs r4, 0 movs r4, 0
ldr r5, =gUnknown_083399C8 ldr r5, =sBlenderSyncArrowsPos
ldr r6, =gUnknown_020322A4 ldr r6, =gUnknown_020322A4
_08080A0A: _08080A0A:
ldrb r1, [r5] ldrb r1, [r5]
ldrb r2, [r5, 0x1] ldrb r2, [r5, 0x1]
ldr r0, =gUnknown_08339AD8 ldr r0, =sBlenderSyncArrow_SpriteTemplate
movs r3, 0x1 movs r3, 0x1
bl CreateSprite bl CreateSprite
ldr r1, [r6] ldr r1, [r6]
@ -3095,7 +3095,7 @@ sub_8081288: @ 8081288
mov r8, r7 mov r8, r7
lsls r1, 24 lsls r1, 24
ldr r0, =gUnknown_08339B40 ldr r0, =gUnknown_08339B40
ldr r4, =gUnknown_083399C8 ldr r4, =sBlenderSyncArrowsPos
lsrs r1, 23 lsrs r1, 23
adds r2, r1, r4 adds r2, r1, r4
ldrb r6, [r2] ldrb r6, [r2]
@ -5062,7 +5062,7 @@ _080822B0:
ldr r4, [r6] ldr r4, [r6]
ldr r5, =0x000011b8 ldr r5, =0x000011b8
adds r4, r5 adds r4, r5
ldr r5, =gUnknown_08339831 ldr r5, =sText_WouldLikeToBlendAnotherBerry
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -5263,7 +5263,7 @@ _0808246C:
ldr r4, [r6] ldr r4, [r6]
ldr r0, =0x000011b8 ldr r0, =0x000011b8
adds r4, r0 adds r4, r0
ldr r5, =gUnknown_0833981A ldr r5, =sText_CommunicationStandby
bl sav2_get_text_speed bl sav2_get_text_speed
adds r2, r0, 0 adds r2, r0, 0
lsls r2, 24 lsls r2, 24
@ -5555,7 +5555,7 @@ _080826EC:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_083398DD ldr r1, =sText_ApostropheSPokeblockCaseIsFull
b _08082740 b _08082740
.pool .pool
_0808271C: _0808271C:
@ -5575,7 +5575,7 @@ _0808271C:
adds r1, r0 adds r1, r0
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_083398B0 ldr r1, =sText_HasNoBerriesToPut
_08082740: _08082740:
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
@ -5856,7 +5856,7 @@ _080829AA:
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339896 ldr r1, =sText_YourPokeblockCaseIsFull
bl StringCopy bl StringCopy
b _08082A92 b _08082A92
.pool .pool
@ -5872,7 +5872,7 @@ _080829D4:
adds r0, r1 adds r0, r1
strh r2, [r0] strh r2, [r0]
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_08339858 ldr r1, =sText_RunOutOfBerriesForBlending
bl StringCopy bl StringCopy
b _08082A92 b _08082A92
.pool .pool
@ -7276,7 +7276,7 @@ _080834DE:
b _08083854 b _08083854
.pool .pool
_08083518: _08083518:
ldr r4, =gUnknown_083398F5 ldr r4, =sText_BlendingResults
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xA8 movs r2, 0xA8
@ -7329,7 +7329,7 @@ _08083564:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
@ -7374,7 +7374,7 @@ _08083564:
bl ConvertInternationalString bl ConvertInternationalString
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339914 ldr r1, =sText_SpaceBerry
bl StringAppend bl StringAppend
ldr r1, [r7] ldr r1, [r7]
adds r1, 0x9F adds r1, 0x9F
@ -7397,7 +7397,7 @@ _08083564:
cmp r6, r0 cmp r6, r0
bcc _08083564 bcc _08083564
_0808361A: _0808361A:
ldr r1, =gUnknown_0833992E ldr r1, =sText_MaximumSpeed
movs r3, 0xFF movs r3, 0xFF
mov r10, r3 mov r10, r3
str r3, [sp] str r3, [sp]
@ -7425,7 +7425,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x4E adds r0, 0x4E
@ -7445,7 +7445,7 @@ _0808361A:
bl StringAppend bl StringAppend
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_0833993C ldr r1, =sText_RPM
bl StringAppend bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
@ -7463,7 +7463,7 @@ _0808361A:
movs r0, 0x5 movs r0, 0x5
movs r3, 0x51 movs r3, 0x51
bl sub_80840D4 bl sub_80840D4
ldr r1, =gUnknown_0833991B ldr r1, =sText_Time
mov r2, r10 mov r2, r10
str r2, [sp] str r2, [sp]
mov r3, r9 mov r3, r9
@ -7499,7 +7499,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339921 ldr r1, =sText_Min
bl StringAppend bl StringAppend
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x2 movs r2, 0x2
@ -7507,7 +7507,7 @@ _0808361A:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r6] ldr r0, [r6]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339928 ldr r1, =sText_Sec
bl StringAppend bl StringAppend
ldr r1, [r6] ldr r1, [r6]
adds r1, 0x9F adds r1, 0x9F
@ -7682,10 +7682,10 @@ sub_80838AC: @ 80838AC
ldr r1, [r0] ldr r1, [r0]
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_0833979D ldr r1, =gText_WasMade
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
ldr r1, =gUnknown_08339943 ldr r1, =sText_NewLine
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
adds r0, r5, 0 adds r0, r5, 0
@ -7698,7 +7698,7 @@ sub_80838AC: @ 80838AC
adds r5, r0, 0 adds r5, r0, 0
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r1, =gUnknown_0833994F ldr r1, =sText_TheLevelIs
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
mov r0, sp mov r0, sp
@ -7709,7 +7709,7 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl StringAppend bl StringAppend
ldr r1, =gUnknown_0833995D ldr r1, =sText_TheFeelIs
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
mov r0, sp mov r0, sp
@ -7720,10 +7720,10 @@ sub_80838AC: @ 80838AC
adds r0, r6, 0 adds r0, r6, 0
mov r1, sp mov r1, sp
bl StringAppend bl StringAppend
ldr r1, =gUnknown_08339970 ldr r1, =sText_Dot2
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
ldr r1, =gUnknown_0833979B ldr r1, =gText_NewParagraph
adds r0, r6, 0 adds r0, r6, 0
bl StringAppend bl StringAppend
add sp, 0xC add sp, 0xC
@ -8041,7 +8041,7 @@ _08083B9A:
movs r2, 0x1 movs r2, 0x1
movs r3, 0xD movs r3, 0xD
bl SetWindowBorderStyle bl SetWindowBorderStyle
ldr r4, =gUnknown_08339947 ldr r4, =sText_Ranking
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xA8 movs r2, 0xA8
@ -8161,7 +8161,7 @@ _08083C84:
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
@ -8395,7 +8395,7 @@ _08083E8A:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_08339941 ldr r1, =sText_Dot
bl StringAppend bl StringAppend
adds r5, r0, 0 adds r5, r0, 0
adds r0, r4, 0 adds r0, r4, 0
@ -8407,7 +8407,7 @@ _08083E8A:
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
adds r5, r0, 0 adds r5, r0, 0
ldr r1, =gUnknown_0833993C ldr r1, =sText_RPM
bl StringAppend bl StringAppend
movs r0, 0x1 movs r0, 0x1
add r1, sp, 0xC add r1, sp, 0xC

2
asm/party_menu.s
View File

@ -4249,7 +4249,7 @@ _081B243E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r5, =gText_Confirm ldr r5, =gMenuText_Confirm
movs r0, 0 movs r0, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x30 movs r2, 0x30

167
data/berry_blender.s
View File

@ -1,167 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gUnknown_083390D4:: @ 83390D4
.incbin "baserom.gba", 0x3390d4, 0x20
gUnknown_083390F4:: @ 83390F4
.incbin "baserom.gba", 0x3390f4, 0x400
gUnknown_083394F4:: @ 83394F4
.incbin "baserom.gba", 0x3394f4, 0x246
gUnknown_0833973A:: @ 833973A
.incbin "baserom.gba", 0x33973a, 0x61
gUnknown_0833979B:: @ 833979B
.incbin "baserom.gba", 0x33979b, 0x2
gUnknown_0833979D:: @ 833979D
.incbin "baserom.gba", 0x33979d, 0x33
gUnknown_083397D0:: @ 83397D0
.incbin "baserom.gba", 0x3397d0, 0x4a
gUnknown_0833981A:: @ 833981A
.incbin "baserom.gba", 0x33981a, 0x17
gUnknown_08339831:: @ 8339831
.incbin "baserom.gba", 0x339831, 0x27
gUnknown_08339858:: @ 8339858
.incbin "baserom.gba", 0x339858, 0x3e
gUnknown_08339896:: @ 8339896
.incbin "baserom.gba", 0x339896, 0x1a
gUnknown_083398B0:: @ 83398B0
.incbin "baserom.gba", 0x3398b0, 0x2d
gUnknown_083398DD:: @ 83398DD
.incbin "baserom.gba", 0x3398dd, 0x18
gUnknown_083398F5:: @ 83398F5
.incbin "baserom.gba", 0x3398f5, 0x1f
gUnknown_08339914:: @ 8339914
.incbin "baserom.gba", 0x339914, 0x7
gUnknown_0833991B:: @ 833991B
.incbin "baserom.gba", 0x33991b, 0x6
gUnknown_08339921:: @ 8339921
.incbin "baserom.gba", 0x339921, 0x7
gUnknown_08339928:: @ 8339928
.incbin "baserom.gba", 0x339928, 0x6
gUnknown_0833992E:: @ 833992E
.incbin "baserom.gba", 0x33992e, 0xe
gUnknown_0833993C:: @ 833993C
.incbin "baserom.gba", 0x33993c, 0x5
gUnknown_08339941:: @ 8339941
.incbin "baserom.gba", 0x339941, 0x2
gUnknown_08339943:: @ 8339943
.incbin "baserom.gba", 0x339943, 0x4
gUnknown_08339947:: @ 8339947
.incbin "baserom.gba", 0x339947, 0x8
gUnknown_0833994F:: @ 833994F
.incbin "baserom.gba", 0x33994f, 0xe
gUnknown_0833995D:: @ 833995D
.incbin "baserom.gba", 0x33995d, 0x13
gUnknown_08339970:: @ 8339970
.incbin "baserom.gba", 0x339970, 0x4
gUnknown_08339974:: @ 8339974
.incbin "baserom.gba", 0x339974, 0xc
gUnknown_08339980:: @ 8339980
.incbin "baserom.gba", 0x339980, 0x38
gUnknown_083399B8:: @ 83399B8
.incbin "baserom.gba", 0x3399b8, 0x8
gUnknown_083399C0:: @ 83399C0
.incbin "baserom.gba", 0x3399c0, 0x8
gUnknown_083399C8:: @ 83399C8
.incbin "baserom.gba", 0x3399c8, 0x8
gUnknown_083399D0:: @ 83399D0
.incbin "baserom.gba", 0x3399d0, 0xc
gUnknown_083399DC:: @ 83399DC
.incbin "baserom.gba", 0x3399dc, 0x8
gUnknown_083399E4:: @ 83399E4
.incbin "baserom.gba", 0x3399e4, 0x3
gUnknown_083399E7:: @ 83399E7
.incbin "baserom.gba", 0x3399e7, 0x5
gUnknown_083399EC:: @ 83399EC
.incbin "baserom.gba", 0x3399ec, 0xd4
gUnknown_08339AC0:: @ 8339AC0
.incbin "baserom.gba", 0x339ac0, 0x8
gUnknown_08339AC8:: @ 8339AC8
.incbin "baserom.gba", 0x339ac8, 0x8
gUnknown_08339AD0:: @ 8339AD0
.incbin "baserom.gba", 0x339ad0, 0x8
gUnknown_08339AD8:: @ 8339AD8
.incbin "baserom.gba", 0x339ad8, 0x60
gUnknown_08339B38:: @ 8339B38
.incbin "baserom.gba", 0x339b38, 0x8
gUnknown_08339B40:: @ 8339B40
.incbin "baserom.gba", 0x339b40, 0x98
gUnknown_08339BD8:: @ 8339BD8
.incbin "baserom.gba", 0x339bd8, 0x8
gUnknown_08339BE0:: @ 8339BE0
.incbin "baserom.gba", 0x339be0, 0x44
gUnknown_08339C24:: @ 8339C24
.incbin "baserom.gba", 0x339c24, 0x8
gUnknown_08339C2C:: @ 8339C2C
.incbin "baserom.gba", 0x339c2c, 0x2c
gUnknown_08339C58:: @ 8339C58
.incbin "baserom.gba", 0x339c58, 0x8
gUnknown_08339C60:: @ 8339C60
.incbin "baserom.gba", 0x339c60, 0x18
gUnknown_08339C78:: @ 8339C78
.incbin "baserom.gba", 0x339c78, 0x28
gUnknown_08339CA0:: @ 8339CA0
.incbin "baserom.gba", 0x339ca0, 0x1e
gUnknown_08339CBE:: @ 8339CBE
.incbin "baserom.gba", 0x339cbe, 0x5
gUnknown_08339CC3:: @ 8339CC3
.incbin "baserom.gba", 0x339cc3, 0x5
gUnknown_08339CC8:: @ 8339CC8
.incbin "baserom.gba", 0x339cc8, 0x4c
gUnknown_08339D14:: @ 8339D14
.incbin "baserom.gba", 0x339d14, 0x8

38
data/graphics.s
View File

@ -1197,8 +1197,44 @@ gUnknown_08DC9608:: @ 8DC9608
.incbin "baserom.gba", 0xdc9608, 0x20 .incbin "baserom.gba", 0xdc9608, 0x20
gUnknown_08DC9628:: @ 8DC9628 gUnknown_08DC9628:: @ 8DC9628
.incbin "baserom.gba", 0xdc9628, 0x2788 .incbin "baserom.gba", 0xdc9628, 0x320
gBerryBlenderMiscPalette:: @ 8DCAB88
.incbin "graphics/berry_blender/misc.gbapal"
gBerryBlenderArrowPalette:: @ 8DC9948
.incbin "graphics/berry_blender/arrow.gbapal"
gUnknown_8DC9988:: @ 8DC9988
.incbin "baserom.gba", 0xdc9988, 0x200
.align 2
gBerryBlenderMarubatsuTiles:: @ 8DC9B88
.incbin "graphics/berry_blender/marubatsu.4bpp"
.align 2
gBerryBlenderParticlesTiles:: @ 8E90818
.incbin "graphics/berry_blender/particles.4bpp"
.space 0x120
.align 2
gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
.incbin "graphics/berry_blender/countdown_numbers.4bpp"
.align 2
gBerryBlenderStartTiles:: @ 8DCA588
.incbin "graphics/berry_blender/start.4bpp"
.space 0x200
.align 2
gBerryBlenderArrowTiles:: @ 8DCAB88
.incbin "graphics/berry_blender/arrow.4bpp"
gUnknown_08DCB388:: @ 8DCB388
.incbin "baserom.gba", 0xdcb388, 0xA28
gUnknown_08DCBDB0:: @ 8DCBDB0 gUnknown_08DCBDB0:: @ 8DCBDB0
.incbin "baserom.gba", 0xdcbdb0, 0x20 .incbin "baserom.gba", 0xdcbdb0, 0x20

77
data/item_menu.s
View File

@ -4,61 +4,100 @@
.section .rodata .section .rodata
gUnknown_08613F90:: @ 8613F90 gUnknown_08613F90:: @ 8613F90
.incbin "baserom.gba", 0x613f90, 0xc .4byte 0x11F0, 0x1E1, 0x21DE
@ possibly a struct
gUnknown_08613F9C:: @ 8613F9C gUnknown_08613F9C:: @ 8613F9C
.incbin "baserom.gba", 0x613f9c, 0x18 .4byte 0
.4byte bag_menu_change_item_callback
.4byte sub_81AB520
.4byte 0
.4byte 0x80000
.4byte 0x7003011
gUnknown_08613FB4:: @ 8613FB4 gUnknown_08613FB4:: @ 8613FB4
.incbin "baserom.gba", 0x613fb4, 0x78 .4byte gMenuText_Use, ItemMenu_UseOutOfBattle
.4byte gMenuText_Toss, ItemMenu_Toss
.4byte gMenuText_Register, ItemMenu_Register
.4byte gMenuText_Give, ItemMenu_Give
.4byte gText_Cancel2, ItemMenu_Cancel
.4byte gMenuText_Use, ItemMenu_UseInBattle
.4byte gMenuText_Check, ItemMenu_UseOutOfBattle
.4byte gMenuText_Walk, ItemMenu_UseOutOfBattle
.4byte gMenuText_Deselect, ItemMenu_Register
.4byte gMenuText_CheckTag, ItemMenu_CheckTag
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm
.4byte gMenuText_Show, unknown_ItemMenu_Show
.4byte gMenuText_Give2, unknown_ItemMenu_Give2
.4byte gMenuText_Confirm, unknown_ItemMenu_Confirm2
.4byte gText_EmptyString2, NULL
gUnknown_0861402C:: @ 861402C gUnknown_0861402C:: @ 861402C
.incbin "baserom.gba", 0x61402c, 0x4 .byte 0, 3, 1, 4
gUnknown_08614030:: @ 8614030 gUnknown_08614030:: @ 8614030
.incbin "baserom.gba", 0x614030, 0x4 .byte 0, 2, 14, 4
gUnknown_08614034:: @ 8614034 gUnknown_08614034:: @ 8614034
.incbin "baserom.gba", 0x614034, 0x4 .byte 3, 14, 1, 4
gUnknown_08614038:: @ 8614038 gUnknown_08614038:: @ 8614038
.incbin "baserom.gba", 0x614038, 0x4 .byte 0, 3, 14, 4
gUnknown_0861403C:: @ 861403C gUnknown_0861403C:: @ 861403C
.incbin "baserom.gba", 0x61403c, 0x6 .byte 9, 14, 0, 3, 1, 4
gUnknown_08614042:: @ 8614042 gUnknown_08614042:: @ 8614042
.incbin "baserom.gba", 0x614042, 0x2 .byte 5, 4
gUnknown_08614044:: @ 8614044 gUnknown_08614044:: @ 8614044
.incbin "baserom.gba", 0x614044, 0x2 .byte 3, 4
gUnknown_08614046:: @ 8614046 gUnknown_08614046:: @ 8614046
.incbin "baserom.gba", 0x614046, 0x1 .byte 4
gUnknown_08614047:: @ 8614047 gUnknown_08614047:: @ 8614047
.incbin "baserom.gba", 0x614047, 0x4 .byte 10, 9, 14, 4
gUnknown_0861404B:: @ 861404B gUnknown_0861404B:: @ 861404B
.incbin "baserom.gba", 0x61404b, 0x2 .byte 11, 4
gUnknown_0861404D:: @ 861404D gUnknown_0861404D:: @ 861404D
.incbin "baserom.gba", 0x61404d, 0x2 .byte 12, 4
gUnknown_0861404F:: @ 861404F gUnknown_0861404F:: @ 861404F
.incbin "baserom.gba", 0x61404f, 0x5 .byte 13, 4
.align 2
gUnknown_08614054:: @ 8614054 gUnknown_08614054:: @ 8614054
.incbin "baserom.gba", 0x614054, 0x30 .4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte item_menu_type_2
.4byte display_sell_item_ask_str
.4byte unknown_ItemMenu_Confirm
.4byte unknown_item_menu_type
.4byte display_deposit_item_ask_str
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte unknown_item_menu_type
.4byte NULL
.4byte item_menu_type_b
.align 2
gUnknown_08614084:: @ 8614084 gUnknown_08614084:: @ 8614084
.incbin "baserom.gba", 0x614084, 0x8 .4byte BagMenuActuallyToss
.4byte BagMenuCancelToss
gUnknown_0861408C:: @ 861408C gUnknown_0861408C:: @ 861408C
.incbin "baserom.gba", 0x61408c, 0x8 .4byte sub_81AD84C
.4byte sub_81AD6FC
@ probably a struct
gUnknown_08614094:: @ 8614094 gUnknown_08614094:: @ 8614094
.incbin "baserom.gba", 0x614094, 0x10 .4byte 0x1101C00
.4byte 0xFFFF1064
.4byte 0x6FFFFF
.4byte 0x6F
gUnknown_086140A4:: @ 86140A4 gUnknown_086140A4:: @ 86140A4
.incbin "baserom.gba", 0x6140a4, 0xc0 .incbin "baserom.gba", 0x6140a4, 0xc0

2
data/mauville_old_man.s
View File

@ -5,7 +5,7 @@
.align 2, 0 .align 2, 0
gUnknown_0859EFE4:: @ 859EFE4 gUnknown_0859EFE4:: @ 859EFE4
.incbin "baserom.gba", 0x59efe4, 0xc .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
gUnknown_0859EFF0:: @ 859EFF0 gUnknown_0859EFF0:: @ 859EFF0
.incbin "baserom.gba", 0x59eff0, 0x20 .incbin "baserom.gba", 0x59eff0, 0x20

15
data/save.s
View File

@ -4,4 +4,17 @@
.section .rodata .section .rodata
gSaveSectionOffsets:: @ 85CDC00 gSaveSectionOffsets:: @ 85CDC00
.incbin "baserom.gba", 0x5cdc00, 0x38 .2byte 0, 0xF2C
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF08
.2byte 0, 0xF80
.2byte 0xF80, 0xF80
.2byte 0x1F00, 0xF80
.2byte 0x2E80, 0xF80
.2byte 0x3E00, 0xF80
.2byte 0x4D80, 0xF80
.2byte 0x5D00, 0xF80
.2byte 0x6C80, 0xF80
.2byte 0x7C00, 0x7D0

222
data/script_menu.s
View File

@ -4,26 +4,22 @@
.section .rodata .section .rodata
gUnknown_0858ABD8:: @ 858ABD8 gUnknown_0858ABD8:: @ 858ABD8
@ replacing .incbin "baserom.gba", 0x0058abd8, 0x18
.4byte gUnknown_085EAD37, 0 .4byte gUnknown_085EAD37, 0
.4byte gUnknown_085EAD41, 0 .4byte gUnknown_085EAD41, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858ABF0:: @ 58ABF0 gUnknown_0858ABF0:: @ 58ABF0
@ replacing .incbin "baserom.gba", 0x0058abf0, 0x18
.4byte gUnknown_085EAD67, 0 .4byte gUnknown_085EAD67, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC08:: @ 58AC08 gUnknown_0858AC08:: @ 58AC08
@ replacing .incbin "baserom.gba", 0x0058ac08, 0x20
.4byte gUnknown_085EAD72, 0 .4byte gUnknown_085EAD72, 0
.4byte gUnknown_085EAD84, 0 .4byte gUnknown_085EAD84, 0
.4byte gUnknown_085EAD96, 0 .4byte gUnknown_085EAD96, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858AC28:: @ 58AC28 gUnknown_0858AC28:: @ 58AC28
@ replacing .incbin "baserom.gba", 0x0058ac28, 0x30
.4byte gUnknown_085EADA4, 0 .4byte gUnknown_085EADA4, 0
.4byte gUnknown_085EADB5, 0 .4byte gUnknown_085EADB5, 0
.4byte gUnknown_085EADC4, 0 .4byte gUnknown_085EADC4, 0
@ -32,32 +28,27 @@ gUnknown_0858AC28:: @ 58AC28
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC58:: @ 58AC58 gUnknown_0858AC58:: @ 58AC58
@ replacing .incbin "baserom.gba", 0x0058ac58, 0x20
.4byte gUnknown_085EADF9, 0 .4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0 .4byte gUnknown_085EAE04, 0
.4byte gUnknown_085EAE12, 0 .4byte gUnknown_085EAE12, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC78:: @ 58AC78 gUnknown_0858AC78:: @ 58AC78
@ replacing .incbin "baserom.gba", 0x0058ac78, 0x18
.4byte gUnknown_085EADF9, 0 .4byte gUnknown_085EADF9, 0
.4byte gUnknown_085EAE04, 0 .4byte gUnknown_085EAE04, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AC90:: @ 58AC90 gUnknown_0858AC90:: @ 58AC90
@ replacing .incbin "baserom.gba", 0x0058ac90, 0x20 .4byte gMenuText_Register, 0
.4byte gUnknown_085E8CCB, 0
.4byte gUnknown_085EAE12, 0 .4byte gUnknown_085EAE12, 0
.4byte gUnknown_085EAE1B, 0 .4byte gUnknown_085EAE1B, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858ACB0:: @ 58ACB0 gUnknown_0858ACB0:: @ 58ACB0
@ replacing .incbin "baserom.gba", 0x0058acb0, 0x10
.4byte gUnknown_085EAE27, 0 .4byte gUnknown_085EAE27, 0
.4byte gUnknown_085EAE2C, 0 .4byte gUnknown_085EAE2C, 0
gUnknown_0858ACC0:: @ 58ACC0 gUnknown_0858ACC0:: @ 58ACC0
@ replacing .incbin "baserom.gba", 0x0058acc0, 0x30
.4byte gUnknown_085EAE31, 0 .4byte gUnknown_085EAE31, 0
.4byte gUnknown_085EAE35, 0 .4byte gUnknown_085EAE35, 0
.4byte gUnknown_085EAE39, 0 .4byte gUnknown_085EAE39, 0
@ -66,157 +57,131 @@ gUnknown_0858ACC0:: @ 58ACC0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858ACF0:: @ 58ACF0 gUnknown_0858ACF0:: @ 58ACF0
@ replacing .incbin "baserom.gba", 0x0058acf0, 0x10
.4byte gUnknown_085EAD5F, 0 .4byte gUnknown_085EAD5F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD00:: @ 58AD00 gUnknown_0858AD00:: @ 58AD00
@ replacing .incbin "baserom.gba", 0x0058ad00, 0x10
.4byte gUnknown_085EAE53, 0 .4byte gUnknown_085EAE53, 0
.4byte gUnknown_085EAE5A, 0 .4byte gUnknown_085EAE5A, 0
gUnknown_0858AD10:: @ 58AD10 gUnknown_0858AD10:: @ 58AD10
@ replacing .incbin "baserom.gba", 0x0058ad10, 0x18
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gText_No, 0 .4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
gUnknown_0858AD28:: @ 58AD28 gUnknown_0858AD28:: @ 58AD28
@ replacing .incbin "baserom.gba", 0x0058ad28, 0x18
.4byte gUnknown_085EAEA2, 0 .4byte gUnknown_085EAEA2, 0
.4byte gUnknown_085EAEAC, 0 .4byte gUnknown_085EAEAC, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD40:: @ 58AD40 gUnknown_0858AD40:: @ 58AD40
@ replacing .incbin "baserom.gba", 0x0058ad40, 0x18
.4byte gText_Lv50, 0 .4byte gText_Lv50, 0
.4byte gText_OpenLevel, 0 .4byte gText_OpenLevel, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AD58:: @ 58AD58 gUnknown_0858AD58:: @ 58AD58
@ replacing .incbin "baserom.gba", 0x0058ad58, 0x18
.4byte gUnknown_0827ECBC, 0 .4byte gUnknown_0827ECBC, 0
.4byte gUnknown_0827ECC3, 0 .4byte gUnknown_0827ECC3, 0
.4byte gUnknown_0827ECCD, 0 .4byte gUnknown_0827ECCD, 0
gUnknown_0858AD70:: @ 58AD70 gUnknown_0858AD70:: @ 58AD70
@ replacing .incbin "baserom.gba", 0x0058ad70, 0x18
.4byte gUnknown_0827ECD5, 0 .4byte gUnknown_0827ECD5, 0
.4byte gUnknown_0827ECDD, 0 .4byte gUnknown_0827ECDD, 0
.4byte gUnknown_0827ECE3, 0 .4byte gUnknown_0827ECE3, 0
gUnknown_0858AD88:: @ 58AD88 gUnknown_0858AD88:: @ 58AD88
@ replacing .incbin "baserom.gba", 0x0058ad88, 0x18
.4byte gUnknown_0827ECEB, 0 .4byte gUnknown_0827ECEB, 0
.4byte gUnknown_0827ECF2, 0 .4byte gUnknown_0827ECF2, 0
.4byte gUnknown_0827ECF8, 0 .4byte gUnknown_0827ECF8, 0
gUnknown_0858ADA0:: @ 58ADA0 gUnknown_0858ADA0:: @ 58ADA0
@ replacing .incbin "baserom.gba", 0x0058ada0, 0x18
.4byte gUnknown_0827ED00, 0 .4byte gUnknown_0827ED00, 0
.4byte gUnknown_0827ED06, 0 .4byte gUnknown_0827ED06, 0
.4byte gUnknown_0827ED10, 0 .4byte gUnknown_0827ED10, 0
gUnknown_0858ADB8:: @ 58ADB8 gUnknown_0858ADB8:: @ 58ADB8
@ replacing .incbin "baserom.gba", 0x0058adb8, 0x18
.4byte gUnknown_0827ED18, 0 .4byte gUnknown_0827ED18, 0
.4byte gUnknown_0827ED22, 0 .4byte gUnknown_0827ED22, 0
.4byte gUnknown_0827ED2C, 0 .4byte gUnknown_0827ED2C, 0
gUnknown_0858ADD0:: @ 58ADD0 gUnknown_0858ADD0:: @ 58ADD0
@ replacing .incbin "baserom.gba", 0x0058add0, 0x18
.4byte gUnknown_0827ED36, 0 .4byte gUnknown_0827ED36, 0
.4byte gUnknown_0827ED40, 0 .4byte gUnknown_0827ED40, 0
.4byte gUnknown_0827ED46, 0 .4byte gUnknown_0827ED46, 0
gUnknown_0858ADE8:: @ 58ADE8 gUnknown_0858ADE8:: @ 58ADE8
@ replacing .incbin "baserom.gba", 0x0058ade8, 0x18
.4byte gUnknown_0827ED4F, 0 .4byte gUnknown_0827ED4F, 0
.4byte gUnknown_0827ED59, 0 .4byte gUnknown_0827ED59, 0
.4byte gUnknown_0827ED65, 0 .4byte gUnknown_0827ED65, 0
gUnknown_0858AE00:: @ 58AE00 gUnknown_0858AE00:: @ 58AE00
@ replacing .incbin "baserom.gba", 0x0058ae00, 0x18
.4byte gUnknown_0827ED70, 0 .4byte gUnknown_0827ED70, 0
.4byte gUnknown_0827ED74, 0 .4byte gUnknown_0827ED74, 0
.4byte gUnknown_0827ED78, 0 .4byte gUnknown_0827ED78, 0
gUnknown_0858AE18:: @ 58AE18 gUnknown_0858AE18:: @ 58AE18
@ replacing .incbin "baserom.gba", 0x0058ae18, 0x18
.4byte gUnknown_0827ED80, 0 .4byte gUnknown_0827ED80, 0
.4byte gUnknown_0827ED95, 0 .4byte gUnknown_0827ED95, 0
.4byte gUnknown_0827EDAA, 0 .4byte gUnknown_0827EDAA, 0
gUnknown_0858AE30:: @ 58AE30 gUnknown_0858AE30:: @ 58AE30
@ replacing .incbin "baserom.gba", 0x0058ae30, 0x18
.4byte gUnknown_0827EDB5, 0 .4byte gUnknown_0827EDB5, 0
.4byte gUnknown_0827EDBA, 0 .4byte gUnknown_0827EDBA, 0
.4byte gUnknown_0827EDC1, 0 .4byte gUnknown_0827EDC1, 0
gUnknown_0858AE48:: @ 58AE48 gUnknown_0858AE48:: @ 58AE48
@ replacing .incbin "baserom.gba", 0x0058ae48, 0x18
.4byte gUnknown_0827EDC9, 0 .4byte gUnknown_0827EDC9, 0
.4byte gUnknown_0827EDD5, 0 .4byte gUnknown_0827EDD5, 0
.4byte gUnknown_0827EDE4, 0 .4byte gUnknown_0827EDE4, 0
gUnknown_0858AE60:: @ 58AE60 gUnknown_0858AE60:: @ 58AE60
@ replacing .incbin "baserom.gba", 0x0058ae60, 0x18
.4byte gUnknown_0827EDF0, 0 .4byte gUnknown_0827EDF0, 0
.4byte gUnknown_0827EDF5, 0 .4byte gUnknown_0827EDF5, 0
.4byte gUnknown_0827EDF7, 0 .4byte gUnknown_0827EDF7, 0
gUnknown_0858AE78:: @ 58AE78 gUnknown_0858AE78:: @ 58AE78
@ replacing .incbin "baserom.gba", 0x0058ae78, 0x18
.4byte gUnknown_0827EDF9, 0 .4byte gUnknown_0827EDF9, 0
.4byte gUnknown_0827EDFB, 0 .4byte gUnknown_0827EDFB, 0
.4byte gUnknown_0827EDFD, 0 .4byte gUnknown_0827EDFD, 0
gUnknown_0858AE90:: @ 58AE90 gUnknown_0858AE90:: @ 58AE90
@ replacing .incbin "baserom.gba", 0x0058ae90, 0x18
.4byte gUnknown_0827EDFF, 0 .4byte gUnknown_0827EDFF, 0
.4byte gUnknown_0827EE01, 0 .4byte gUnknown_0827EE01, 0
.4byte gUnknown_0827EE03, 0 .4byte gUnknown_0827EE03, 0
gUnknown_0858AEA8:: @ 58AEA8 gUnknown_0858AEA8:: @ 58AEA8
@ replacing .incbin "baserom.gba", 0x0058aea8, 0x18
.4byte gUnknown_0827EE05, 0 .4byte gUnknown_0827EE05, 0
.4byte gUnknown_0827EE07, 0 .4byte gUnknown_0827EE07, 0
.4byte gUnknown_0827EE09, 0 .4byte gUnknown_0827EE09, 0
gUnknown_0858AEC0:: @ 58AEC0 gUnknown_0858AEC0:: @ 58AEC0
@ replacing .incbin "baserom.gba", 0x0058aec0, 0x20
.4byte gUnknown_085EAEC3, 0 .4byte gUnknown_085EAEC3, 0
.4byte gUnknown_085EAED6, 0 .4byte gUnknown_085EAED6, 0
.4byte gUnknown_085EAEE6, 0 .4byte gUnknown_085EAEE6, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AEE0:: @ 58AEE0 gUnknown_0858AEE0:: @ 58AEE0
@ replacing .incbin "baserom.gba", 0x0058aee0, 0x20
.4byte gUnknown_085EAEF6, 0 .4byte gUnknown_085EAEF6, 0
.4byte gUnknown_085EAF02, 0 .4byte gUnknown_085EAF02, 0
.4byte gUnknown_085EAF0E, 0 .4byte gUnknown_085EAF0E, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF00:: @ 58AF00 gUnknown_0858AF00:: @ 58AF00
@ replacing .incbin "baserom.gba", 0x0058af00, 0x20
.4byte gUnknown_085EAF1B, 0 .4byte gUnknown_085EAF1B, 0
.4byte gUnknown_085EAF24, 0 .4byte gUnknown_085EAF24, 0
.4byte gUnknown_085EAF2F, 0 .4byte gUnknown_085EAF2F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF20:: @ 58AF20 gUnknown_0858AF20:: @ 58AF20
@ replacing .incbin "baserom.gba", 0x0058af20, 0x10
.4byte gUnknown_085EAF34, 0 .4byte gUnknown_085EAF34, 0
.4byte gUnknown_085EAF3E, 0 .4byte gUnknown_085EAF3E, 0
gUnknown_0858AF30:: @ 58AF30 gUnknown_0858AF30:: @ 58AF30
@ replacing .incbin "baserom.gba", 0x0058af30, 0x18
.4byte gUnknown_085EAF4B, 0 .4byte gUnknown_085EAF4B, 0
.4byte gUnknown_085EAF58, 0 .4byte gUnknown_085EAF58, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AF48:: @ 58AF48 gUnknown_0858AF48:: @ 58AF48
@ replacing .incbin "baserom.gba", 0x0058af48, 0x40
.4byte gUnknown_085EAF65, 0 .4byte gUnknown_085EAF65, 0
.4byte gUnknown_085EAF70, 0 .4byte gUnknown_085EAF70, 0
.4byte gUnknown_085EAF7D, 0 .4byte gUnknown_085EAF7D, 0
@ -227,14 +192,12 @@ gUnknown_0858AF48:: @ 58AF48
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858AF88:: @ 58AF88 gUnknown_0858AF88:: @ 58AF88
@ replacing .incbin "baserom.gba", 0x0058af88, 0x20
.4byte gUnknown_085EAFB6, 0 .4byte gUnknown_085EAFB6, 0
.4byte gUnknown_085EAFCF, 0 .4byte gUnknown_085EAFCF, 0
.4byte gUnknown_085EAFE8, 0 .4byte gUnknown_085EAFE8, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFA8:: @ 58AFA8 gUnknown_0858AFA8:: @ 58AFA8
@ replacing .incbin "baserom.gba", 0x0058afa8, 0x30
.4byte gUnknown_085EB089, 0 .4byte gUnknown_085EB089, 0
.4byte gUnknown_085EB09C, 0 .4byte gUnknown_085EB09C, 0
.4byte gUnknown_085EB0AF, 0 .4byte gUnknown_085EB0AF, 0
@ -243,40 +206,33 @@ gUnknown_0858AFA8:: @ 58AFA8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFD8:: @ 58AFD8 gUnknown_0858AFD8:: @ 58AFD8
@ replacing .incbin "baserom.gba", 0x0058afd8, 0x18
.4byte gUnknown_085EB002, 0 .4byte gUnknown_085EB002, 0
.4byte gUnknown_085EB017, 0 .4byte gUnknown_085EB017, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858AFF0:: @ 58AFF0 gUnknown_0858AFF0:: @ 58AFF0
@ replacing .incbin "baserom.gba", 0x0058aff0, 0x10
.4byte gUnknown_085EB02A, 0 .4byte gUnknown_085EB02A, 0
.4byte gUnknown_085EB034, 0 .4byte gUnknown_085EB034, 0
gUnknown_0858B000:: @ 58B000 gUnknown_0858B000:: @ 58B000
@ replacing .incbin "baserom.gba", 0x0058b000, 0x18 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0 .4byte gText_BattleFrontier, 0
.4byte gUnknown_085EB06E, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B018:: @ 58B018 gUnknown_0858B018:: @ 58B018
@ replacing .incbin "baserom.gba", 0x0058b018, 0x18 .4byte gText_SlateportCity, 0
.4byte gUnknown_085EB7A9, 0 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B030:: @ 58B030 gUnknown_0858B030:: @ 58B030
@ replacing .incbin "baserom.gba", 0x0058b030, 0x10
.4byte gUnknown_085EB07E, 0 .4byte gUnknown_085EB07E, 0
.4byte gUnknown_085EB084, 0 .4byte gUnknown_085EB084, 0
gUnknown_0858B040:: @ 58B040 gUnknown_0858B040:: @ 58B040
@ replacing .incbin "baserom.gba", 0x0058b040, 0x10 .4byte gText_LilycoveCity, 0
.4byte gUnknown_085EB79B, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B050:: @ 58B050 gUnknown_0858B050:: @ 58B050
@ replacing .incbin "baserom.gba", 0x0058b050, 0x30
.4byte gUnknown_085EB676, 0 .4byte gUnknown_085EB676, 0
.4byte gUnknown_085EB673, 0 .4byte gUnknown_085EB673, 0
.4byte gUnknown_085EB670, 0 .4byte gUnknown_085EB670, 0
@ -285,91 +241,76 @@ gUnknown_0858B050:: @ 58B050
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B080:: @ 58B080 gUnknown_0858B080:: @ 58B080
@ replacing .incbin "baserom.gba", 0x0058b080, 0x10
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B090:: @ 58B090 gUnknown_0858B090:: @ 58B090
@ replacing .incbin "baserom.gba", 0x0058b090, 0x10
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0A0:: @ 58B0A0 gUnknown_0858B0A0:: @ 58B0A0
@ replacing .incbin "baserom.gba", 0x0058b0a0, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0B8:: @ 58B0B8 gUnknown_0858B0B8:: @ 58B0B8
@ replacing .incbin "baserom.gba", 0x0058b0b8, 0x10
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0C8:: @ 58B0C8 gUnknown_0858B0C8:: @ 58B0C8
@ replacing .incbin "baserom.gba", 0x0058b0c8, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0E0:: @ 58B0E0 gUnknown_0858B0E0:: @ 58B0E0
@ replacing .incbin "baserom.gba", 0x0058b0e0, 0x18
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B0F8:: @ 58B0F8 gUnknown_0858B0F8:: @ 58B0F8
@ replacing .incbin "baserom.gba", 0x0058b0f8, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B118:: @ 58B118 gUnknown_0858B118:: @ 58B118
@ replacing .incbin "baserom.gba", 0x0058b118, 0x10
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B128:: @ 58B128 gUnknown_0858B128:: @ 58B128
@ replacing .incbin "baserom.gba", 0x0058b128, 0x18
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B140:: @ 58B140 gUnknown_0858B140:: @ 58B140
@ replacing .incbin "baserom.gba", 0x0058b140, 0x18
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B158:: @ 58B158 gUnknown_0858B158:: @ 58B158
@ replacing .incbin "baserom.gba", 0x0058b158, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B178:: @ 58B178 gUnknown_0858B178:: @ 58B178
@ replacing .incbin "baserom.gba", 0x0058b178, 0x18
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B190:: @ 58B190 gUnknown_0858B190:: @ 58B190
@ replacing .incbin "baserom.gba", 0x0058b190, 0x20
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1B0:: @ 58B1B0 gUnknown_0858B1B0:: @ 58B1B0
@ replacing .incbin "baserom.gba", 0x0058b1b0, 0x20
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
.4byte gUnknown_085EB062, 0 .4byte gUnknown_085EB062, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1D0:: @ 58B1D0 gUnknown_0858B1D0:: @ 58B1D0
@ replacing .incbin "baserom.gba", 0x0058b1d0, 0x28
.4byte gUnknown_085EB040, 0 .4byte gUnknown_085EB040, 0
.4byte gUnknown_085EB04A, 0 .4byte gUnknown_085EB04A, 0
.4byte gUnknown_085EB057, 0 .4byte gUnknown_085EB057, 0
@ -377,42 +318,36 @@ gUnknown_0858B1D0:: @ 58B1D0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B1F8:: @ 58B1F8 gUnknown_0858B1F8:: @ 58B1F8
@ replacing .incbin "baserom.gba", 0x0058b1f8, 0x30 .4byte gText_Opponent, 0
.4byte gUnknown_085EB1A0, 0 .4byte gText_Tourney_Tree, 0
.4byte gUnknown_085EB1A9, 0 .4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB1B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B228:: @ 58B228 gUnknown_0858B228:: @ 58B228
@ replacing .incbin "baserom.gba", 0x0058b228, 0x28 .4byte gText_Opponent, 0
.4byte gUnknown_085EB1A0, 0 .4byte gText_Tourney_Tree, 0
.4byte gUnknown_085EB1A9, 0 .4byte gText_ReadyToStart, 0
.4byte gUnknown_085EB1B6, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B250:: @ 58B250 gUnknown_0858B250:: @ 58B250
@ replacing .incbin "baserom.gba", 0x0058b250, 0x10
.4byte gUnknown_085EB29A, 0 .4byte gUnknown_085EB29A, 0
.4byte gUnknown_085EB2A3, 0 .4byte gUnknown_085EB2A3, 0
gUnknown_0858B260:: @ 58B260 gUnknown_0858B260:: @ 58B260
@ replacing .incbin "baserom.gba", 0x0058b260, 0x20
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0 .4byte gUnknown_085EB389, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B280:: @ 58B280 gUnknown_0858B280:: @ 58B280
@ replacing .incbin "baserom.gba", 0x0058b280, 0x18
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gText_No, 0 .4byte gText_No, 0
.4byte gUnknown_085EAD6D, 0 .4byte gUnknown_085EAD6D, 0
gUnknown_0858B298:: @ 58B298 gUnknown_0858B298:: @ 58B298
@ replacing .incbin "baserom.gba", 0x0058b298, 0x28
.4byte gUnknown_085EAE6E, 0 .4byte gUnknown_085EAE6E, 0
.4byte gUnknown_085EAE7C, 0 .4byte gUnknown_085EAE7C, 0
.4byte gUnknown_085EAE8A, 0 .4byte gUnknown_085EAE8A, 0
@ -420,14 +355,12 @@ gUnknown_0858B298:: @ 58B298
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B2C0:: @ 58B2C0 gUnknown_0858B2C0:: @ 58B2C0
@ replacing .incbin "baserom.gba", 0x0058b2c0, 0x20
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB397, 0 .4byte gUnknown_085EB397, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B2E0:: @ 58B2E0 gUnknown_0858B2E0:: @ 58B2E0
@ replacing .incbin "baserom.gba", 0x0058b2e0, 0x28
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gUnknown_085EB389, 0 .4byte gUnknown_085EB389, 0
@ -435,52 +368,44 @@ gUnknown_0858B2E0:: @ 58B2E0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B308:: @ 58B308 gUnknown_0858B308:: @ 58B308
@ replacing .incbin "baserom.gba", 0x0058b308, 0x18
.4byte gUnknown_085EB372, 0 .4byte gUnknown_085EB372, 0
.4byte gUnknown_085EB37F, 0 .4byte gUnknown_085EB37F, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B320:: @ 58B320 gUnknown_0858B320:: @ 58B320
@ replacing .incbin "baserom.gba", 0x0058b320, 0x18
.4byte gUnknown_085EB3A4, 0 .4byte gUnknown_085EB3A4, 0
.4byte gUnknown_085EB3B1, 0 .4byte gUnknown_085EB3B1, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B338:: @ 58B338 gUnknown_0858B338:: @ 58B338
@ replacing .incbin "baserom.gba", 0x0058b338, 0x18
.4byte gUnknown_085EB3D4, 0 .4byte gUnknown_085EB3D4, 0
.4byte gUnknown_085EB3C6, 0 .4byte gUnknown_085EB3C6, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B350:: @ 58B350 gUnknown_0858B350:: @ 58B350
@ replacing .incbin "baserom.gba", 0x0058b350, 0x28 .4byte gText_NormalRank, 0
.4byte gUnknown_085EB1C5, 0 .4byte gText_SuperRank, 0
.4byte gUnknown_085EB1D1, 0 .4byte gText_HyperRank, 0
.4byte gUnknown_085EB1DC, 0 .4byte gText_MasterRank, 0
.4byte gUnknown_085EB1E7, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B378:: @ 58B378 gUnknown_0858B378:: @ 58B378
@ replacing .incbin "baserom.gba", 0x0058b378, 0x18 .4byte gText_BattleBag, 0
.4byte gUnknown_085EB212, 0 .4byte gText_HeldItem, 0
.4byte gUnknown_085EB21D, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B390:: @ 58B390 gUnknown_0858B390:: @ 58B390
@ replacing .incbin "baserom.gba", 0x0058b390, 0x20 .4byte gText_LinkContest, 0
.4byte gUnknown_085EB227, 0 .4byte gText_AboutE_Mode, 0
.4byte gUnknown_085EB234, 0 .4byte gText_AboutG_Mode, 0
.4byte gUnknown_085EB241, 0
.4byte gText_Cancel2, 0 .4byte gText_Cancel2, 0
gUnknown_0858B3B0:: @ 58B3B0 gUnknown_0858B3B0:: @ 58B3B0
@ replacing .incbin "baserom.gba", 0x0058b3b0, 0x18 .4byte gText_E_Mode, 0
.4byte gUnknown_085EB24E, 0 .4byte gText_G_Mode, 0
.4byte gUnknown_085EB255, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B3C8:: @ 58B3C8 gUnknown_0858B3C8:: @ 58B3C8
@ replacing .incbin "baserom.gba", 0x0058b3c8, 0x40
.4byte gText_MenuOptionPokedex, 0 .4byte gText_MenuOptionPokedex, 0
.4byte gText_MenuOptionPokemon, 0 .4byte gText_MenuOptionPokemon, 0
.4byte gText_MenuOptionBag, 0 .4byte gText_MenuOptionBag, 0
@ -491,50 +416,42 @@ gUnknown_0858B3C8:: @ 58B3C8
.4byte gText_MenuOptionExit, 0 .4byte gText_MenuOptionExit, 0
gUnknown_0858B408:: @ 58B408 gUnknown_0858B408:: @ 58B408
@ replacing .incbin "baserom.gba", 0x0058b408, 0x20
.4byte gUnknown_085EB28A, 0 .4byte gUnknown_085EB28A, 0
.4byte gUnknown_085EB290, 0 .4byte gUnknown_085EB290, 0
.4byte gUnknown_085EB295, 0 .4byte gUnknown_085EB295, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B428:: @ 58B428 gUnknown_0858B428:: @ 58B428
@ replacing .incbin "baserom.gba", 0x0058b428, 0x18 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B440:: @ 58B440 gUnknown_0858B440:: @ 58B440
@ replacing .incbin "baserom.gba", 0x0058b440, 0x18 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B458:: @ 58B458 gUnknown_0858B458:: @ 58B458
@ replacing .incbin "baserom.gba", 0x0058b458, 0x18 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B470:: @ 58B470 gUnknown_0858B470:: @ 58B470
@ replacing .incbin "baserom.gba", 0x0058b470, 0x20 .4byte gText_SouthernIsland, 0
.4byte gUnknown_085EB2AD, 0 .4byte gText_BirthIsland, 0
.4byte gUnknown_085EB2BD, 0 .4byte gText_FarawayIsland, 0
.4byte gUnknown_085EB2CA, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B490:: @ 58B490 gUnknown_0858B490:: @ 58B490
@ replacing .incbin "baserom.gba", 0x0058b490, 0x18
.4byte gUnknown_085EB2E4, 0 .4byte gUnknown_085EB2E4, 0
.4byte gUnknown_085EB2F0, 0 .4byte gUnknown_085EB2F0, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B4A8:: @ 58B4A8 gUnknown_0858B4A8:: @ 58B4A8
@ replacing .incbin "baserom.gba", 0x0058b4a8, 0x10
.4byte gText_Yes, 0 .4byte gText_Yes, 0
.4byte gUnknown_085EB2FC, 0 .4byte gUnknown_085EB2FC, 0
gUnknown_0858B4B8:: @ 58B4B8 gUnknown_0858B4B8:: @ 58B4B8
@ replacing .incbin "baserom.gba", 0x0058b4b8, 0x30
.4byte gUnknown_085EB3DF, 0 .4byte gUnknown_085EB3DF, 0
.4byte gUnknown_085EB3EA, 0 .4byte gUnknown_085EB3EA, 0
.4byte gUnknown_085EB3F1, 0 .4byte gUnknown_085EB3F1, 0
@ -543,14 +460,12 @@ gUnknown_0858B4B8:: @ 58B4B8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B4E8:: @ 58B4E8 gUnknown_0858B4E8:: @ 58B4E8
@ replacing .incbin "baserom.gba", 0x0058b4e8, 0x20
.4byte gUnknown_085EB415, 0 .4byte gUnknown_085EB415, 0
.4byte gUnknown_085EB41D, 0 .4byte gUnknown_085EB41D, 0
.4byte gUnknown_085EB424, 0 .4byte gUnknown_085EB424, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B508:: @ 58B508 gUnknown_0858B508:: @ 58B508
@ replacing .incbin "baserom.gba", 0x0058b508, 0x28
.4byte gUnknown_085EB45C, 0 .4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0 .4byte gUnknown_085EB469, 0
.4byte gUnknown_085EB475, 0 .4byte gUnknown_085EB475, 0
@ -558,7 +473,6 @@ gUnknown_0858B508:: @ 58B508
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B530:: @ 58B530 gUnknown_0858B530:: @ 58B530
@ replacing .incbin "baserom.gba", 0x0058b530, 0x28
.4byte gUnknown_085EB42F, 0 .4byte gUnknown_085EB42F, 0
.4byte gUnknown_085EB43A, 0 .4byte gUnknown_085EB43A, 0
.4byte gUnknown_085EB444, 0 .4byte gUnknown_085EB444, 0
@ -566,14 +480,12 @@ gUnknown_0858B530:: @ 58B530
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B558:: @ 58B558 gUnknown_0858B558:: @ 58B558
@ replacing .incbin "baserom.gba", 0x0058b558, 0x20
.4byte gUnknown_085EB48E, 0 .4byte gUnknown_085EB48E, 0
.4byte gUnknown_085EB496, 0 .4byte gUnknown_085EB496, 0
.4byte gUnknown_085EB4A3, 0 .4byte gUnknown_085EB4A3, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B578:: @ 58B578 gUnknown_0858B578:: @ 58B578
@ replacing .incbin "baserom.gba", 0x0058b578, 0x30
.4byte gUnknown_085EB4AD, 0 .4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0 .4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0 .4byte gUnknown_085EB4C7, 0
@ -582,7 +494,6 @@ gUnknown_0858B578:: @ 58B578
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B5A8:: @ 58B5A8 gUnknown_0858B5A8:: @ 58B5A8
@ replacing .incbin "baserom.gba", 0x0058b5a8, 0x30
.4byte gUnknown_085EB4EB, 0 .4byte gUnknown_085EB4EB, 0
.4byte gUnknown_085EB4F9, 0 .4byte gUnknown_085EB4F9, 0
.4byte gUnknown_085EB508, 0 .4byte gUnknown_085EB508, 0
@ -591,7 +502,6 @@ gUnknown_0858B5A8:: @ 58B5A8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B5D8:: @ 58B5D8 gUnknown_0858B5D8:: @ 58B5D8
@ replacing .incbin "baserom.gba", 0x0058b5d8, 0x28
.4byte gUnknown_085EB532, 0 .4byte gUnknown_085EB532, 0
.4byte gUnknown_085EB543, 0 .4byte gUnknown_085EB543, 0
.4byte gUnknown_085EB555, 0 .4byte gUnknown_085EB555, 0
@ -599,57 +509,48 @@ gUnknown_0858B5D8:: @ 58B5D8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B600:: @ 58B600 gUnknown_0858B600:: @ 58B600
@ replacing .incbin "baserom.gba", 0x0058b600, 0x20
.4byte gUnknown_085EB56E, 0 .4byte gUnknown_085EB56E, 0
.4byte gUnknown_085EB57E, 0 .4byte gUnknown_085EB57E, 0
.4byte gUnknown_085EB589, 0 .4byte gUnknown_085EB589, 0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B620:: @ 58B620 gUnknown_0858B620:: @ 58B620
@ replacing .incbin "baserom.gba", 0x0058b620, 0x20
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B640:: @ 58B640 gUnknown_0858B640:: @ 58B640
@ replacing .incbin "baserom.gba", 0x0058b640, 0x18
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C3, 0 .4byte gUnknown_085EB5C3, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B658:: @ 58B658 gUnknown_0858B658:: @ 58B658
@ replacing .incbin "baserom.gba", 0x0058b658, 0x18
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5BC, 0 .4byte gUnknown_085EB5BC, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B670:: @ 58B670 gUnknown_0858B670:: @ 58B670
@ replacing .incbin "baserom.gba", 0x0058b670, 0x10
.4byte gUnknown_085EB5B6, 0 .4byte gUnknown_085EB5B6, 0
.4byte gUnknown_085EB5C8, 0 .4byte gUnknown_085EB5C8, 0
gUnknown_0858B680:: @ 58B680 gUnknown_0858B680:: @ 58B680
@ replacing .incbin "baserom.gba", 0x0058b680, 0x10
.4byte gUnknown_085EE14B, 0 .4byte gUnknown_085EE14B, 0
.4byte gUnknown_085EE14F, 0 .4byte gUnknown_085EE14F, 0
gUnknown_0858B690:: @ 58B690 gUnknown_0858B690:: @ 58B690
@ replacing .incbin "baserom.gba", 0x0058b690, 0x20
.4byte gUnknown_085EB2FF, 0 .4byte gUnknown_085EB2FF, 0
.4byte gUnknown_085EB310, 0 .4byte gUnknown_085EB310, 0
.4byte gUnknown_085EB317, 0 .4byte gUnknown_085EB317, 0
.4byte gUnknown_085EB31F, 0 .4byte gUnknown_085EB31F, 0
gUnknown_0858B6B0:: @ 58B6B0 gUnknown_0858B6B0:: @ 58B6B0
@ replacing .incbin "baserom.gba", 0x0058b6b0, 0x20 .4byte gText_CaveOfOrigin, 0
.4byte gUnknown_085EB7B8, 0 .4byte gText_MtPyre, 0
.4byte gUnknown_085EB7C7, 0 .4byte gText_SkyPillar, 0
.4byte gUnknown_085EB7D0, 0 .4byte gText_DontRemember, 0
.4byte gUnknown_085EB7DB, 0
gUnknown_0858B6D0:: @ 58B6D0 gUnknown_0858B6D0:: @ 58B6D0
@ replacing .incbin "baserom.gba", 0x0058b6d0, 0x30
.4byte gUnknown_085EB4AD, 0 .4byte gUnknown_085EB4AD, 0
.4byte gUnknown_085EB4B9, 0 .4byte gUnknown_085EB4B9, 0
.4byte gUnknown_085EB4C7, 0 .4byte gUnknown_085EB4C7, 0
@ -658,7 +559,6 @@ gUnknown_0858B6D0:: @ 58B6D0
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B700:: @ 58B700 gUnknown_0858B700:: @ 58B700
@ replacing .incbin "baserom.gba", 0x0058b700, 0x30
.4byte gUnknown_085EB5A6, 0 .4byte gUnknown_085EB5A6, 0
.4byte gUnknown_085EB45C, 0 .4byte gUnknown_085EB45C, 0
.4byte gUnknown_085EB469, 0 .4byte gUnknown_085EB469, 0
@ -667,7 +567,6 @@ gUnknown_0858B700:: @ 58B700
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B730:: @ 58B730 gUnknown_0858B730:: @ 58B730
@ replacing .incbin "baserom.gba", 0x0058b730, 0x28
.4byte gUnknown_085EB32D, 0 .4byte gUnknown_085EB32D, 0
.4byte gUnknown_085EB33E, 0 .4byte gUnknown_085EB33E, 0
.4byte gUnknown_085EB350, 0 .4byte gUnknown_085EB350, 0
@ -675,12 +574,10 @@ gUnknown_0858B730:: @ 58B730
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B758:: @ 58B758 gUnknown_0858B758:: @ 58B758
@ replacing .incbin "baserom.gba", 0x0058b758, 0x8
.4byte gText_Exit, 0 .4byte gText_Exit, 0
gUnknown_0858B760:: @ 858B760 gUnknown_0858B760:: @ 858B760
@ replacing .incbin "baserom.gba", 0x0058b760, 0x390
.4byte 0x0858abd8, 3 .4byte 0x0858abd8, 3
.4byte gUnknown_0858B758, 1 .4byte gUnknown_0858B758, 1
.4byte gUnknown_0858ABF0, 3 .4byte gUnknown_0858ABF0, 3
@ -797,16 +694,55 @@ gUnknown_0858B760:: @ 858B760
.4byte gUnknown_0858B730, 5 .4byte gUnknown_0858B730, 5
gUnknown_0858BAF0:: @ 858BAF0 gUnknown_0858BAF0:: @ 858BAF0
.incbin "baserom.gba", 0x58baf0, 0x78 .4byte gText_Cool
.4byte gText_Beauty
.4byte gText_Cute
.4byte gText_Smart
.4byte gText_Tough
.4byte gText_Normal
.4byte gText_Super
.4byte gText_Hyper
.4byte gText_Master
.4byte gText_Cool2
.4byte gText_Beauty2
.4byte gText_Cute2
.4byte gText_Smart2
.4byte gText_Tough2
.4byte gText_Items
.4byte gText_Key_Items
.4byte gText_Poke_Balls
.4byte gText_TMs_Hms
.4byte gText_Berries2
.4byte gText_Single2
.4byte gText_Double2
.4byte gText_Multi
.4byte gText_MultiLink
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattleFactory
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattlePike
.4byte gText_BattlePyramid
gUnknown_0858BB68:: @ 858BB68 gUnknown_0858BB68:: @ 858BB68
.incbin "baserom.gba", 0x58bb68, 0x8 .byte 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F
.align 2
gUnknown_0858BB70:: @ 858BB70 gUnknown_0858BB70:: @ 858BB70
.incbin "baserom.gba", 0x58bb70, 0x10 .4byte gText_SomeonesPC
.4byte gText_LanettesPC
.4byte gText_PlayersPC
.4byte gText_LogOff
gUnknown_0858BB80:: @ 858BB80 gUnknown_0858BB80:: @ 858BB80
.incbin "baserom.gba", 0x58bb80, 0x1c .4byte gText_SlateportCity
.4byte gText_BattleFrontier
.4byte gText_SouthernIsland
.4byte gText_NavelRock
.4byte gText_BirthIsland
.4byte gText_FarawayIsland
.4byte gText_Exit
gUnknown_0858BB9C:: @ 858BB9C gUnknown_0858BB9C:: @ 858BB9C
.incbin "baserom.gba", 0x58bb9c, 0x10 .incbin "baserom.gba", 0x58bb9c, 0x10

122
data/strings.s
View File

@ -534,25 +534,25 @@ gUnknown_085E8CAC:: @ 85E8CAC
gText_FlyToWhere:: @ 85E8CB4 gText_FlyToWhere:: @ 85E8CB4
.string "FLY to where?$" .string "FLY to where?$"
gUnknown_085E8CC2:: @ 85E8CC2 gMenuText_Use:: @ 85E8CC2
.string "USE$" .string "USE$"
gUnknown_085E8CC6:: @ 85E8CC6 gMenuText_Toss:: @ 85E8CC6
.string "TOSS$" .string "TOSS$"
gUnknown_085E8CCB:: @ 85E8CCB gMenuText_Register:: @ 85E8CCB
.string "REGISTER$" .string "REGISTER$"
gUnknown_085E8CD4:: @ 85E8CD4 gMenuText_Give:: @ 85E8CD4
.string "GIVE$" .string "GIVE$"
gUnknown_085E8CD9:: @ 85E8CD9 gMenuText_CheckTag:: @ 85E8CD9
.string "CHECK TAG$" .string "CHECK TAG$"
gText_Confirm:: @ 85E8CE3 gMenuText_Confirm:: @ 85E8CE3
.string "CONFIRM$" .string "CONFIRM$"
gUnknown_085E8CEB:: @ 85E8CEB gMenuText_Walk:: @ 85E8CEB
.string "WALK$" .string "WALK$"
gText_Cancel:: @ 85E8CF0 gText_Cancel:: @ 85E8CF0
@ -561,7 +561,7 @@ gText_Cancel:: @ 85E8CF0
gText_Cancel2:: @ 85E8CF7 gText_Cancel2:: @ 85E8CF7
.string "CANCEL$" .string "CANCEL$"
gUnknown_085E8CFE:: @ 85E8CFE gMenuText_Show:: @ 85E8CFE
.string "SHOW$" .string "SHOW$"
gText_EmptyString2:: @ 85E8D03 gText_EmptyString2:: @ 85E8D03
@ -582,13 +582,13 @@ gUnknown_085E8D15:: @ 85E8D15
gUnknown_085E8D1A:: @ 85E8D1A gUnknown_085E8D1A:: @ 85E8D1A
.string "STORE$" .string "STORE$"
gUnknown_085E8D20:: @ 85E8D20 gMenuText_Check:: @ 85E8D20
.string "CHECK$" .string "CHECK$"
gText_None:: @ 85E8D26 gText_None:: @ 85E8D26
.string "NONE$" .string "NONE$"
gUnknown_085E8D2B:: @ 85E8D2B gMenuText_Deselect:: @ 85E8D2B
.string "DESELECT$" .string "DESELECT$"
gText_ThreeMarks:: @ 85E8D34 gText_ThreeMarks:: @ 85E8D34
@ -642,7 +642,7 @@ gText_GoBackPrevMenu:: @ 85E8D62
gText_WhatWouldYouLike:: @ 85E8D80 gText_WhatWouldYouLike:: @ 85E8D80
.string "What would you like to do?$" .string "What would you like to do?$"
gUnknown_085E8D9B:: @ 85E8D9B gMenuText_Give2:: @ 85E8D9B
.string "GIVE$" .string "GIVE$"
gText_xVar1:: @ 85E8DA0 gText_xVar1:: @ 85E8DA0
@ -1946,7 +1946,7 @@ gUnknown_085EB057:: @ 85EB057
gUnknown_085EB062:: @ 85EB062 gUnknown_085EB062:: @ 85EB062
.string "GREEN SHARD$" .string "GREEN SHARD$"
gUnknown_085EB06E:: @ 85EB06E gText_BattleFrontier:: @ 85EB06E
.string "BATTLE FRONTIER$" .string "BATTLE FRONTIER$"
gUnknown_085EB07E:: @ 85EB07E gUnknown_085EB07E:: @ 85EB07E
@ -1985,46 +1985,46 @@ gText_Smart:: @ 85EB0F9
gText_Tough:: @ 85EB0FF gText_Tough:: @ 85EB0FF
.string "TOUGH$" .string "TOUGH$"
gUnknown_085EB105:: @ 85EB105 gText_Normal:: @ 85EB105
.string "NORMAL$" .string "NORMAL$"
gUnknown_085EB10C:: @ 85EB10C gText_Super:: @ 85EB10C
.string "SUPER$" .string "SUPER$"
gUnknown_085EB112:: @ 85EB112 gText_Hyper:: @ 85EB112
.string "HYPER$" .string "HYPER$"
gUnknown_085EB118:: @ 85EB118 gText_Master:: @ 85EB118
.string "MASTER$" .string "MASTER$"
gUnknown_085EB11F:: @ 85EB11F gText_Cool2:: @ 85EB11F
.string "COOL$" .string "COOL$"
gUnknown_085EB124:: @ 85EB124 gText_Beauty2:: @ 85EB124
.string "BEAUTY$" .string "BEAUTY$"
gUnknown_085EB12B:: @ 85EB12B gText_Cute2:: @ 85EB12B
.string "CUTE$" .string "CUTE$"
gUnknown_085EB130:: @ 85EB130 gText_Smart2:: @ 85EB130
.string "SMART$" .string "SMART$"
gUnknown_085EB136:: @ 85EB136 gText_Tough2:: @ 85EB136
.string "TOUGH$" .string "TOUGH$"
gUnknown_085EB13C:: @ 85EB13C gText_Items:: @ 85EB13C
.string "ITEMS$" .string "ITEMS$"
gUnknown_085EB142:: @ 85EB142 gText_Key_Items:: @ 85EB142
.string "KEY ITEMS$" .string "KEY ITEMS$"
gUnknown_085EB14C:: @ 85EB14C gText_Poke_Balls:: @ 85EB14C
.string "POKé BALLS$" .string "POKé BALLS$"
gUnknown_085EB157:: @ 85EB157 gText_TMs_Hms:: @ 85EB157
.string "TMs & HMs$" .string "TMs & HMs$"
gUnknown_085EB161:: @ 85EB161 gText_Berries2:: @ 85EB161
.string "BERRIES$" .string "BERRIES$"
gText_SomeonesPC:: @ 85EB169 gText_SomeonesPC:: @ 85EB169
@ -2042,58 +2042,58 @@ gText_HallOfFame:: @ 85EB18B
gText_LogOff:: @ 85EB198 gText_LogOff:: @ 85EB198
.string "LOG OFF$" .string "LOG OFF$"
gUnknown_085EB1A0:: @ 85EB1A0 gText_Opponent:: @ 85EB1A0
.string "OPPONENT$" .string "OPPONENT$"
gUnknown_085EB1A9:: @ 85EB1A9 gText_Tourney_Tree:: @ 85EB1A9
.string "TOURNEY TREE$" .string "TOURNEY TREE$"
gUnknown_085EB1B6:: @ 85EB1B6 gText_ReadyToStart:: @ 85EB1B6
.string "READY TO START$" .string "READY TO START$"
gUnknown_085EB1C5:: @ 85EB1C5 gText_NormalRank:: @ 85EB1C5
.string "NORMAL RANK$" .string "NORMAL RANK$"
gUnknown_085EB1D1:: @ 85EB1D1 gText_SuperRank:: @ 85EB1D1
.string "SUPER RANK$" .string "SUPER RANK$"
gUnknown_085EB1DC:: @ 85EB1DC gText_HyperRank:: @ 85EB1DC
.string "HYPER RANK$" .string "HYPER RANK$"
gUnknown_085EB1E7:: @ 85EB1E7 gText_MasterRank:: @ 85EB1E7
.string "MASTER RANK$" .string "MASTER RANK$"
gUnknown_085EB1F3:: @ 85EB1F3 gText_Single2:: @ 85EB1F3
.string "SINGLE$" .string "SINGLE$"
gUnknown_085EB1FA:: @ 85EB1FA gText_Double2:: @ 85EB1FA
.string "DOUBLE$" .string "DOUBLE$"
gUnknown_085EB201:: @ 85EB201 gText_Multi:: @ 85EB201
.string "MULTI$" .string "MULTI$"
gUnknown_085EB207:: @ 85EB207 gText_MultiLink:: @ 85EB207
.string "MULTI-LINK$" .string "MULTI-LINK$"
gUnknown_085EB212:: @ 85EB212 gText_BattleBag:: @ 85EB212
.string "BATTLE BAG$" .string "BATTLE BAG$"
gUnknown_085EB21D:: @ 85EB21D gText_HeldItem:: @ 85EB21D
.string "HELD ITEM$" .string "HELD ITEM$"
gUnknown_085EB227:: @ 85EB227 gText_LinkContest:: @ 85EB227
.string "LINK CONTEST$" .string "LINK CONTEST$"
gUnknown_085EB234:: @ 85EB234 gText_AboutE_Mode:: @ 85EB234
.string "ABOUT E-MODE$" .string "ABOUT E-MODE$"
gUnknown_085EB241:: @ 85EB241 gText_AboutG_Mode:: @ 85EB241
.string "ABOUT G-MODE$" .string "ABOUT G-MODE$"
gUnknown_085EB24E:: @ 85EB24E gText_E_Mode:: @ 85EB24E
.string "E-MODE$" .string "E-MODE$"
gUnknown_085EB255:: @ 85EB255 gText_G_Mode:: @ 85EB255
.string "G-MODE$" .string "G-MODE$"
gText_MenuOptionPokedex:: @ 85EB25C gText_MenuOptionPokedex:: @ 85EB25C
@ -2138,16 +2138,16 @@ gUnknown_085EB29A:: @ 85EB29A
gUnknown_085EB2A3:: @ 85EB2A3 gUnknown_085EB2A3:: @ 85EB2A3
.string "BLUE TENT$" .string "BLUE TENT$"
gUnknown_085EB2AD:: @ 85EB2AD gText_SouthernIsland:: @ 85EB2AD
.string "SOUTHERN ISLAND$" .string "SOUTHERN ISLAND$"
gUnknown_085EB2BD:: @ 85EB2BD gText_BirthIsland:: @ 85EB2BD
.string "BIRTH ISLAND$" .string "BIRTH ISLAND$"
gUnknown_085EB2CA:: @ 85EB2CA gText_FarawayIsland:: @ 85EB2CA
.string "FARAWAY ISLAND$" .string "FARAWAY ISLAND$"
gUnknown_085EB2D9:: @ 85EB2D9 gText_NavelRock:: @ 85EB2D9
.string "NAVEL ROCK$" .string "NAVEL ROCK$"
gUnknown_085EB2E4:: @ 85EB2E4 gUnknown_085EB2E4:: @ 85EB2E4
@ -2477,22 +2477,22 @@ gUnknown_085EB77D:: @ 85EB77D
gUnknown_085EB78A:: @ 85EB78A gUnknown_085EB78A:: @ 85EB78A
.string "EXCHANGE SERVICE$" .string "EXCHANGE SERVICE$"
gUnknown_085EB79B:: @ 85EB79B gText_LilycoveCity:: @ 85EB79B
.string "LILYCOVE CITY$" .string "LILYCOVE CITY$"
gUnknown_085EB7A9:: @ 85EB7A9 gText_SlateportCity:: @ 85EB7A9
.string "SLATEPORT CITY$" .string "SLATEPORT CITY$"
gUnknown_085EB7B8:: @ 85EB7B8 gText_CaveOfOrigin:: @ 85EB7B8
.string "CAVE OF ORIGIN$" .string "CAVE OF ORIGIN$"
gUnknown_085EB7C7:: @ 85EB7C7 gText_MtPyre:: @ 85EB7C7
.string "MT. PYRE$" .string "MT. PYRE$"
gUnknown_085EB7D0:: @ 85EB7D0 gText_SkyPillar:: @ 85EB7D0
.string "SKY PILLAR$" .string "SKY PILLAR$"
gUnknown_085EB7DB:: @ 85EB7DB gText_DontRemember:: @ 85EB7DB
.string "Don’t remember$" .string "Don’t remember$"
gText_Exit:: @ 85EB7EA gText_Exit:: @ 85EB7EA
@ -3563,25 +3563,25 @@ gText_BattleTower:: @ 85ED0D3
gText_WSlashStraightSlash:: @ 85ED0E0 gText_WSlashStraightSlash:: @ 85ED0E0
.string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$" .string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$"
gUnknown_085ED104:: @ 85ED104 gText_BattleTower2:: @ 85ED104
.string "BATTLE TOWER$" .string "BATTLE TOWER$"
gUnknown_085ED111:: @ 85ED111 gText_BattleDome:: @ 85ED111
.string "BATTLE DOME$" .string "BATTLE DOME$"
gUnknown_085ED11D:: @ 85ED11D gText_BattlePalace:: @ 85ED11D
.string "BATTLE PALACE$" .string "BATTLE PALACE$"
gUnknown_085ED12B:: @ 85ED12B gText_BattleFactory:: @ 85ED12B
.string "BATTLE FACTORY$" .string "BATTLE FACTORY$"
gUnknown_085ED13A:: @ 85ED13A gText_BattleArena:: @ 85ED13A
.string "BATTLE ARENA$" .string "BATTLE ARENA$"
gUnknown_085ED147:: @ 85ED147 gText_BattlePike:: @ 85ED147
.string "BATTLE PIKE$" .string "BATTLE PIKE$"
gUnknown_085ED153:: @ 85ED153 gText_BattlePyramid:: @ 85ED153
.string "BATTLE PYRAMID$" .string "BATTLE PYRAMID$"
.align 2 .align 2

19
graphics/berry_blender/arrow.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
213 222 238
180 197 230
148 172 222
115 148 205
82 123 197
49 98 189
255 180 205
255 115 98
255 49 0
205 65 65
189 24 24
148 16 16
74 57 139
8 0 82

BIN
graphics/berry_blender/arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 682 B

19
graphics/berry_blender/center.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
205 197 255
172 164 222
139 139 189
106 106 156
74 82 123
41 57 90
213 222 189
180 189 156
148 156 123
115 123 90
255 172 123
246 115 82
238 57 41
156 24 0

BIN
graphics/berry_blender/center.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/berry_blender/center_map.bin Normal file
View File

Binary file not shown.

BIN
graphics/berry_blender/countdown_numbers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 457 B

BIN
graphics/berry_blender/marubatsu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 293 B

19
graphics/berry_blender/misc.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
255 213 0
255 82 82
98 255 255
0 189 255
98 255 98
205 0 0
255 0 0
255 156 156
0 0 0
255 255 0
255 255 148
189 189 189
255 255 255

19
graphics/berry_blender/outer.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
213 222 238
180 197 230
148 172 222
115 148 205
82 123 197
49 98 189
255 180 205
255 115 98
255 49 0
205 65 65
189 24 24
148 123 197
74 57 139
8 0 82

BIN
graphics/berry_blender/outer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
graphics/berry_blender/outer_map.bin Normal file
View File

Binary file not shown.

BIN
graphics/berry_blender/particles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 217 B

BIN
graphics/berry_blender/start.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 396 B

19
graphics/unknown/unknown_339514.pal Normal file
View File

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

3
ld_script.txt
View File

@ -85,6 +85,7 @@ SECTIONS {
src/load_save.o(.text); src/load_save.o(.text);
asm/load_save.o(.text); asm/load_save.o(.text);
asm/trade.o(.text); asm/trade.o(.text);
src/berry_blender.o(.text);
asm/berry_blender.o(.text); asm/berry_blender.o(.text);
src/play_time.o(.text); src/play_time.o(.text);
src/new_game.o(.text); src/new_game.o(.text);
@ -348,7 +349,7 @@ SECTIONS {
src/battle_interface.o(.rodata); src/battle_interface.o(.rodata);
data/pokeball.o(.rodata); data/pokeball.o(.rodata);
data/trade.o(.rodata); data/trade.o(.rodata);
data/berry_blender.o(.rodata); src/berry_blender.o(.rodata);
src/new_game.o(.rodata); src/new_game.o(.rodata);
data/rom4.o(.rodata); data/rom4.o(.rodata);
data/fieldmap.o(.rodata); data/fieldmap.o(.rodata);

585
src/berry_blender.c
View File

@ -1,6 +1,8 @@
// Includes
#include "global.h" #include "global.h"
#include "bg.h"
#include "window.h"
#include "task.h"
#include "sprite.h"
// Static type declarations // Static type declarations
@ -11,8 +13,585 @@ IWRAM_DATA s16 gUnknown_03000DF8[6];
IWRAM_DATA s16 gUnknown_03000E04; IWRAM_DATA s16 gUnknown_03000E04;
IWRAM_DATA s16 gUnknown_03000E06; IWRAM_DATA s16 gUnknown_03000E06;
// Static ROM declarations // graphics
extern const u8 gBerryBlenderArrowTiles[];
extern const u8 gBerryBlenderStartTiles[];
extern const u8 gBerryBlenderMarubatsuTiles[];
extern const u8 gBerryBlenderParticlesTiles[];
extern const u8 gBerryBlenderCountdownNumbersTiles[];
extern const u16 gBerryBlenderMiscPalette[];
extern const u16 gBerryBlenderArrowPalette[];
void sub_8080EA4(u8 taskId);
void sub_8080FD0(u8 taskId);
void sub_80810F8(u8 taskId);
void sub_80833F8(struct Sprite *sprite);
void sub_8082F68(struct Sprite *sprite);
void sub_8083010(struct Sprite *sprite);
void sub_80830C0(struct Sprite *sprite);
// .rodata // .rodata
// TODO: make those static once the file is decompiled
const u16 sBlenderCenterPal[] = INCBIN_U16("graphics/berry_blender/center.gbapal");
const u8 sBlenderCenterMap[] = INCBIN_U8("graphics/berry_blender/center_map.bin");
const u16 sBlenderOuterPal[] = INCBIN_U16("graphics/berry_blender/outer.gbapal");
// unreferenced pals?
static const u16 sUnknownPal_0[] = INCBIN_U16("graphics/unknown/unknown_339514.gbapal");
static const u16 sUnknownArray_1[224] = {0};
// unused text?
static const u8 sUnusedText_YesNo[] = _("YES\nNO");
static const u8 sUnusedText_2[] = _("▶");
static const u8 sUnusedText_Space[] = _(" ");
static const u8 sUnusedText_Terminating[] = _("Terminating.");
static const u8 sUnusedText_LinkPartnerNotFound[] = _("Link partner(s) not found.\nPlease try again.\p");
const u8 gText_BerryBlenderStart[] = _("Starting up the BERRY BLENDER.\pPlease select a BERRY from your BAG\nto put in the BERRY BLENDER.\p");
const u8 gText_NewParagraph[] = _("\p");
const u8 gText_WasMade[] = _(" was made!");
static const u8 sText_Mister[] = _("MISTER");
static const u8 sText_Laddie[] = _("LADDIE");
static const u8 sText_Lassie[] = _("LASSIE");
static const u8 sText_Master[] = _("MASTER");
static const u8 sText_Dude[] = _("DUDE");
static const u8 sText_Miss[] = _("MISS");
const u8* const sBlenderOpponentsNames[] =
{
sText_Mister,
sText_Laddie,
sText_Lassie,
sText_Master,
sText_Dude,
sText_Miss
};
static const u8 sText_PressAToStart[] = _("Press the A Button to start.");
static const u8 sText_PleaseWaitAWhile[] = _("Please wait a while.");
const u8 sText_CommunicationStandby[] = _("Communication standby…");
const u8 sText_WouldLikeToBlendAnotherBerry[] = _("Would you like to blend another BERRY?");
const u8 sText_RunOutOfBerriesForBlending[] = _("You’ve run out of BERRIES for\nblending in the BERRY BLENDER.\p");
const u8 sText_YourPokeblockCaseIsFull[] = _("Your {POKEBLOCK} CASE is full.\p");
const u8 sText_HasNoBerriesToPut[] = _(" has no BERRIES to put in\nthe BERRY BLENDER.");
const u8 sText_ApostropheSPokeblockCaseIsFull[] = _("’s {POKEBLOCK} CASE is full.\p");
const u8 sText_BlendingResults[] = _("RESULTS OF BLENDING");
static const u8 sText_BerryUsed[] = _("BERRY USED");
const u8 sText_SpaceBerry[] = _(" BERRY");
const u8 sText_Time[] = _("Time:");
const u8 sText_Min[] = _(" min. ");
const u8 sText_Sec[] = _(" sec.");
const u8 sText_MaximumSpeed[] = _("MAXIMUM SPEED");
const u8 sText_RPM[] = _(" RPM");
const u8 sText_Dot[] = _(".");
const u8 sText_NewLine[] = _("\n");
static const u8 sText_Space[] = _(" ");
const u8 sText_Ranking[] = _("RANKING");
const u8 sText_TheLevelIs[] = _("The level is ");
const u8 sText_TheFeelIs[] = _(", and the feel is ");
const u8 sText_Dot2[] = _(".");
const struct BgTemplate gUnknown_08339974[3] =
{
{
.bg = 0,
.charBaseIndex = 3,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0,
},
{
.bg = 1,
.charBaseIndex = 2,
.mapBaseIndex = 12,
.screenSize = 0,
.paletteMode = 0,
.priority = 1,
.baseTile = 0,
},
{
.bg = 2,
.charBaseIndex = 0,
.mapBaseIndex = 8,
.screenSize = 1,
.paletteMode = 1,
.priority = 0,
.baseTile = 0,
}
};
const struct WindowTemplate gUnknown_08339980[] =
{
{0, 1, 6, 7, 2, 0xE, 0x28},
{0, 0x16, 6, 7, 2, 0xE, 0x36},
{0, 1, 0xC, 7, 2, 0xE, 0x44},
{0, 0x16, 0xC, 7, 2, 0xE, 0x52},
{0, 2, 0xF, 0x1B, 4, 0xE, 0x60},
{0, 5, 3, 0x15, 0xE, 0xE, 0x60},
DUMMY_WIN_TEMPLATE
};
const struct WindowTemplate gUnknown_083399B8 =
{
0, 0x15, 9, 5, 4, 0xE, 0xCC
};
const s8 gUnknown_083399C0[][2] =
{
{-1, -1}, {1, -1}, {-1, 1}, {1, 1}
};
const u8 sBlenderSyncArrowsPos[][2] =
{
{72, 32}, {168, 32}, {72, 128}, {168, 128}
};
const u8 gUnknown_083399D0[3][4] =
{
{-1, 0, 1, -1}, {-1, 0, 1, 2}, {0, 1, 2, 3}
};
const u16 gUnknown_083399DC[] = {0, 0xC000, 0x4000, 0x8000};
const u8 gUnknown_083399E4[] = {1, 1, 0};
const u8 gUnknown_083399E7[] = {32, 224, 96, 160, 0};
const TaskFunc gUnknown_083399EC[] =
{
sub_8080EA4, sub_8080FD0, sub_80810F8
};
static const struct OamData sOamData_8216314 =
{
.y = 0,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_821631C[] =
{
ANIMCMD_FRAME(16, 5, 1, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216324[] =
{
ANIMCMD_FRAME(16, 5, .vFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821632C[] =
{
ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216334[] =
{
ANIMCMD_FRAME(16, 5, 0, 0),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821633C[] =
{
ANIMCMD_FRAME(48, 2, 1, 1),
ANIMCMD_FRAME(32, 5, 1, 1),
ANIMCMD_FRAME(48, 3, 1, 1),
ANIMCMD_FRAME(16, 5, 1, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216350[] =
{
ANIMCMD_FRAME(48, 2, .vFlip = TRUE),
ANIMCMD_FRAME(32, 5, .vFlip = TRUE),
ANIMCMD_FRAME(48, 3, .vFlip = TRUE),
ANIMCMD_FRAME(16, 5, .vFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216364[] =
{
ANIMCMD_FRAME(48, 2, .hFlip = TRUE),
ANIMCMD_FRAME(32, 5, .hFlip = TRUE),
ANIMCMD_FRAME(48, 3, .hFlip = TRUE),
ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216378[] =
{
ANIMCMD_FRAME(48, 2, 0, 0),
ANIMCMD_FRAME(32, 5, 0, 0),
ANIMCMD_FRAME(48, 3, 0, 0),
ANIMCMD_FRAME(16, 5, 0, 0),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821638C[] =
{
ANIMCMD_FRAME(0, 5, 1, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216394[] =
{
ANIMCMD_FRAME(0, 5, .vFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821639C[] =
{
ANIMCMD_FRAME(0, 5, .hFlip = TRUE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_82163A4[] =
{
ANIMCMD_FRAME(0, 5, 0, 0),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_82163AC[] =
{
sSpriteAnim_821631C,
sSpriteAnim_8216324,
sSpriteAnim_821632C,
sSpriteAnim_8216334,
sSpriteAnim_821633C,
sSpriteAnim_8216350,
sSpriteAnim_8216364,
sSpriteAnim_8216378,
sSpriteAnim_821638C,
sSpriteAnim_8216394,
sSpriteAnim_821639C,
sSpriteAnim_82163A4
};
const struct SpriteSheet sSpriteSheet_BlenderArrow =
{
gBerryBlenderArrowTiles, 0x800, 46545
};
const struct SpritePalette sSpritePal_BlenderMisc =
{
gBerryBlenderMiscPalette, 46546
};
const struct SpritePalette sSpritePal_BlenderArrow =
{
gBerryBlenderArrowPalette, 12312
};
const struct SpriteTemplate sBlenderSyncArrow_SpriteTemplate =
{
.tileTag = 46545,
.paletteTag = 12312,
.oam = &sOamData_8216314,
.anims = sSpriteAnimTable_82163AC,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80833F8
};
static const struct OamData sOamData_821640C =
{
.y = 0,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 1,
.tileNum = 0,
.priority = 0,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_8216414[] =
{
ANIMCMD_FRAME(0, 20),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821641C[] =
{
ANIMCMD_FRAME(4, 20, 1, 0),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216424[] =
{
ANIMCMD_FRAME(8, 4),
ANIMCMD_FRAME(12, 4),
ANIMCMD_FRAME(8, 4),
ANIMCMD_FRAME(12, 4),
ANIMCMD_FRAME(8, 4),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821643C[] =
{
ANIMCMD_FRAME(8, 4),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_8216444[] =
{
sSpriteAnim_8216414,
sSpriteAnim_821641C,
sSpriteAnim_8216424,
sSpriteAnim_821643C,
};
const struct SpriteSheet gUnknown_08339B38 =
{
gBerryBlenderMarubatsuTiles, 0x200, 48888
};
const struct SpriteTemplate gUnknown_08339B40 =
{
.tileTag = 48888,
.paletteTag = 46546,
.oam = &sOamData_821640C,
.anims = sSpriteAnimTable_8216444,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8082F68
};
static const struct OamData sOamData_8216474 =
{
.y = 0,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 0,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_821647C[] =
{
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(1, 4),
ANIMCMD_FRAME(3, 5),
ANIMCMD_FRAME(1, 4),
ANIMCMD_FRAME(0, 3),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216494[] =
{
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(2, 4),
ANIMCMD_FRAME(4, 5),
ANIMCMD_FRAME(2, 4),
ANIMCMD_FRAME(0, 3),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_82164AC[] =
{
ANIMCMD_FRAME(0, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(2, 2),
ANIMCMD_FRAME(4, 4),
ANIMCMD_FRAME(3, 3),
ANIMCMD_FRAME(2, 2),
ANIMCMD_FRAME(1, 2),
ANIMCMD_FRAME(0, 2),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_82164D0[] =
{
ANIMCMD_FRAME(5, 5, 1, 1),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_82164D8[] =
{
ANIMCMD_FRAME(6, 5, 1, 1),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_82164E0[] =
{
sSpriteAnim_821647C,
sSpriteAnim_8216494,
sSpriteAnim_82164AC,
sSpriteAnim_82164D0,
sSpriteAnim_82164D8,
};
const struct SpriteSheet gUnknown_08339BD8 =
{
gBerryBlenderParticlesTiles, 0xE0, 23456
};
const struct SpriteTemplate gUnknown_08339BE0 =
{
.tileTag = 23456,
.paletteTag = 46546,
.oam = &sOamData_8216474,
.anims = sSpriteAnimTable_82164E0,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy
};
static const struct OamData sOamData_8216514 =
{
.y = 0,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 0,
.x = 0,
.matrixNum = 0,
.size = 2,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_821651C[] =
{
ANIMCMD_FRAME(32, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_8216524[] =
{
ANIMCMD_FRAME(16, 30),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_821652C[] =
{
ANIMCMD_FRAME(0, 30),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_8216534[] =
{
sSpriteAnim_821651C,
sSpriteAnim_8216524,
sSpriteAnim_821652C,
};
const struct SpriteSheet gUnknown_08339C24 =
{
gBerryBlenderCountdownNumbersTiles, 0x600, 12345
};
const struct SpriteTemplate gUnknown_08339C2C =
{
.tileTag = 12345,
.paletteTag = 46546,
.oam = &sOamData_8216514,
.anims = sSpriteAnimTable_8216534,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_8083010
};
static const struct OamData sOamData_8216560 =
{
.y = 0,
.affineMode = 0,
.objMode = 0,
.mosaic = 0,
.bpp = 0,
.shape = 1,
.x = 0,
.matrixNum = 0,
.size = 3,
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
static const union AnimCmd sSpriteAnim_8216568[] =
{
ANIMCMD_FRAME(0, 30),
ANIMCMD_END
};
static const union AnimCmd *const sSpriteAnimTable_8216570[] =
{
sSpriteAnim_8216568,
};
const struct SpriteSheet gUnknown_08339C58 =
{
gBerryBlenderStartTiles, 0x400, 12346
};
const struct SpriteTemplate gUnknown_08339C60 =
{
.tileTag = 12346,
.paletteTag = 46546,
.oam = &sOamData_8216560,
.anims = sSpriteAnimTable_8216570,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80830C0
};
const s16 gUnknown_08339C78[][5] =
{
{-10, 20, 10, 2, 1},
{250, 20, 10, -2, 1},
{-10, 140, 10, 2, -1},
{250, 140, 10, -2, -1},
};
const u8 gUnknown_08339CA0[][3] =
{
{4, 3, 2}, {0, 4, 3}, {1, 0, 4}, {2, 1, 0}, {3, 2, 1}, {0, 2, 3}, {1, 3, 4}, {2, 4, 0}, {3, 0, 1}, {4, 1, 2},
};
const u8 gUnknown_08339CBE[] = {30, 31, 32, 33, 34};
const u8 gUnknown_08339CC3[] = {1, 1, 2, 3, 4};
const u8 gUnknown_08339CC8[] = {0x1C, 0x16, 0x13, 0x1A, 0x19, 0x0E, 0x0D, 0x0B, 0x07, 0x15};
static const u8 gUnknown_08339CD2[] =
{
0xfe, 0x02, 0x02, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f, 0x0c, 0x10,
0x00, 0xff, 0xfe, 0x91, 0x72, 0xce, 0xd0, 0x37, 0x44, 0x07, 0x1f,
0x0c, 0x10, 0x00, 0xff, 0x06, 0x27, 0x02, 0xff, 0x00, 0x0c, 0x48,
0x02, 0xff, 0x00, 0x01, 0x1f, 0x02, 0xff, 0x00, 0x16, 0x37, 0x02,
0xff, 0x00, 0x0d, 0x50, 0x4b, 0x02, 0xff, 0x06, 0x06, 0x06, 0x06,
0x05, 0x03, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x02
};
const struct WindowTemplate gUnknown_08339D14[] = {0, 6, 4, 0x12, 0xB, 0xF, 8};
// .text // .text