pret/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-05 08:56:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sese's April/May Dump (#37)

Browse Source 
* splitting lots of pokemon square and labeling lots of other things

* actually commit this stuff

* more moving data and things

* more screen work

* split out some pokemon dungeon data

* lots of data work

* push more data work

* split kecleon, decomp another kanghaskhan func, and try to doc UpdateBGControl more

* lots of item work

* label more item things

* subtype -> category and doc types/category
This commit is contained in:
Seth Barberee
2021-05-15 16:59:55 -07:00
committed by GitHub
parent f65dee5a14
commit f402e46cd3
159 changed files with 26606 additions and 28309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/code_2.s
+3 -3
View File
@@ -199,7 +199,7 @@ _080007CC:
bhi _080007EC
add r0, sp, 0x4
movs r1, 0x1
bl sub_801203C
bl WriteSavetoPak
adds r4, r0, 0
b _080007EE
_080007EC:
@@ -1549,7 +1549,7 @@ _08001298:
bx r0
.align 2, 0
_080012B8: .4byte gUnknown_203B460
_080012BC: .4byte gUnknown_203B45C
_080012BC: .4byte gRecruitedPokemonRef
thumb_func_end sub_8001248
thumb_func_start sub_80012C0
@@ -1608,7 +1608,7 @@ _08001306:
bx r0
.align 2, 0
_08001324: .4byte gUnknown_203B460
_08001328: .4byte gUnknown_203B45C
_08001328: .4byte gRecruitedPokemonRef
thumb_func_end sub_80012C0
.align 2,0
asm/code_8009804.s
-111
View File
@@ -5,117 +5,6 @@
.text
thumb_func_start sub_8009908
sub_8009908:
push {r4-r7,lr}
movs r5, 0
ldr r0, _08009994
ldr r0, [r0]
cmp r5, r0
bge _08009936
ldr r4, _08009998
adds r7, r4, 0
movs r6, 0
_0800991A:
ldr r0, [r4]
adds r1, r7, 0x4
adds r1, r6, r1
ldr r1, [r1]
ldr r2, [r4, 0x8]
bl CpuCopy
adds r4, 0xC
adds r6, 0xC
adds r5, 0x1
ldr r0, _08009994
ldr r0, [r0]
cmp r5, r0
blt _0800991A
_08009936:
ldr r0, _08009994
movs r5, 0
str r5, [r0]
ldr r4, _0800999C
ldrb r0, [r4]
cmp r0, 0
beq _08009952
strb r5, [r4]
ldr r0, _080099A0
ldr r1, _080099A4
movs r2, 0x80
lsls r2, 4
bl CpuCopy
_08009952:
ldrb r0, [r4, 0x1]
cmp r0, 0
beq _08009966
strb r5, [r4, 0x1]
ldr r0, _080099A8
ldr r1, _080099AC
movs r2, 0x80
lsls r2, 4
bl CpuCopy
_08009966:
ldrb r0, [r4, 0x2]
cmp r0, 0
beq _0800997A
strb r5, [r4, 0x2]
ldr r0, _080099B0
ldr r1, _080099B4
movs r2, 0x80
lsls r2, 4
bl CpuCopy
_0800997A:
ldrb r0, [r4, 0x3]
cmp r0, 0
beq _0800998E
strb r5, [r4, 0x3]
ldr r0, _080099B8
ldr r1, _080099BC
movs r2, 0x80
lsls r2, 4
bl CpuCopy
_0800998E:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08009994: .4byte gUnknown_202D23C
_08009998: .4byte gUnknown_202D240
_0800999C: .4byte gUnknown_202D238
_080099A0: .4byte 0x06006000
_080099A4: .4byte gUnknown_202B038
_080099A8: .4byte 0x06006800
_080099AC: .4byte gUnknown_202B838
_080099B0: .4byte 0x06007000
_080099B4: .4byte gUnknown_202C038
_080099B8: .4byte 0x06007800
_080099BC: .4byte gUnknown_202C838
thumb_func_end sub_8009908
thumb_func_start sub_80099C0
sub_80099C0:
push {r4,r5,lr}
ldr r0, _080099E4
ldr r4, _080099E8
movs r5, 0x80
lsls r5, 4
adds r1, r4, 0
adds r2, r5, 0
bl CpuCopy
ldr r0, _080099EC
adds r4, r5
adds r1, r4, 0
adds r2, r5, 0
bl CpuCopy
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080099E4: .4byte 0x06006000
_080099E8: .4byte gUnknown_202B038
_080099EC: .4byte 0x06006800
thumb_func_end sub_80099C0
thumb_func_start sub_80099F0
sub_80099F0:
push {lr}
asm/code_800D090.s
+1 -1
View File
@@ -1512,7 +1512,7 @@ sub_800DCD0:
ldr r0, [r4, 0x4C]
lsls r0, 16
lsrs r0, 16
bl sub_8011988
bl PlaySound
_0800DCF6:
str r5, [r4, 0x4C]
str r5, [r4, 0x50]
asm/code_8012A18.s
-14466
View File
File diff suppressed because it is too large Load Diff
asm/code_801D760.s
+79 -79
View File
@@ -2517,7 +2517,7 @@ _0801ED6C:
b _0801ED9A
_0801ED74:
ldr r0, _0801ED90
bl sub_8011988
bl PlaySound
ldr r1, [r4]
ldr r0, [r1, 0x20]
ldr r1, [r1, 0x10]
@@ -2735,7 +2735,7 @@ _0801EED8:
bx r1
.align 2, 0
_0801EF28: .4byte gUnknown_203B270
_0801EF2C: .4byte gUnknown_203B45C
_0801EF2C: .4byte gRecruitedPokemonRef
_0801EF30: .4byte gUnknown_80DC25C
_0801EF34: .4byte gUnknown_80DC274
thumb_func_end sub_801EE10
@@ -2923,7 +2923,7 @@ _0801F074:
strb r7, [r1, 0x4]
movs r0, 0xA6
lsls r0, 1
bl sub_8011988
bl PlaySound
b _0801F12E
.align 2, 0
_0801F0C8: .4byte gUnknown_203B270
@@ -3478,7 +3478,7 @@ sub_801F428:
bx r1
.align 2, 0
_0801F50C: .4byte gUnknown_203B274
_0801F510: .4byte gUnknown_203B45C
_0801F510: .4byte gRecruitedPokemonRef
_0801F514: .4byte gUnknown_80DC2C4
_0801F518: .4byte 0x000003e5
_0801F51C: .4byte 0x000003e6
@@ -4308,11 +4308,11 @@ sub_801FB50:
ldr r0, _0801FBC4
ldr r4, _0801FBC8
adds r1, r4, 0
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
ldr r5, _0801FBCC
adds r0, r5, 0
adds r1, r4, 0
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
adds r0, r4, 0
bl GetMonSpecies
adds r1, r0, 0
@@ -6212,7 +6212,7 @@ _08020AB0:
b _08020B32
.align 2, 0
_08020AE0: .4byte gUnknown_203B27C
_08020AE4: .4byte gUnknown_203B45C
_08020AE4: .4byte gRecruitedPokemonRef
_08020AE8: .4byte gUnknown_202E128
_08020AEC:
bl sub_8023B44
@@ -6238,7 +6238,7 @@ _08020AEC:
b _08020B32
.align 2, 0
_08020B1C: .4byte gUnknown_203B27C
_08020B20: .4byte gUnknown_203B45C
_08020B20: .4byte gRecruitedPokemonRef
_08020B24: .4byte gUnknown_202E128
_08020B28:
bl sub_8023C60
@@ -6751,7 +6751,7 @@ _08020F44:
cmp r0, 0
beq _08020F68
ldr r0, _08020F64
bl sub_8011988
bl PlaySound
b _08021068
.align 2, 0
_08020F60: .4byte gUnknown_203B27C
@@ -6762,7 +6762,7 @@ _08020F68:
b _08021068
_08020F70:
ldr r0, _08020F84
bl sub_8011988
bl PlaySound
ldr r0, _08020F88
ldr r1, [r0]
ldr r0, [r1, 0x18]
@@ -6782,7 +6782,7 @@ _08020F8C:
cmp r0, 0
beq _08020FB0
ldr r0, _08020FAC
bl sub_8011988
bl PlaySound
b _08021068
.align 2, 0
_08020FA8: .4byte gUnknown_203B27C
@@ -6832,11 +6832,11 @@ _08021000:
strb r0, [r1, 0x15]
movs r0, 0xA6
lsls r0, 1
bl sub_8011988
bl PlaySound
b _0802101C
_08021016:
ldr r0, _0802102C
bl sub_8011988
bl PlaySound
_0802101C:
ldr r0, _08021030
ldr r1, [r0]
@@ -6865,7 +6865,7 @@ _08021034:
_08021054: .4byte gUnknown_203B27C
_08021058:
ldr r0, _08021070
bl sub_8011988
bl PlaySound
ldr r1, [r4]
ldr r0, [r1, 0x18]
adds r1, 0x24
@@ -6894,7 +6894,7 @@ _08021074:
_08021094: .4byte gUnknown_203B27C
_08021098:
ldr r0, _080210B4
bl sub_8011988
bl PlaySound
ldr r1, [r4]
ldr r0, [r1, 0x18]
adds r1, 0x24
@@ -8271,7 +8271,7 @@ _08021B3C:
.align 2, 0
_08021B4C: .4byte gUnknown_203B28C
_08021B50: .4byte 0x000001a7
_08021B54: .4byte gUnknown_203B45C
_08021B54: .4byte gRecruitedPokemonRef
thumb_func_end sub_8021A60
thumb_func_start sub_8021B58
@@ -8314,8 +8314,8 @@ _08021B94:
bx r1
thumb_func_end sub_8021B58
thumb_func_start sub_8021B9C
sub_8021B9C:
thumb_func_start CreateWigglytuffShop
CreateWigglytuffShop:
push {r4-r6,lr}
adds r4, r0, 0
bl ResetUnusedInputStruct
@@ -8335,11 +8335,11 @@ sub_8021B9C:
str r4, [r0]
ldr r0, _08021BFC
movs r1, 0x28
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
ldr r4, _08021C00
adds r0, r4, 0
movs r1, 0x28
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
movs r0, 0x28
bl GetMonSpecies
adds r1, r0, 0
@@ -8401,7 +8401,7 @@ _08021C0E:
bx r1
.align 2, 0
_08021C58: .4byte gUnknown_203B290
thumb_func_end sub_8021B9C
thumb_func_end CreateWigglytuffShop
thumb_func_start sub_8021C5C
sub_8021C5C:
@@ -8510,7 +8510,7 @@ sub_8021D44:
ldr r1, [r1]
str r0, [r1, 0x4]
bl sub_8021D5C
bl sub_8021E0C
bl UpdateWigglytuffDialogue
pop {r0}
bx r0
.align 2, 0
@@ -8607,8 +8607,8 @@ _08021E04: .4byte gUnknown_203B290
_08021E08: .4byte gUnknown_80DC534
thumb_func_end sub_8021D5C
thumb_func_start sub_8021E0C
sub_8021E0C:
thumb_func_start UpdateWigglytuffDialogue
UpdateWigglytuffDialogue:
push {r4,lr}
sub sp, 0x20
ldr r1, _08021E28
@@ -8922,7 +8922,7 @@ _080220B8:
movs r0, 0xE
str r0, [r1, 0x8]
ldr r0, _080220D4
bl sub_8011988
bl PlaySound
ldr r0, [r4]
movs r1, 0x98
lsls r1, 1
@@ -8962,7 +8962,7 @@ _08022108:
_0802210E:
str r0, [r1, 0x8]
movs r0, 0xCE
bl sub_8011988
bl PlaySound
ldr r3, _08022134
ldr r0, _08022130
ldr r2, [r0]
@@ -9183,7 +9183,7 @@ _080222B6:
.align 2, 0
_080222C0: .4byte gWigglytuffDialogue
_080222C4: .4byte 0x0000010d
thumb_func_end sub_8021E0C
thumb_func_end UpdateWigglytuffDialogue
thumb_func_start sub_80222C8
sub_80222C8:
@@ -9495,7 +9495,7 @@ _080224F8:
bl UnlockFriendArea
movs r0, 0xA6
lsls r0, 1
bl sub_8011988
bl PlaySound
movs r0, 0xC
bl sub_8021D44
b _08022532
@@ -10333,7 +10333,7 @@ _08022BCE:
ldr r0, _08022C18
bl strcpy
movs r0, 0xCB
bl sub_8011988
bl PlaySound
ldr r0, _08022C1C
movs r1, 0
movs r2, 0
@@ -10534,7 +10534,7 @@ _08022D80:
adds r0, r2, 0
adds r0, 0x52
ldrb r0, [r0]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -11542,7 +11542,7 @@ _08023532:
_08023594:
adds r0, r5, 0
movs r1, 0
bl sub_808DCA0
bl GetDexInternalNo
lsls r0, 16
asrs r4, r0, 16
adds r0, r4, 0
@@ -11794,12 +11794,12 @@ _08023788:
ldrsh r0, [r6, r1]
movs r1, 0x1
str r2, [sp]
bl sub_808DCDC
bl GetAlphabetParentNo
adds r4, r0, 0
movs r1, 0
ldrsh r0, [r5, r1]
movs r1, 0x1
bl sub_808DCDC
bl GetAlphabetParentNo
lsls r4, 16
lsls r0, 16
ldr r2, [sp]
@@ -11868,12 +11868,12 @@ _08023810:
ldrsh r0, [r6, r1]
movs r1, 0
str r2, [sp]
bl sub_808DCDC
bl GetAlphabetParentNo
adds r4, r0, 0
movs r1, 0
ldrsh r0, [r5, r1]
movs r1, 0
bl sub_808DCDC
bl GetAlphabetParentNo
lsls r4, 16
lsls r0, 16
ldr r2, [sp]
@@ -12413,7 +12413,7 @@ _08023C4A:
bx r1
.align 2, 0
_08023C58: .4byte gUnknown_3001B60
_08023C5C: .4byte gUnknown_203B45C
_08023C5C: .4byte gRecruitedPokemonRef
thumb_func_end sub_8023BD8
thumb_func_start sub_8023C60
@@ -12725,7 +12725,7 @@ _08023EC0: .4byte 0x000003f6
_08023EC4: .4byte 0x00000376
_08023EC8: .4byte gUnknown_3001B60
_08023ECC: .4byte 0x00000372
_08023ED0: .4byte gUnknown_203B45C
_08023ED0: .4byte gRecruitedPokemonRef
_08023ED4:
ldrb r0, [r3, 0x18]
cmp r0, 0
@@ -12853,7 +12853,7 @@ _08023FA2:
b _08023FE2
.align 2, 0
_08023FD0: .4byte gUnknown_3001B60
_08023FD4: .4byte gUnknown_203B45C
_08023FD4: .4byte gRecruitedPokemonRef
_08023FD8:
adds r4, 0x1
movs r0, 0xCE
@@ -12905,7 +12905,7 @@ _08024002:
str r1, [r3, 0x8]
b _08024042
.align 2, 0
_08024034: .4byte gUnknown_203B45C
_08024034: .4byte gRecruitedPokemonRef
_08024038:
adds r4, 0x1
movs r0, 0xCE
@@ -13014,7 +13014,7 @@ _080240EE:
pop {r1}
bx r1
.align 2, 0
_08024100: .4byte gUnknown_203B45C
_08024100: .4byte gRecruitedPokemonRef
_08024104: .4byte gUnknown_3001B60
thumb_func_end sub_8023F8C
@@ -13044,7 +13044,7 @@ _08024110:
beq _08024172
b _0802416E
.align 2, 0
_08024134: .4byte gUnknown_203B45C
_08024134: .4byte gRecruitedPokemonRef
_08024138:
cmp r5, 0x3
bne _08024140
@@ -13225,7 +13225,7 @@ _0802425E:
movs r3, 0x8
ldrsh r0, [r1, r3]
str r2, [sp, 0x8]
bl sub_808DCFC
bl GetInternalNo
adds r4, r0, 0
mov r0, r9
ldr r1, [r0]
@@ -13237,7 +13237,7 @@ _0802425E:
adds r1, r0
movs r3, 0x8
ldrsh r0, [r1, r3]
bl sub_808DCFC
bl GetInternalNo
lsls r4, 16
lsls r0, 16
ldr r2, [sp, 0x8]
@@ -13269,7 +13269,7 @@ _080242B8:
bx r0
.align 2, 0
_080242C8: .4byte gUnknown_3001B60
_080242CC: .4byte gUnknown_203B45C
_080242CC: .4byte gRecruitedPokemonRef
thumb_func_end sub_8024228
thumb_func_start sub_80242D0
@@ -13316,7 +13316,7 @@ _08024306:
ldrsh r0, [r1, r3]
movs r1, 0
str r2, [sp, 0x8]
bl sub_808DCDC
bl GetAlphabetParentNo
adds r4, r0, 0
mov r0, r9
ldr r1, [r0]
@@ -13329,7 +13329,7 @@ _08024306:
movs r3, 0x8
ldrsh r0, [r1, r3]
movs r1, 0
bl sub_808DCDC
bl GetAlphabetParentNo
lsls r4, 16
lsls r0, 16
ldr r2, [sp, 0x8]
@@ -13361,7 +13361,7 @@ _08024364:
bx r0
.align 2, 0
_08024374: .4byte gUnknown_3001B60
_08024378: .4byte gUnknown_203B45C
_08024378: .4byte gRecruitedPokemonRef
thumb_func_end sub_80242D0
thumb_func_start sub_802437C
@@ -13474,7 +13474,7 @@ sub_80243E8:
pop {r1}
bx r1
.align 2, 0
_08024448: .4byte gUnknown_203B45C
_08024448: .4byte gRecruitedPokemonRef
_0802444C: .4byte gUnknown_3001B60
_08024450: .4byte 0x00000376
_08024454: .4byte gUnknown_80DC9A4
@@ -13739,7 +13739,7 @@ sub_8024604:
bx r0
.align 2, 0
_08024654: .4byte gUnknown_203B2AC
_08024658: .4byte gUnknown_203B45C
_08024658: .4byte gRecruitedPokemonRef
thumb_func_end sub_8024604
thumb_func_start sub_802465C
@@ -14309,7 +14309,7 @@ _08024B38:
_08024B3A:
str r0, [r1, 0x24]
movs r0, 0x3C
bl sub_8011930
bl xxx_call_fade_out_bgm
ldr r0, _08024B48
b _08024CAE
.align 2, 0
@@ -14321,7 +14321,7 @@ _08024B4C:
movs r2, 0x5
bl sub_808D9AC
ldr r0, _08024B6C
bl sub_8011988
bl PlaySound
ldr r1, [r5]
movs r0, 0x13
str r0, [r1, 0x24]
@@ -14377,7 +14377,7 @@ _08024BD6:
ldr r0, _08024C14
bl sub_801199C
movs r0, 0xD2
bl sub_8011988
bl PlaySound
ldr r1, [r5]
ldrb r0, [r1, 0x10]
cmp r0, 0
@@ -15295,7 +15295,7 @@ _080252D0:
movs r0, 0
b _080252EA
.align 2, 0
_080252E0: .4byte gUnknown_203B45C
_080252E0: .4byte gRecruitedPokemonRef
_080252E4: .4byte 0x0000019d
_080252E8:
movs r0, 0x1
@@ -15765,7 +15765,7 @@ _080256A8:
movs r0, 0x1
str r0, [r1, 0x8]
movs r0, 0xCF
bl sub_8011988
bl PlaySound
ldr r0, _080256C4
_080256B6:
ldr r3, _080256C8
@@ -15907,7 +15907,7 @@ _080257A0:
adds r6, 0x1
b _08025810
.align 2, 0
_080257CC: .4byte gUnknown_203B45C
_080257CC: .4byte gRecruitedPokemonRef
_080257D0: .4byte gUnknown_203B2B4
_080257D4: .4byte gUnknown_80DD2B0
_080257D8: .4byte gUnknown_80DD2B8
@@ -16219,7 +16219,7 @@ _08025A0C:
b _08025A7E
.align 2, 0
_08025A38: .4byte gUnknown_203B2B4
_08025A3C: .4byte gUnknown_203B45C
_08025A3C: .4byte gRecruitedPokemonRef
_08025A40:
bl sub_8023B44
ldr r1, _08025A6C
@@ -16242,7 +16242,7 @@ _08025A40:
b _08025A7E
.align 2, 0
_08025A6C: .4byte gUnknown_203B2B4
_08025A70: .4byte gUnknown_203B45C
_08025A70: .4byte gRecruitedPokemonRef
_08025A74:
bl sub_8023C60
movs r0, 0x13
@@ -16324,7 +16324,7 @@ _08025B20:
b _08025BC2
_08025B28:
ldr r0, _08025B68
bl sub_8011988
bl PlaySound
ldr r4, _08025B6C
ldr r1, [r4]
ldrb r0, [r1, 0x18]
@@ -16547,7 +16547,7 @@ _08025CF8:
bne _08025D88
movs r6, 0x8
ldr r0, _08025D68
bl sub_8011988
bl PlaySound
ldr r5, _08025D6C
ldr r0, [r5]
ldr r0, [r0, 0x10]
@@ -16819,7 +16819,7 @@ sub_8025EF4:
b _08025F48
.align 2, 0
_08025F1C: .4byte gUnknown_203B2B8
_08025F20: .4byte gUnknown_203B45C
_08025F20: .4byte gRecruitedPokemonRef
_08025F24:
adds r5, 0x1
movs r0, 0xCE
@@ -16853,7 +16853,7 @@ _08025F48:
bx r1
.align 2, 0
_08025F60: .4byte gUnknown_203B2B8
_08025F64: .4byte gUnknown_203B45C
_08025F64: .4byte gRecruitedPokemonRef
thumb_func_end sub_8025EF4
thumb_func_start sub_8025F68
@@ -17393,7 +17393,7 @@ _080263F8:
movs r0, 0x19
str r0, [r1, 0x4]
movs r0, 0xCF
bl sub_8011988
bl PlaySound
ldr r0, _08026408
b _08026492
.align 2, 0
@@ -17403,7 +17403,7 @@ _0802640C:
movs r0, 0x19
str r0, [r1, 0x4]
movs r0, 0xCF
bl sub_8011988
bl PlaySound
ldr r0, _0802641C
b _08026492
.align 2, 0
@@ -17413,7 +17413,7 @@ _08026420:
movs r0, 0x19
str r0, [r1, 0x4]
movs r0, 0xCC
bl sub_8011988
bl PlaySound
ldr r0, _08026430
b _08026492
.align 2, 0
@@ -17423,7 +17423,7 @@ _08026434:
movs r0, 0x9
str r0, [r1, 0x4]
movs r0, 0xCA
bl sub_8011988
bl PlaySound
ldr r0, _08026444
b _08026492
.align 2, 0
@@ -17577,7 +17577,7 @@ _08026542:
movs r6, 0x2
b _080265B4
.align 2, 0
_08026574: .4byte gUnknown_203B45C
_08026574: .4byte gRecruitedPokemonRef
_08026578: .4byte gUnknown_203B2B8
_0802657C: .4byte gUnknown_80DD664
_08026580: .4byte gUnknown_80DD670
@@ -18089,7 +18089,7 @@ _08026976:
b _08026A6E
.align 2, 0
_08026984: .4byte gUnknown_203B2B8
_08026988: .4byte gUnknown_203B45C
_08026988: .4byte gRecruitedPokemonRef
_0802698C:
ldr r0, _080269AC
ldr r0, [r0]
@@ -18130,7 +18130,7 @@ _080269DA:
bl sub_8026074
b _08026A6E
.align 2, 0
_080269E8: .4byte gUnknown_203B45C
_080269E8: .4byte gRecruitedPokemonRef
_080269EC: .4byte gUnknown_203B2B8
_080269F0:
movs r0, 0xC
@@ -18150,7 +18150,7 @@ _08026A08:
b _08026A6E
_08026A10:
ldr r0, _08026A50
bl sub_8011988
bl PlaySound
ldr r4, _08026A54
ldr r1, [r4]
ldrb r0, [r1, 0x14]
@@ -18450,7 +18450,7 @@ _08026C58:
bne _08026CE8
movs r6, 0xF
ldr r0, _08026CC8
bl sub_8011988
bl PlaySound
ldr r5, _08026CCC
ldr r0, [r5]
ldr r0, [r0, 0xC]
@@ -18885,7 +18885,7 @@ sub_8026FA4:
_08026FC0: .4byte gUnknown_203B2B8
_08026FC4:
ldr r0, _08026FF4
bl sub_8011988
bl PlaySound
ldr r0, [r4]
adds r0, 0x14
bl sub_8091274
@@ -18907,7 +18907,7 @@ _08026FC4:
_08026FF4: .4byte 0x0000014d
_08026FF8:
ldr r0, _08027024
bl sub_8011988
bl PlaySound
ldr r0, [r4]
ldrb r0, [r0, 0x14]
bl sub_8090A60
@@ -19505,7 +19505,7 @@ _080274B6:
str r2, [r0]
b _08027550
.align 2, 0
_080274E4: .4byte gUnknown_203B45C
_080274E4: .4byte gRecruitedPokemonRef
_080274E8: .4byte gUnknown_203B2BC
_080274EC: .4byte gFriendActionStandby
_080274F0: .4byte gFriendActionMakeLeader
@@ -19949,7 +19949,7 @@ _0802782C:
b _080278AE
.align 2, 0
_08027860: .4byte gUnknown_203B2BC
_08027864: .4byte gUnknown_203B45C
_08027864: .4byte gRecruitedPokemonRef
_08027868:
bl sub_8023B44
ldr r4, _0802789C
@@ -19975,7 +19975,7 @@ _08027868:
b _080278AE
.align 2, 0
_0802789C: .4byte gUnknown_203B2BC
_080278A0: .4byte gUnknown_203B45C
_080278A0: .4byte gRecruitedPokemonRef
_080278A4:
bl sub_8023C60
movs r0, 0x11
@@ -20065,7 +20065,7 @@ _0802795E:
b _08027A0E
.align 2, 0
_08027964: .4byte gUnknown_203B2BC
_08027968: .4byte gUnknown_203B45C
_08027968: .4byte gRecruitedPokemonRef
_0802796C:
ldr r0, _08027984
ldr r0, [r0]
@@ -20102,7 +20102,7 @@ _080279B2:
bl sub_808ED00
b _08027A0E
.align 2, 0
_080279B8: .4byte gUnknown_203B45C
_080279B8: .4byte gRecruitedPokemonRef
_080279BC: .4byte gUnknown_203B2BC
_080279C0:
movs r0, 0x8
@@ -20118,7 +20118,7 @@ _080279D0:
b _08027A36
_080279D8:
ldr r0, _08027A18
bl sub_8011988
bl PlaySound
ldr r4, _08027A1C
ldr r1, [r4]
ldrb r0, [r1, 0x14]
@@ -20412,7 +20412,7 @@ _08027C1C:
cmp r0, 0xA
bne _08027C7C
ldr r0, _08027C60
bl sub_8011988
bl PlaySound
ldr r4, _08027C64
ldr r0, [r4]
ldr r0, [r0, 0xC]
asm/code_8027C84.s
+2 -2
View File
@@ -306,7 +306,7 @@ sub_8027EB8:
_08027ED4: .4byte gUnknown_203B2BC
_08027ED8:
ldr r0, _08027F08
bl sub_8011988
bl PlaySound
ldr r0, [r4]
adds r0, 0x14
bl sub_8091274
@@ -328,7 +328,7 @@ _08027ED8:
_08027F08: .4byte 0x0000014d
_08027F0C:
ldr r0, _08027F38
bl sub_8011988
bl PlaySound
ldr r0, [r4]
ldrb r0, [r0, 0x14]
bl sub_8090A60
asm/code_802B640.s
+2 -2
View File
@@ -2913,7 +2913,7 @@ _0802CCBC:
.4byte _0802CD20
_0802CCD8:
ldr r0, _0802CCEC
bl sub_8011988
bl PlaySound
ldr r0, _0802CCF0
ldr r0, [r0]
ldrb r0, [r0, 0xC]
@@ -2925,7 +2925,7 @@ _0802CCEC: .4byte 0x00000133
_0802CCF0: .4byte gUnknown_203B2F0
_0802CCF4:
ldr r0, _0802CD10
bl sub_8011988
bl PlaySound
ldr r0, _0802CD14
ldr r0, [r0]
ldrb r0, [r0, 0xC]
asm/code_803B050.s
+3 -3
View File
@@ -1279,17 +1279,17 @@ _0803BA34:
ldr r2, _0803BA38
b _0803BAFA
.align 2, 0
_0803BA38: .4byte gUnknown_80E88A0
_0803BA38: .4byte gMankeyMissionDescription
_0803BA3C:
ldr r2, _0803BA40
b _0803BAFA
.align 2, 0
_0803BA40: .4byte gUnknown_80E88C8
_0803BA40: .4byte gSmeargleMissionDescription
_0803BA44:
ldr r2, _0803BA48
b _0803BAFA
.align 2, 0
_0803BA48: .4byte gUnknown_80E8920
_0803BA48: .4byte gMedichamMissionDescription
_0803BA4C:
ldr r4, _0803BA64
ldrb r1, [r7, 0x14]
asm/code_803C1D0.s
+1 -1
View File
@@ -220,7 +220,7 @@ _0803C35A:
movs r0, 0xC
ldrsh r1, [r6, r0]
adds r0, r4, 0
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
ldrh r0, [r6, 0xC]
strh r0, [r4, 0x14]
ldrb r1, [r6, 0x1]
asm/code_803D110.s
+1 -1
View File
@@ -894,7 +894,7 @@ _0803D7AE:
adds r0, r5, 0
str r1, [sp]
str r2, [sp, 0x4]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
asm/code_8040094.s
+1 -1
View File
@@ -1782,7 +1782,7 @@ _08040EF0:
beq _08040F2A
lsls r0, r1, 16
lsrs r0, 16
bl sub_8083E38
bl PlaySoundEffect
_08040F2A:
ldr r1, [sp, 0x18]
cmp r1, 0x63
asm/code_8041AD0.s
+3 -3
View File
@@ -554,7 +554,7 @@ _08042694:
subs r4, 0x1
_080426AC:
adds r0, r4, 0
bl sub_8083E38
bl PlaySoundEffect
pop {r4}
pop {r0}
bx r0
@@ -581,7 +581,7 @@ _080426D8:
lsls r1, r4, 1
adds r1, r0
ldrh r0, [r1]
bl sub_8083E38
bl PlaySoundEffect
b _080426FC
.align 2, 0
_080426EC: .4byte gUnknown_80F67DC
@@ -590,7 +590,7 @@ _080426F0:
lsls r1, r4, 1
adds r1, r0
ldrh r0, [r1]
bl sub_8083E38
bl PlaySoundEffect
_080426FC:
adds r0, r5, 0
adds r1, r4, 0
asm/code_80428A0.s
+24 -24
View File
@@ -2713,7 +2713,7 @@ _080440D0:
bl sub_8092AD4
b _080440F8
.align 2, 0
_080440E4: .4byte gUnknown_203B45C
_080440E4: .4byte gRecruitedPokemonRef
_080440E8: .4byte 0x03e60000
_080440EC: .4byte 0x000003e7
_080440F0:
@@ -2825,7 +2825,7 @@ _080441A4:
_080441AC: .4byte gUnknown_203B418
_080441B0: .4byte 0x00000644
_080441B4: .4byte gUnknown_203B460
_080441B8: .4byte gUnknown_203B45C
_080441B8: .4byte gRecruitedPokemonRef
thumb_func_end sub_8044124
thumb_func_start sub_80441BC
@@ -4108,7 +4108,7 @@ _08044BF0: .4byte gUnknown_80F697C
_08044BF4:
ldr r4, _08044C0C
adds r0, r5, 0
bl sub_8090D6C
bl GetItemCategory
lsls r0, 3
adds r4, 0x4
adds r0, r4
@@ -4382,7 +4382,7 @@ sub_8044DC8:
cmp r0, 0xE9
beq _08044DE8
ldr r4, _08044DE4
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -4445,7 +4445,7 @@ sub_8044E24:
cmp r0, 0
bne _08044EBA
ldrb r0, [r5, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -4552,7 +4552,7 @@ _08044F18:
lsls r0, r5, 2
adds r0, r1
ldrb r0, [r0, 0x2]
bl sub_8090D6C
bl GetItemCategory
lsls r0, 3
adds r4, 0x4
adds r0, r4
@@ -6402,7 +6402,7 @@ _08045C76:
strb r0, [r5]
_08045C7E:
adds r0, r4, 0
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -6631,14 +6631,14 @@ _08045E38: .4byte gAvailablePokemonNames
_08045E3C: .4byte gUnknown_80F8F88
_08045E40:
ldrb r0, [r5, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
bne _08045E7C
movs r0, 0xA6
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
adds r0, r5, 0
bl sub_80915D4
bl sub_80913A0
@@ -6825,7 +6825,7 @@ _08045FAC:
bl sub_80461C8
movs r0, 0xA5
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
mov r3, sp
adds r0, r3, r4
ldr r0, [r0]
@@ -6902,7 +6902,7 @@ _0804605C: .4byte gUnknown_80F8F54
_08046060:
movs r0, 0xA5
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
lsls r0, r4, 2
add r0, sp
ldr r0, [r0]
@@ -7189,7 +7189,7 @@ sub_8046298:
ldrb r0, [r0, 0xD]
bx lr
.align 2, 0
_080462A8: .4byte gItemParametersFile + 4
_080462A8: .4byte gItemParametersData
thumb_func_end sub_8046298
thumb_func_start sub_80462AC
@@ -7361,7 +7361,7 @@ _080463BC:
_080463EE:
ldr r0, [r4, 0x70]
ldrb r0, [r0, 0x2]
bl sub_8090D58
bl GetItemPalette
movs r1, 0xF
ands r0, r1
lsls r0, 12
@@ -7454,7 +7454,7 @@ sub_80464AC:
push {r4,lr}
ldr r4, _080464C4
ldrb r0, [r0, 0x2]
bl sub_8090D6C
bl GetItemCategory
lsls r0, 3
adds r0, r4
ldr r0, [r0]
@@ -8728,7 +8728,7 @@ _08046E1E:
movs r1, 0x41
bl sub_803E708
movs r0, 0xD4
bl sub_8083E38
bl PlaySoundEffect
ldr r0, _08046EFC
ldr r1, [r0]
movs r0, 0
@@ -8765,7 +8765,7 @@ sub_8046F00:
push {r4-r7,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -10171,18 +10171,18 @@ sub_80479B8:
cmp r0, 0
beq _08047A20
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
cmp r0, 0
beq _08047A3C
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
beq _08047A3C
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -10194,7 +10194,7 @@ sub_80479B8:
b _08047A3C
_08047A20:
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -10235,7 +10235,7 @@ _08047A4C:
bl _080482BA
_08047A76:
ldr r0, _08047AAC
bl sub_8083E38
bl PlaySoundEffect
ldr r0, _08047AB0
adds r1, r7, 0
bl sub_8045BF8
@@ -10317,7 +10317,7 @@ _08047B30:
bl sub_804245C
_08047B38:
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -10331,13 +10331,13 @@ _08047B38:
bl sub_8078B5C
_08047B56:
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
beq _08047B72
ldrb r0, [r7, 0x2]
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0xA
asm/code_8048480.s
+2 -2
View File
@@ -795,7 +795,7 @@ _08048B20:
.align 2, 0
_08048B24: .4byte gUnknown_203B418
_08048B28: .4byte 0x0001357c
_08048B2C: .4byte gUnknown_203B45C
_08048B2C: .4byte gRecruitedPokemonRef
_08048B30: .4byte 0x00008df8
_08048B34:
movs r0, 0
@@ -20336,7 +20336,7 @@ _08052196:
b _080521CA
.align 2, 0
_080521B4: .4byte gUnknown_203B460
_080521B8: .4byte gUnknown_203B45C
_080521B8: .4byte gRecruitedPokemonRef
_080521BC: .4byte 0x00008df8
_080521C0: .4byte 0x00008e38
_080521C4: .4byte 0x00008e3a
asm/code_80521D0.s
+4 -4
View File
@@ -721,7 +721,7 @@ sub_8052910:
ldrsh r7, [r4, r2]
b _08052966
.align 2, 0
_08052950: .4byte gUnknown_203B45C
_08052950: .4byte gRecruitedPokemonRef
_08052954: .4byte 0x00008df8
_08052958: .4byte gAvailablePokemonNames
_0805295C:
@@ -749,7 +749,7 @@ _08052966:
.align 2, 0
_08052988: .4byte gAvailablePokemonNames
_0805298C: .4byte gUnknown_80F7AF8
_08052990: .4byte gUnknown_203B45C
_08052990: .4byte gRecruitedPokemonRef
_08052994: .4byte 0x00008df8
_08052998: .4byte gUnknown_202DFE8
_0805299C:
@@ -815,7 +815,7 @@ _08052A1C:
ldrsh r4, [r6, r1]
ldr r0, _08052A48
adds r1, r4, 0
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
_08052A28:
ldrh r0, [r6]
subs r0, 0x2
@@ -1379,7 +1379,7 @@ sub_8052EC0:
lsrs r4, r0, 24
adds r5, r4, 0
adds r0, r4, 0
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
asm/code_8057824.s
+129 -1972
View File
File diff suppressed because it is too large Load Diff
asm/code_808DAB4.s
+6 -6
View File
@@ -129,7 +129,7 @@ sub_808DF2C:
pop {r0}
bx r0
.align 2, 0
_0808DF40: .4byte gUnknown_203B45C
_0808DF40: .4byte gRecruitedPokemonRef
thumb_func_end sub_808DF2C
thumb_func_start sub_808DF44
@@ -233,7 +233,7 @@ sub_808DFDC:
bl sub_8090BB0
b _0808E00A
.align 2, 0
_0808E000: .4byte gUnknown_203B45C
_0808E000: .4byte gRecruitedPokemonRef
_0808E004:
adds r0, r3, 0
adds r0, 0x28
@@ -1225,7 +1225,7 @@ _0808E746:
movs r0, 0x1
b _0808E76A
.align 2, 0
_0808E75C: .4byte gUnknown_203B45C
_0808E75C: .4byte gRecruitedPokemonRef
_0808E760:
adds r2, 0x58
adds r3, 0x1
@@ -1430,8 +1430,8 @@ _0808E8C4:
bx r1
thumb_func_end sub_808E858
thumb_func_start sub_808E8C8
sub_808E8C8:
thumb_func_start GetUnownIndex
GetUnownIndex:
push {lr}
lsls r0, 16
asrs r1, r0, 16
@@ -1579,7 +1579,7 @@ _0808E9B0:
_0808E9B2:
pop {r1}
bx r1
thumb_func_end sub_808E8C8
thumb_func_end GetUnownIndex
thumb_func_start sub_808E9B8
sub_808E9B8:
asm/code_808EAB0.s
+10 -10
View File
@@ -66,7 +66,7 @@ _0808ED64:
pop {r0}
bx r0
.align 2, 0
_0808ED70: .4byte gUnknown_203B45C
_0808ED70: .4byte gRecruitedPokemonRef
_0808ED74: .4byte 0x00008f88
thumb_func_end sub_808ED00
@@ -135,7 +135,7 @@ _0808EDE2:
b _0808EDFA
.align 2, 0
_0808EDF0: .4byte 0x0000ffff
_0808EDF4: .4byte gUnknown_203B45C
_0808EDF4: .4byte gRecruitedPokemonRef
_0808EDF8:
strb r0, [r1, 0x3]
_0808EDFA:
@@ -168,7 +168,7 @@ _0808EE16:
strb r0, [r1]
b _0808EE40
.align 2, 0
_0808EE34: .4byte gUnknown_203B45C
_0808EE34: .4byte gRecruitedPokemonRef
_0808EE38: .4byte 0x00008f88
_0808EE3C:
mov r0, r8
@@ -275,7 +275,7 @@ _0808EEDA:
movs r1, 0x3
b _0808EF20
.align 2, 0
_0808EF10: .4byte gUnknown_203B45C
_0808EF10: .4byte gRecruitedPokemonRef
_0808EF14: .4byte 0x00008f88
_0808EF18:
ldr r0, [r7]
@@ -345,7 +345,7 @@ _0808EF84:
bx r1
.align 2, 0
_0808EF98: .4byte 0x00008f88
_0808EF9C: .4byte gUnknown_203B45C
_0808EF9C: .4byte gRecruitedPokemonRef
thumb_func_end sub_808EE9C
thumb_func_start sub_808EFA0
@@ -689,7 +689,7 @@ _0808F296:
pop {r1}
bx r1
.align 2, 0
_0808F2A8: .4byte gUnknown_203B45C
_0808F2A8: .4byte gRecruitedPokemonRef
_0808F2AC: .4byte 0x00008df8
thumb_func_end sub_808F154
@@ -733,7 +733,7 @@ _0808F2C4:
strb r2, [r4, 0x2]
b _0808F30A
.align 2, 0
_0808F300: .4byte gUnknown_203B45C
_0808F300: .4byte gRecruitedPokemonRef
_0808F304: .4byte 0x00008df8
_0808F308:
strb r1, [r4, 0x2]
@@ -927,11 +927,11 @@ _0808F488:
bne _0808F49C
movs r0, 0x41
adds r1, r7, 0
bl sub_808DD48
bl GetPokemonEvolveConditions
b _0808F4A2
_0808F49C:
adds r1, r7, 0
bl sub_808DD48
bl GetPokemonEvolveConditions
_0808F4A2:
ldrh r0, [r7, 0x2]
cmp r0, 0
@@ -974,7 +974,7 @@ _0808F4E0:
asrs r0, 16
str r0, [sp, 0x1C]
adds r1, r7, 0
bl sub_808DD48
bl GetPokemonEvolveConditions
ldrh r0, [r7, 0x2]
cmp r0, 0
bne _0808F4FA
asm/code_809017C.s
+5 -3165
View File
File diff suppressed because it is too large Load Diff
asm/code_8092334.s
+1 -1
View File
@@ -4509,7 +4509,7 @@ sub_8094828:
lsrs r0, r1, 24
cmp r0, 0
beq _08094852
bl sub_8090BD0
bl GetItemType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x9
asm/code_809747C.s
+1 -1
View File
@@ -950,7 +950,7 @@ _08097B4C:
b _08097B80
.align 2, 0
_08097B5C: .4byte gUnknown_203B494
_08097B60: .4byte gUnknown_203B45C
_08097B60: .4byte gRecruitedPokemonRef
_08097B64: .4byte 0x000001a7
_08097B68: .4byte 0x00000179
_08097B6C: .4byte 0x0000010d
asm/code_8098BDC.s
+12 -12
View File
@@ -3586,7 +3586,7 @@ _0809AB80:
adds r0, r4, r0
movs r2, 0x2
ldrsh r1, [r6, r2]
bl sub_808D908
bl CopyCyanSpeciesNametoBuffer
ldr r0, _0809ABAC
adds r4, r0
ldr r1, _0809ABB0
@@ -3637,7 +3637,7 @@ _0809ABE8:
movs r0, 0x2
ldrsh r1, [r6, r0]
adds r0, r5, 0
bl sub_808D908
bl CopyCyanSpeciesNametoBuffer
ldr r0, _0809AC14
adds r4, r0
adds r0, r4, 0
@@ -3686,7 +3686,7 @@ _0809AC4C:
adds r0, r4, r0
movs r2, 0x2
ldrsh r1, [r6, r2]
bl sub_808D908
bl CopyCyanSpeciesNametoBuffer
ldr r0, _0809AC78
adds r4, r0
movs r3, 0
@@ -5743,7 +5743,7 @@ _0809BC78:
lsrs r4, 31
bl sub_809B294
adds r0, r4, 0
bl DisplayPersianDialogueSprite
bl CreateFelicityBank
lsls r0, 24
cmp r0, 0
beq _0809BCB0
@@ -5911,7 +5911,7 @@ _0809BDE8:
lsrs r4, 31
bl sub_809B294
adds r0, r4, 0
bl sub_8021B9C
bl CreateWigglytuffShop
lsls r0, 24
cmp r0, 0
beq _0809BE20
@@ -5965,7 +5965,7 @@ _0809BE60:
bl sub_809B294
movs r0, 0x98
lsls r0, 1
bl sub_80314B4
bl CreateHelperPelipperMenu
lsls r0, 24
cmp r0, 0
bne _0809BE84
@@ -6175,7 +6175,7 @@ _0809BFFC:
ands r4, r0
bl sub_809B294
adds r0, r4, 0
bl sub_802FD14
bl CreateMakuhitaShop
lsls r0, 24
cmp r0, 0
beq _0809C032
@@ -6222,7 +6222,7 @@ _0809C072:
_0809C082:
bl sub_809B294
adds r0, r4, 0
bl sub_802FD14
bl CreateMakuhitaShop
lsls r0, 24
cmp r0, 0
beq _0809C0A8
@@ -6256,7 +6256,7 @@ _0809C0B8:
_0809C0C8:
bl sub_809B294
adds r0, r4, 0
bl sub_802FD14
bl CreateMakuhitaShop
lsls r0, 24
cmp r0, 0
beq _0809C0F0
@@ -6287,7 +6287,7 @@ _0809C0FC:
_0809C10C:
bl sub_809B294
adds r0, r4, 0
bl sub_802FD14
bl CreateMakuhitaShop
lsls r0, 24
cmp r0, 0
beq _0809C134
@@ -6715,7 +6715,7 @@ sub_809C478:
cmp r0, 0x3
bne _0809C492
ldr r0, _0809C4AC
bl sub_8011988
bl PlaySound
bl InitFlash
bl ClearFlashData
_0809C492:
@@ -7692,7 +7692,7 @@ sub_809CBBC:
b _0809CC4A
.align 2, 0
_0809CC0C: .4byte gUnknown_81163E4
_0809CC10: .4byte gItemParametersFile + 4
_0809CC10: .4byte gItemParametersData
_0809CC14: .4byte gUnknown_203B460
_0809CC18: .4byte 0x0001869f
_0809CC1C:
asm/code_809D148.s
+1 -1
View File
@@ -5022,7 +5022,7 @@ _0809FDA8:
_0809FDB8:
movs r0, 0x1E
_0809FDBA:
bl sub_8011930
bl xxx_call_fade_out_bgm
bl _0809EAE0
_0809FDC2:
ldr r0, [sp, 0xC]
asm/code_80A7714.s
+5 -5
View File
@@ -751,7 +751,7 @@ _080A7D7E:
negs r0, r0
b _080A7DD4
.align 2, 0
_080A7D84: .4byte gUnknown_203B45C
_080A7D84: .4byte gRecruitedPokemonRef
_080A7D88:
ldrb r1, [r4]
movs r0, 0x1
@@ -893,7 +893,7 @@ _080A7E78:
ldrh r0, [r0, 0x8]
b _080A800A
.align 2, 0
_080A7E8C: .4byte gUnknown_203B45C
_080A7E8C: .4byte gRecruitedPokemonRef
_080A7E90:
adds r0, r3, 0
subs r0, 0xE
@@ -958,7 +958,7 @@ _080A7F06:
ldrh r0, [r4, 0x8]
b _080A800A
.align 2, 0
_080A7F0C: .4byte gUnknown_203B45C
_080A7F0C: .4byte gRecruitedPokemonRef
_080A7F10:
ldrb r1, [r4]
movs r0, 0x1
@@ -2937,7 +2937,7 @@ _080A8DDE:
adds r0, r1
b _080A8E94
.align 2, 0
_080A8DF4: .4byte gUnknown_203B45C
_080A8DF4: .4byte gRecruitedPokemonRef
_080A8DF8:
adds r0, r1, 0
subs r0, 0xE
@@ -2993,7 +2993,7 @@ _080A8DF8:
adds r0, r4, 0
b _080A8E94
.align 2, 0
_080A8E6C: .4byte gUnknown_203B45C
_080A8E6C: .4byte gRecruitedPokemonRef
_080A8E70:
ldrb r1, [r4]
movs r0, 0x1
asm/debug_menu.s
+1 -1
View File
@@ -68,7 +68,7 @@ _0803A3E8:
str r0, [sp, 0x80]
mov r0, r10
movs r1, 0x1
bl sub_801203C
bl WriteSavetoPak
add sp, 0x84
pop {r3-r5}
mov r8, r3
asm/debug_menu_1.s
+2 -2
View File
@@ -242,7 +242,7 @@ _0803ABCE:
movs r0, 0
b _0803AC1C
.align 2, 0
_0803AC08: .4byte gUnknown_203B45C
_0803AC08: .4byte gRecruitedPokemonRef
_0803AC0C: .4byte gUnknown_203B3F4
_0803AC10:
adds r5, 0x1
@@ -673,7 +673,7 @@ sub_803AF38:
b _0803AF82
.align 2, 0
_0803AF70: .4byte gUnknown_203B3F8
_0803AF74: .4byte gUnknown_203B45C
_0803AF74: .4byte gRecruitedPokemonRef
_0803AF78:
bl sub_8023C60
movs r0, 0x7
asm/felicity_bank.s
+571
View File
@@ -0,0 +1,571 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start UpdateFelicityBankDialogue
UpdateFelicityBankDialogue:
push {r4,r5,lr}
sub sp, 0x14
ldr r1, _08016558
ldr r0, [r1]
ldr r0, [r0, 0x4]
adds r2, r1, 0
cmp r0, 0xC
bls _0801654E
b _080168EC
_0801654E:
lsls r0, 2
ldr r1, _0801655C
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08016558: .4byte gUnknown_203B204
_0801655C: .4byte _08016560
.align 2, 0
_08016560:
.4byte _08016594
.4byte _080165B4
.4byte _080168B2
.4byte _08016650
.4byte _08016668
.4byte _080166C4
.4byte _080168EC
.4byte _080166DC
.4byte _0801674C
.4byte _080167A8
.4byte _080167CC
.4byte _0801685C
.4byte _080168C4
_08016594:
ldr r2, [r2]
movs r0, 0x1
str r0, [r2, 0x8]
ldr r3, _080165B0
ldr r1, [r2]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r0, r3
ldr r0, [r0]
adds r2, 0xA4
ldr r2, [r2]
b _08016844
.align 2, 0
_080165B0: .4byte gFelicityDialogue
_080165B4:
bl CreateFelicityBankShopMenu
ldr r0, _080165FC
ldr r0, [r0]
mov r12, r0
movs r0, 0x2
mov r1, r12
str r0, [r1, 0x8]
ldr r0, _08016600
ldr r0, [r0]
movs r3, 0x99
lsls r3, 2
adds r0, r3
ldr r4, [r0]
cmp r4, 0
bne _08016608
ldr r2, _08016604
ldr r1, [r1]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x4
adds r0, r2
ldr r0, [r0]
mov r5, r12
ldr r2, [r5, 0x10]
mov r3, r12
adds r3, 0x14
mov r1, r12
adds r1, 0x54
str r1, [sp]
movs r1, 0x4
str r1, [sp, 0x4]
str r4, [sp, 0x8]
b _08016632
.align 2, 0
_080165FC: .4byte gUnknown_203B204
_08016600: .4byte gUnknown_203B460
_08016604: .4byte gFelicityDialogue
_08016608:
ldr r0, _08016648
str r4, [r0]
ldr r2, _0801664C
mov r0, r12
ldr r1, [r0]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x8
adds r0, r2
ldr r0, [r0]
mov r1, r12
ldr r2, [r1, 0x10]
mov r3, r12
adds r3, 0x14
adds r1, 0x54
str r1, [sp]
movs r1, 0x4
str r1, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
_08016632:
mov r1, r12
adds r1, 0xA4
ldr r1, [r1]
str r1, [sp, 0xC]
movs r1, 0xC
str r1, [sp, 0x10]
movs r1, 0
bl sub_8014248
b _080168EC
.align 2, 0
_08016648: .4byte gUnknown_202DE30
_0801664C: .4byte gFelicityDialogue
_08016650:
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _08016664
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x38
b _0801683C
.align 2, 0
_08016664: .4byte gFelicityDialogue
_08016668:
ldr r3, [r2]
movs r0, 0x6
str r0, [r3, 0x8]
ldr r0, _08016698
ldr r0, [r0]
movs r5, 0x99
lsls r5, 2
adds r0, r5
ldr r1, [r0]
cmp r1, 0
bne _080166A0
ldr r2, _0801669C
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x10
adds r0, r2
ldr r0, [r0]
adds r1, r3, 0
adds r1, 0xA4
ldr r2, [r1]
b _08016844
.align 2, 0
_08016698: .4byte gUnknown_203B460
_0801669C: .4byte gFelicityDialogue
_080166A0:
ldr r0, _080166BC
str r1, [r0]
ldr r2, _080166C0
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x14
adds r0, r2
ldr r0, [r0]
adds r1, r3, 0
adds r1, 0xA4
ldr r2, [r1]
b _08016844
.align 2, 0
_080166BC: .4byte gUnknown_202DE30
_080166C0: .4byte gFelicityDialogue
_080166C4:
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _080166D8
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0xC
b _0801683C
.align 2, 0
_080166D8: .4byte gFelicityDialogue
_080166DC:
ldr r0, _08016700
ldr r1, [r0]
movs r3, 0x98
lsls r3, 2
adds r0, r1, r3
ldr r0, [r0]
cmp r0, 0
bne _08016708
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _08016704
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x1C
b _0801683C
.align 2, 0
_08016700: .4byte gUnknown_203B460
_08016704: .4byte gFelicityDialogue
_08016708:
movs r5, 0x99
lsls r5, 2
adds r0, r1, r5
ldr r1, [r0]
ldr r0, _0801672C
cmp r1, r0
ble _08016734
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _08016730
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x20
b _0801683C
.align 2, 0
_0801672C: .4byte 0x0098967e
_08016730: .4byte gFelicityDialogue
_08016734:
ldr r3, [r2]
movs r0, 0x8
str r0, [r3, 0x8]
ldr r2, _08016748
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x18
b _0801683C
.align 2, 0
_08016748: .4byte gFelicityDialogue
_0801674C:
ldr r4, [r2]
ldr r0, _080167A0
ldr r3, [r0]
movs r1, 0x99
lsls r1, 2
adds r0, r3, r1
ldr r1, [r0]
ldr r0, _080167A4
subs r0, r1
str r0, [r4, 0x70]
movs r5, 0x98
lsls r5, 2
adds r1, r3, r5
ldr r1, [r1]
cmp r0, r1
ble _0801676E
str r1, [r4, 0x70]
_0801676E:
ldr r2, [r2]
ldr r0, [r2, 0x70]
str r0, [r2, 0x68]
movs r0, 0x1
str r0, [r2, 0x6C]
movs r0, 0x5
str r0, [r2, 0x74]
movs r0, 0x2
str r0, [r2, 0x78]
adds r0, r2, 0
adds r0, 0xD8
str r0, [r2, 0x7C]
adds r1, r2, 0
adds r1, 0x80
movs r0, 0x50
str r0, [r1]
adds r1, 0x4
movs r0, 0x12
str r0, [r1]
adds r0, r2, 0
adds r0, 0x64
bl sub_8013AA0
movs r0, 0x1
b _080168AE
.align 2, 0
_080167A0: .4byte gUnknown_203B460
_080167A4: .4byte 0x0098967f
_080167A8:
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r1, _080167C4
ldr r0, [r3, 0xC]
str r0, [r1]
ldr r2, _080167C8
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x24
b _0801683C
.align 2, 0
_080167C4: .4byte gUnknown_202DE30
_080167C8: .4byte gFelicityDialogue
_080167CC:
ldr r0, _080167F4
ldr r3, [r0]
movs r1, 0x98
lsls r1, 2
adds r0, r3, r1
ldr r1, [r0]
ldr r0, _080167F8
cmp r1, r0
ble _08016800
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _080167FC
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x30
b _0801683C
.align 2, 0
_080167F4: .4byte gUnknown_203B460
_080167F8: .4byte 0x0001869e
_080167FC: .4byte gFelicityDialogue
_08016800:
movs r5, 0x99
lsls r5, 2
adds r4, r3, r5
ldr r0, [r4]
cmp r0, 0
bne _08016824
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r2, _08016820
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x2C
b _0801683C
.align 2, 0
_08016820: .4byte gFelicityDialogue
_08016824:
ldr r3, [r2]
movs r0, 0xB
str r0, [r3, 0x8]
ldr r1, _08016850
ldr r0, [r4]
str r0, [r1]
ldr r2, _08016854
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x28
_0801683C:
adds r0, r2
ldr r0, [r0]
adds r3, 0xA4
ldr r2, [r3]
_08016844:
ldr r3, _08016858
movs r1, 0
bl sub_80141B4
b _080168EC
.align 2, 0
_08016850: .4byte gUnknown_202DE30
_08016854: .4byte gFelicityDialogue
_08016858: .4byte 0x0000010d
_0801685C:
ldr r4, [r2]
ldr r0, _080168BC
ldr r3, [r0]
movs r1, 0x98
lsls r1, 2
adds r0, r3, r1
ldr r1, [r0]
ldr r0, _080168C0
subs r0, r1
str r0, [r4, 0x70]
movs r5, 0x99
lsls r5, 2
adds r1, r3, r5
ldr r1, [r1]
cmp r0, r1
ble _0801687E
str r1, [r4, 0x70]
_0801687E:
ldr r2, [r2]
ldr r0, [r2, 0x70]
str r0, [r2, 0x68]
movs r0, 0x1
str r0, [r2, 0x6C]
movs r0, 0x5
str r0, [r2, 0x74]
movs r0, 0x2
str r0, [r2, 0x78]
adds r0, r2, 0
adds r0, 0xD8
str r0, [r2, 0x7C]
adds r1, r2, 0
adds r1, 0x80
movs r0, 0x50
str r0, [r1]
adds r1, 0x4
movs r0, 0x12
str r0, [r1]
adds r0, r2, 0
adds r0, 0x64
bl sub_8013AA0
movs r0, 0
_080168AE:
bl sub_8016B48
_080168B2:
movs r0, 0x3
bl CreateFelicityMoneySavingsHeader
b _080168EC
.align 2, 0
_080168BC: .4byte gUnknown_203B460
_080168C0: .4byte 0x0001869f
_080168C4:
ldr r3, [r2]
movs r0, 0x1
str r0, [r3, 0x8]
ldr r1, _080168F4
ldr r0, [r3, 0xC]
str r0, [r1]
ldr r2, _080168F8
ldr r1, [r3]
lsls r0, r1, 4
subs r0, r1
lsls r0, 2
adds r2, 0x34
adds r0, r2
ldr r0, [r0]
adds r3, 0xA4
ldr r2, [r3]
ldr r3, _080168FC
movs r1, 0
bl sub_80141B4
_080168EC:
add sp, 0x14
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080168F4: .4byte gUnknown_202DE30
_080168F8: .4byte gFelicityDialogue
_080168FC: .4byte 0x0000010d
thumb_func_end UpdateFelicityBankDialogue
thumb_func_start CreateFelicityBankShopMenu
CreateFelicityBankShopMenu:
push {r4-r7,lr}
ldr r4, _08016980
ldr r0, [r4]
adds r0, 0x54
movs r1, 0
movs r2, 0x10
bl MemoryFill16
ldr r3, [r4]
movs r2, 0
ldr r0, _08016984
ldr r0, [r0]
str r0, [r3, 0x14]
movs r0, 0x2
str r0, [r3, 0x18]
movs r1, 0x1
ldr r0, _08016988
ldr r0, [r0]
str r0, [r3, 0x1C]
movs r0, 0x3
str r0, [r3, 0x20]
ldr r0, _0801698C
ldr r0, [r0]
str r0, [r3, 0x24]
movs r0, 0x4
str r0, [r3, 0x28]
ldr r0, _08016990
ldr r0, [r0]
str r0, [r3, 0x2C]
str r1, [r3, 0x30]
movs r6, 0x4
str r2, [r3, 0x34]
str r1, [r3, 0x38]
movs r5, 0
mov r12, r3
adds r3, 0x18
mov r2, r12
adds r2, 0x54
_0801694C:
ldrh r0, [r2]
cmp r0, 0
bne _0801695C
ldr r1, [r3]
mov r7, r12
ldr r0, [r7, 0x10]
cmp r1, r0
beq _080169B6
_0801695C:
adds r3, 0x8
adds r2, 0x2
adds r5, 0x1
cmp r5, r6
blt _0801694C
movs r5, 0
cmp r5, r6
bge _080169B6
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x54
ldrh r0, [r0]
cmp r0, 0
bne _08016994
ldr r0, [r1, 0x18]
str r0, [r1, 0x10]
b _080169B6
.align 2, 0
_08016980: .4byte gUnknown_203B204
_08016984: .4byte gUnknown_80D4958
_08016988: .4byte gUnknown_80D4964
_0801698C: .4byte gUnknown_80D4970
_08016990: .4byte gUnknown_80D4934
_08016994:
adds r5, 0x1
cmp r5, r6
bge _080169B6
ldr r2, [r4]
lsls r0, r5, 1
adds r1, r2, 0
adds r1, 0x54
adds r1, r0
ldrh r0, [r1]
cmp r0, 0
bne _08016994
lsls r0, r5, 3
adds r1, r2, 0
adds r1, 0x18
adds r1, r0
ldr r0, [r1]
str r0, [r2, 0x10]
_080169B6:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end CreateFelicityBankShopMenu
.align 2,0
asm/friend_area_1.s
+2 -2
View File
@@ -97,7 +97,7 @@ _080926CC:
.align 2, 0
_080926DC: .4byte gFriendAreas
_080926E0: .4byte gFriendAreaSettings
_080926E4: .4byte gUnknown_203B45C
_080926E4: .4byte gRecruitedPokemonRef
_080926E8:
strh r0, [r4, 0x2]
strh r0, [r4]
@@ -185,7 +185,7 @@ _08092776:
.align 2, 0
_08092780: .4byte gFriendAreas
_08092784: .4byte gFriendAreaSettings
_08092788: .4byte gUnknown_203B45C
_08092788: .4byte gRecruitedPokemonRef
_0809278C:
ldrh r0, [r4, 0x2]
adds r0, 0x1
asm/friend_rescue.s
+1 -1
View File
@@ -989,7 +989,7 @@ _0803315A:
adds r0, r5
b _080333DA
.align 2, 0
_08033188: .4byte gUnknown_203B45C
_08033188: .4byte gRecruitedPokemonRef
_0803318C: .4byte gUnknown_203B33C
_08033190:
adds r1, r2, 0
asm/items.s
+2518
View File
File diff suppressed because it is too large Load Diff
asm/jirachi_wish.s
+8 -8
View File
@@ -60,7 +60,7 @@ JirachiWish:
movs r1, 0x46
bl sub_803E708
ldr r0, _0808B848
bl sub_8083E38
bl PlaySoundEffect
movs r0, 0x96
movs r1, 0x46
bl sub_803E708
@@ -78,14 +78,14 @@ JirachiWish:
bl sub_80856E0
movs r0, 0xB5
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
ldr r0, _0808B850
bl sub_8052910
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
adds r0, r6, 0
bl sub_808696C
bl SpriteLookAroundEffect
ldr r0, _0808B854
bl sub_8052910
movs r0, 0xA
@@ -165,7 +165,7 @@ _0808B6D2:
beq _0808B744
movs r0, 0xA6
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
adds r0, r7, 0
bl sub_808BB3C
adds r0, r6, 0
@@ -249,7 +249,7 @@ _0808B77E:
beq _0808B7FA
movs r0, 0xC8
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
adds r0, r7, 0
bl sub_808BB3C
adds r0, r6, 0
@@ -320,7 +320,7 @@ _0808B87C:
adds r0, r4, 0
bl UnlockFriendArea
movs r0, 0xD4
bl sub_8083E38
bl PlaySoundEffect
bl sub_8083600
adds r1, r0, 0
ldr r0, _0808BA3C
@@ -399,7 +399,7 @@ _0808B8F4:
beq _0808B970
movs r0, 0xC8
lsls r0, 1
bl sub_8083E38
bl PlaySoundEffect
adds r0, r7, 0
bl sub_808BB3C
adds r0, r6, 0
@@ -534,7 +534,7 @@ sub_808BAA4:
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _0808BB34
bl sub_8083E38
bl PlaySoundEffect
ldr r1, _0808BB38
movs r0, 0x1F
str r0, [r1]
asm/kangaskhan_storage.s
+685
View File
@@ -0,0 +1,685 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_8016FF8
sub_8016FF8:
push {r4,r5,lr}
sub sp, 0x14
ldr r1, _08017014
ldr r0, [r1]
ldr r0, [r0, 0x4]
adds r4, r1, 0
cmp r0, 0x1D
bls _0801700A
b _08017584
_0801700A:
lsls r0, 2
ldr r1, _08017018
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08017014: .4byte gUnknown_203B208
_08017018: .4byte _0801701C
.align 2, 0
_0801701C:
.4byte _08017094
.4byte _080170BC
.4byte _0801710C
.4byte _0801713C
.4byte _08017584
.4byte _0801715C
.4byte _0801718C
.4byte _080171BC
.4byte _080171EC
.4byte _0801721C
.4byte _0801724C
.4byte _0801726C
.4byte _0801728C
.4byte _080172AC
.4byte _080172BA
.4byte _080172C2
.4byte _080174A8
.4byte _080172E4
.4byte _0801731C
.4byte _08017344
.4byte _08017394
.4byte _080173B4
.4byte _080173E8
.4byte _080173F6
.4byte _08017404
.4byte _08017474
.4byte _080174A8
.4byte _080174B2
.4byte _080174E8
.4byte _08017530
_08017094:
bl sub_80175FC
ldr r2, _080170B4
ldr r0, [r2]
adds r0, 0xE4
movs r4, 0
movs r1, 0x1
strb r1, [r0]
ldr r3, _080170B8
ldr r5, [r2]
ldr r1, [r5]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r0, r3
b _080170DA
.align 2, 0
_080170B4: .4byte gUnknown_203B208
_080170B8: .4byte gUnknown_80D5404
_080170BC:
bl sub_80175FC
ldr r1, _08017104
ldr r0, [r1]
adds r0, 0xE4
movs r4, 0
strb r4, [r0]
ldr r2, _08017108
ldr r5, [r1]
ldr r1, [r5]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x4
adds r0, r2
_080170DA:
ldr r0, [r0]
ldr r2, [r5, 0x18]
adds r3, r5, 0
adds r3, 0x24
adds r1, r5, 0
adds r1, 0x4C
str r1, [sp]
movs r1, 0x4
str r1, [sp, 0x4]
str r4, [sp, 0x8]
adds r1, r5, 0
adds r1, 0xE8
ldr r1, [r1]
str r1, [sp, 0xC]
movs r1, 0xC
str r1, [sp, 0x10]
movs r1, 0
bl sub_8014248
b _08017584
.align 2, 0
_08017104: .4byte gUnknown_203B208
_08017108: .4byte gUnknown_80D5404
_0801710C:
ldr r0, [r4]
movs r1, 0x1
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017134
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x4C
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _08017138
b _080173D8
.align 2, 0
_08017134: .4byte gUnknown_80D5404
_08017138: .4byte 0x0000010d
_0801713C:
ldr r0, [r4]
movs r1, 0x4
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0x1
strb r1, [r0]
ldr r2, _08017158
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x8
b _080173CE
.align 2, 0
_08017158: .4byte gUnknown_80D5404
_0801715C:
ldr r0, [r4]
movs r1, 0x1
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017184
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x34
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _08017188
b _080173D8
.align 2, 0
_08017184: .4byte gUnknown_80D5404
_08017188: .4byte 0x0000010d
_0801718C:
ldr r0, [r4]
movs r1, 0x1
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _080171B4
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x38
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _080171B8
b _080173D8
.align 2, 0
_080171B4: .4byte gUnknown_80D5404
_080171B8: .4byte 0x0000010d
_080171BC:
ldr r0, [r4]
movs r1, 0x1
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _080171E4
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x3C
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _080171E8
b _080173D8
.align 2, 0
_080171E4: .4byte gUnknown_80D5404
_080171E8: .4byte 0x0000010d
_080171EC:
ldr r0, [r4]
movs r1, 0x1
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017214
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x48
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _08017218
b _080173D8
.align 2, 0
_08017214: .4byte gUnknown_80D5404
_08017218: .4byte 0x0000010d
_0801721C:
ldr r0, _08017244
ldr r1, [r4]
adds r1, 0xC
movs r2, 0
bl sub_8090E14
ldr r0, [r4]
movs r1, 0xE
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017248
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x40
b _080173CE
.align 2, 0
_08017244: .4byte gUnknown_202DE58
_08017248: .4byte gUnknown_80D5404
_0801724C:
ldr r0, [r4]
movs r1, 0xE
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017268
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x44
b _080173CE
.align 2, 0
_08017268: .4byte gUnknown_80D5404
_0801726C:
ldr r0, [r4]
movs r1, 0xD
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _08017288
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0xC
b _080173CE
.align 2, 0
_08017288: .4byte gUnknown_80D5404
_0801728C:
ldr r0, [r4]
movs r1, 0xE
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _080172A8
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x10
b _080173CE
.align 2, 0
_080172A8: .4byte gUnknown_80D5404
_080172AC:
movs r0, 0x3
movs r1, 0x3
movs r2, 0
movs r3, 0xA
bl sub_801A5D8
b _08017584
_080172BA:
movs r0, 0x1
bl sub_801A8D0
b _08017584
_080172C2:
bl sub_801A9E0
bl sub_80176B8
ldr r0, _080172E0
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x58
adds r1, r2, 0
adds r1, 0x24
adds r3, r2, 0
adds r3, 0x4C
ldr r2, [r2, 0x1C]
b _08017494
.align 2, 0
_080172E0: .4byte gUnknown_203B208
_080172E4:
bl sub_80177F8
ldr r0, _08017310
ldr r4, _08017314
ldr r1, [r4]
adds r1, 0xC
movs r2, 0
bl sub_8090E14
ldr r0, [r4]
adds r0, 0xE4
movs r5, 0
strb r5, [r0]
ldr r2, _08017318
ldr r4, [r4]
ldr r1, [r4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x14
b _08017504
.align 2, 0
_08017310: .4byte gUnknown_202DE58
_08017314: .4byte gUnknown_203B208
_08017318: .4byte gUnknown_80D5404
_0801731C:
bl sub_80177F8
ldr r1, _0801733C
ldr r0, [r1]
adds r0, 0xE4
movs r5, 0
strb r5, [r0]
ldr r2, _08017340
ldr r4, [r1]
ldr r1, [r4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x18
b _08017504
.align 2, 0
_0801733C: .4byte gUnknown_203B208
_08017340: .4byte gUnknown_80D5404
_08017344:
bl sub_8090A34
cmp r0, 0
bne _0801735C
bl sub_801A928
ldr r0, _08017358
ldr r1, [r0]
movs r0, 0x1
b _08017362
.align 2, 0
_08017358: .4byte gUnknown_203B208
_0801735C:
ldr r0, _08017388
ldr r1, [r0]
movs r0, 0xC
_08017362:
str r0, [r1, 0x8]
ldr r3, _08017388
ldr r0, [r3]
adds r0, 0xE4
movs r1, 0x1
strb r1, [r0]
ldr r2, _0801738C
ldr r3, [r3]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x1C
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _08017390
b _080173D8
.align 2, 0
_08017388: .4byte gUnknown_203B208
_0801738C: .4byte gUnknown_80D5404
_08017390: .4byte 0x0000010d
_08017394:
ldr r0, [r4]
movs r1, 0x16
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _080173B0
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x20
b _080173CE
.align 2, 0
_080173B0: .4byte gUnknown_80D5404
_080173B4:
ldr r0, [r4]
movs r1, 0x17
str r1, [r0, 0x8]
adds r0, 0xE4
movs r1, 0
strb r1, [r0]
ldr r2, _080173E0
ldr r3, [r4]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x24
_080173CE:
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _080173E4
_080173D8:
movs r1, 0
bl sub_80141B4
b _08017584
.align 2, 0
_080173E0: .4byte gUnknown_80D5404
_080173E4: .4byte 0x0000030d
_080173E8:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
movs r3, 0xA
bl sub_801C8C4
b _080173FC
_080173F6:
movs r0, 0x1
bl sub_801CB5C
_080173FC:
movs r0, 0
bl sub_801AD34
b _08017584
_08017404:
ldr r2, [r4]
adds r1, r2, 0
adds r1, 0xB8
movs r0, 0x2
str r0, [r1]
subs r1, 0x8
movs r0, 0x1
str r0, [r1]
ldr r0, _08017430
ldr r1, [r0]
ldrb r0, [r2, 0xE]
lsls r0, 1
adds r1, 0x50
adds r3, r1, r0
ldrh r0, [r3]
cmp r0, 0x63
bls _08017434
adds r1, r2, 0
adds r1, 0xB4
movs r0, 0x63
b _0801743A
.align 2, 0
_08017430: .4byte gUnknown_203B460
_08017434:
adds r1, r2, 0
adds r1, 0xB4
ldrh r0, [r3]
_0801743A:
str r0, [r1]
ldr r2, [r4]
adds r1, r2, 0
adds r1, 0xAC
adds r0, r2, 0
adds r0, 0xB4
ldr r0, [r0]
str r0, [r1]
adds r1, 0x10
movs r0, 0x1
str r0, [r1]
adds r1, 0x4
movs r3, 0x82
lsls r3, 1
adds r0, r2, r3
str r0, [r1]
adds r1, 0x4
movs r0, 0x28
str r0, [r1]
adds r1, 0x4
movs r0, 0x12
str r0, [r1]
adds r0, r2, 0
adds r0, 0xA8
bl sub_8013AA0
bl sub_8017598
b _08017584
_08017474:
bl sub_801CCD8
movs r0, 0
bl sub_801AD34
bl sub_8017758
ldr r0, _080174A4
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x58
adds r1, r2, 0
adds r1, 0x24
adds r3, r2, 0
adds r3, 0x4C
ldr r2, [r2, 0x20]
_08017494:
str r2, [sp]
movs r2, 0x2
str r2, [sp, 0x4]
movs r2, 0
bl sub_8012D60
b _08017584
.align 2, 0
_080174A4: .4byte gUnknown_203B208
_080174A8:
ldr r0, [r4]
adds r0, 0xC
bl sub_801B3C0
b _08017584
_080174B2:
bl sub_80177F8
ldr r0, _080174DC
ldr r4, _080174E0
ldr r1, [r4]
adds r1, 0xC
movs r2, 0
bl sub_8090E14
ldr r0, [r4]
adds r0, 0xE4
movs r5, 0
strb r5, [r0]
ldr r2, _080174E4
ldr r4, [r4]
ldr r1, [r4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x28
b _08017504
.align 2, 0
_080174DC: .4byte gUnknown_202DE58
_080174E0: .4byte gUnknown_203B208
_080174E4: .4byte gUnknown_80D5404
_080174E8:
bl sub_80177F8
ldr r1, _08017528
ldr r0, [r1]
adds r0, 0xE4
movs r5, 0
strb r5, [r0]
ldr r2, _0801752C
ldr r4, [r1]
ldr r1, [r4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x2C
_08017504:
adds r0, r2
ldr r0, [r0]
adds r3, r4, 0
adds r3, 0x24
str r5, [sp]
movs r1, 0x4
str r1, [sp, 0x4]
str r5, [sp, 0x8]
adds r4, 0xE8
ldr r1, [r4]
str r1, [sp, 0xC]
movs r1, 0xC
str r1, [sp, 0x10]
movs r1, 0
movs r2, 0x4
bl sub_8014248
b _08017584
.align 2, 0
_08017528: .4byte gUnknown_203B208
_0801752C: .4byte gUnknown_80D5404
_08017530:
movs r0, 0x1
bl sub_801CF14
lsls r0, 24
cmp r0, 0
bne _08017544
bl sub_8090A34
cmp r0, 0x13
ble _08017554
_08017544:
bl sub_801CBB8
ldr r0, _08017550
ldr r1, [r0]
movs r0, 0x1
b _0801755A
.align 2, 0
_08017550: .4byte gUnknown_203B208
_08017554:
ldr r0, _0801758C
ldr r1, [r0]
movs r0, 0x15
_0801755A:
str r0, [r1, 0x8]
ldr r3, _0801758C
ldr r0, [r3]
adds r0, 0xE4
movs r1, 0x1
strb r1, [r0]
ldr r2, _08017590
ldr r3, [r3]
ldr r1, [r3]
lsls r0, r1, 2
adds r0, r1
lsls r0, 4
adds r2, 0x30
adds r0, r2
ldr r0, [r0]
adds r3, 0xE8
ldr r2, [r3]
ldr r3, _08017594
movs r1, 0
bl sub_80141B4
_08017584:
add sp, 0x14
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0801758C: .4byte gUnknown_203B208
_08017590: .4byte gUnknown_80D5404
_08017594: .4byte 0x0000010d
thumb_func_end sub_8016FF8
.align 2,0
asm/kangaskhan_storage_1.s
+2675
View File
File diff suppressed because it is too large Load Diff
asm/kecleon_items.s
+1530
View File
File diff suppressed because it is too large Load Diff
asm/load_screen.s
-718
View File
@@ -1,718 +0,0 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start CreateLoadScreen
CreateLoadScreen:
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
adds r6, r0, 0
ldr r5, _080392EC
ldr r0, [r5]
cmp r0, 0
bne _0803927C
movs r4, 0x9F
lsls r4, 2
adds r0, r4, 0
movs r1, 0x8
bl MemoryAlloc
str r0, [r5]
movs r1, 0
adds r2, r4, 0
bl MemoryFill8
_0803927C:
ldr r0, [r5]
str r6, [r0]
mov r12, r5
movs r0, 0xA2
lsls r0, 1
mov r8, r0
ldr r4, _080392F0
movs r3, 0
movs r2, 0x3
_0803928E:
mov r5, r12
ldr r1, [r5]
adds r1, r3
add r1, r8
adds r0, r4, 0
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
adds r3, 0x18
subs r2, 0x1
cmp r2, 0
bge _0803928E
bl ResetUnusedInputStruct
ldr r6, _080392EC
ldr r0, [r6]
movs r5, 0xA2
lsls r5, 1
adds r0, r5
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
ldr r1, [r6]
adds r0, r1, 0x4
adds r1, r5
ldr r3, _080392F4
ldr r2, _080392F8
str r2, [sp]
movs r4, 0
str r4, [sp, 0x4]
movs r7, 0x6
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
bl SetMenuItems
ldr r1, [r6]
ldr r0, [r1]
cmp r0, 0x7
beq _08039306
cmp r0, 0x7
bhi _080392FC
cmp r0, 0x6
beq _08039338
b _08039382
.align 2, 0
_080392EC: .4byte gUnknown_203B374
_080392F0: .4byte gUnknown_80E75F8
_080392F4: .4byte gUnknown_80E7610
_080392F8: .4byte gUnknown_203B378
_080392FC:
cmp r0, 0x8
beq _0803934C
cmp r0, 0x9
beq _0803936C
b _08039382
_08039306:
bl sub_8039844
lsls r0, 24
cmp r0, 0
beq _08039324
ldr r1, [r6]
adds r0, r1, 0x4
adds r1, r5
ldr r3, _0803931C
ldr r2, _08039320
b _08039354
.align 2, 0
_0803931C: .4byte gUnknown_80E762C
_08039320: .4byte gUnknown_80E7644
_08039324:
ldr r1, [r6]
adds r0, r1, 0x4
adds r1, r5
ldr r3, _08039330
ldr r2, _08039334
b _08039354
.align 2, 0
_08039330: .4byte gUnknown_80E762C
_08039334: .4byte gUnknown_80E7684
_08039338:
adds r0, r1, 0x4
adds r1, r5
ldr r3, _08039344
ldr r2, _08039348
b _08039354
.align 2, 0
_08039344: .4byte gUnknown_80E762C
_08039348: .4byte gUnknown_80E76B8
_0803934C:
adds r0, r1, 0x4
adds r1, r5
ldr r3, _08039364
ldr r2, _08039368
_08039354:
str r2, [sp]
str r4, [sp, 0x4]
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0x1
bl SetMenuItems
b _08039382
.align 2, 0
_08039364: .4byte gUnknown_80E762C
_08039368: .4byte gUnknown_80E76E8
_0803936C:
adds r0, r1, 0x4
adds r1, r5
ldr r3, _080393DC
ldr r2, _080393E0
str r2, [sp]
str r4, [sp, 0x4]
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0x1
bl SetMenuItems
_08039382:
ldr r4, _080393E4
ldr r1, [r4]
adds r0, r1, 0x4
movs r6, 0xA2
lsls r6, 1
adds r1, r6
ldr r3, _080393E8
ldr r2, _080393EC
str r2, [sp]
movs r2, 0x1
str r2, [sp, 0x4]
movs r2, 0x2
str r2, [sp, 0x8]
movs r2, 0
str r2, [sp, 0xC]
movs r2, 0x2
bl SetMenuItems
ldr r0, [r4]
adds r0, 0x4
movs r1, 0
movs r2, 0
bl sub_8035CF4
ldr r0, [r4]
adds r0, 0x4
movs r1, 0x1
movs r2, 0
bl sub_8035CF4
ldr r0, [r4]
adds r0, 0x4
movs r1, 0x2
movs r2, 0x1
bl sub_8035CF4
bl DrawLoadScreenText
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080393DC: .4byte gUnknown_80E762C
_080393E0: .4byte gUnknown_80E7730
_080393E4: .4byte gUnknown_203B374
_080393E8: .4byte gUnknown_80E7784
_080393EC: .4byte gUnknown_80E779C
thumb_func_end CreateLoadScreen
thumb_func_start CleanLoadScreen
CleanLoadScreen:
push {r4,lr}
bl ResetUnusedInputStruct
movs r0, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
ldr r4, _08039418
ldr r0, [r4]
cmp r0, 0
beq _08039410
bl MemoryFree
movs r0, 0
str r0, [r4]
_08039410:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08039418: .4byte gUnknown_203B374
thumb_func_end CleanLoadScreen
thumb_func_start sub_803941C
sub_803941C:
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _08039458
movs r0, 0x4
str r0, [sp]
ldr r4, _0803945C
ldr r0, [r4]
adds r0, 0x54
bl sub_8012FD8
ldr r0, [r4]
adds r0, 0xA4
bl sub_8012FD8
lsls r0, 24
cmp r0, 0
bne _08039448
ldr r0, [r4]
adds r0, 0xA4
mov r1, sp
bl sub_8013114
_08039448:
ldr r0, [sp]
cmp r0, 0x3
bhi _08039498
cmp r0, 0x2
bcs _08039460
cmp r0, 0x1
beq _08039464
b _08039498
.align 2, 0
_08039458: .4byte 0x0000ffdc
_0803945C: .4byte gUnknown_203B374
_08039460:
movs r5, 0x1
b _08039498
_08039464:
ldr r0, [r4]
ldr r0, [r0]
cmp r0, 0x7
beq _08039480
cmp r0, 0x7
bhi _08039476
cmp r0, 0x6
beq _08039484
b _08039498
_08039476:
cmp r0, 0x8
beq _0803948E
cmp r0, 0x9
beq _08039492
b _08039498
_08039480:
movs r5, 0x2
b _08039498
_08039484:
movs r0, 0
bl sub_8095240
movs r5, 0x4
b _08039498
_0803948E:
movs r5, 0x9
b _08039498
_08039492:
bl sub_80122A8
movs r5, 0x2E
_08039498:
adds r0, r5, 0
add sp, 0x4
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_803941C
thumb_func_start DrawLoadScreenText
DrawLoadScreenText:
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x150
bl sub_8011FA8
mov r8, r0
movs r0, 0
bl sub_8008C54
movs r0, 0
bl sub_80073B8
ldr r2, _0803952C
movs r4, 0
str r4, [sp]
movs r0, 0x8
movs r1, 0
movs r3, 0
bl xxx_call_draw_string
ldr r2, _08039530
str r4, [sp]
movs r0, 0x8
movs r1, 0xC
movs r3, 0
bl xxx_call_draw_string
ldr r2, _08039534
str r4, [sp]
movs r0, 0x8
movs r1, 0x18
movs r3, 0
bl xxx_call_draw_string
ldr r2, _08039538
str r4, [sp]
movs r0, 0x8
movs r1, 0x24
movs r3, 0
bl xxx_call_draw_string
ldr r2, _0803953C
str r4, [sp]
movs r0, 0x8
movs r1, 0x30
movs r3, 0
bl xxx_call_draw_string
ldr r2, _08039540
str r4, [sp]
movs r0, 0x8
movs r1, 0x3C
movs r3, 0
bl xxx_call_draw_string
movs r0, 0
bl sub_80023E4
lsls r0, 24
cmp r0, 0
beq _08039544
add r4, sp, 0x68
adds r0, r4, 0
bl sub_80920D8
adds r2, r4, 0
b _0803954E
.align 2, 0
_0803952C: .4byte gUnknown_80E77BC
_08039530: .4byte gUnknown_80E77C4
_08039534: .4byte gUnknown_80E77CC
_08039538: .4byte gUnknown_80E77D8
_0803953C: .4byte gUnknown_80E77E4
_08039540: .4byte gUnknown_80E77F0
_08039544:
ldr r1, _08039588
add r0, sp, 0x68
bl strcpy
add r2, sp, 0x68
_0803954E:
ldr r5, _0803958C
ldr r0, [r5]
movs r4, 0xD2
lsls r4, 1
adds r0, r4
ldr r1, _08039590
bl sub_800D158
ldr r2, [r5]
adds r2, r4
movs r0, 0
str r0, [sp]
movs r0, 0x40
movs r1, 0
movs r3, 0
bl xxx_call_draw_string
bl sub_808D33C
cmp r0, 0
bne _08039598
add r4, sp, 0x90
ldr r1, _08039594
adds r0, r4, 0
movs r2, 0xA
bl sub_80922B4
b _080395A6
.align 2, 0
_08039588: .4byte gUnknown_80E77F8
_0803958C: .4byte gUnknown_203B374
_08039590: .4byte gUnknown_80E7804
_08039594: .4byte gUnknown_80E7808
_08039598:
add r4, sp, 0x90
adds r1, r0, 0
adds r1, 0x4C
adds r0, r4, 0
movs r2, 0xA
bl sub_80922B4
_080395A6:
adds r2, r4, 0
ldr r5, _080395F0
ldr r0, [r5]
movs r4, 0xE4
lsls r4, 1
adds r0, r4
ldr r6, _080395F4
adds r1, r6, 0
bl sub_800D158
ldr r2, [r5]
adds r2, r4
movs r0, 0
str r0, [sp]
movs r0, 0x40
movs r1, 0xC
movs r3, 0
bl xxx_call_draw_string
movs r0, 0x1
bl sub_8095324
cmp r0, 0
bne _080395E0
movs r0, 0x7
bl sub_8095324
cmp r0, 0
beq _08039606
_080395E0:
ldr r0, _080395F8
cmp r8, r0
bne _080395FC
ldr r4, [r5]
movs r0, 0xF6
lsls r0, 1
adds r4, r0
b _08039676
.align 2, 0
_080395F0: .4byte gUnknown_203B374
_080395F4: .4byte gUnknown_80E7804
_080395F8: .4byte 0x000f1207
_080395FC:
ldr r0, [r5]
movs r1, 0xF6
lsls r1, 1
adds r0, r1
b _08039690
_08039606:
bl sub_8011C1C
cmp r0, 0x1
beq _08039624
cmp r0, 0x2
beq _08039668
ldr r0, [r5]
movs r2, 0xF6
lsls r2, 1
adds r0, r2
ldr r1, _08039620
b _08039692
.align 2, 0
_08039620: .4byte gUnknown_80E7824
_08039624:
movs r0, 0
movs r1, 0x18
bl sub_8001658
cmp r0, 0x7
beq _08039658
cmp r0, 0xB
beq _08039658
bl sub_8098FB4
adds r2, r0, 0
add r0, sp, 0x4
adds r1, r6, 0
bl sub_800D158
ldr r0, [r5]
movs r3, 0xF6
lsls r3, 1
adds r1, r0, r3
adds r3, 0x24
adds r2, r0, r3
add r0, sp, 0x4
movs r3, 0
bl xxx_format_string
b _08039696
_08039658:
ldr r0, _08039664
ldr r0, [r0]
movs r1, 0xF6
lsls r1, 1
adds r0, r1
b _08039690
.align 2, 0
_08039664: .4byte gUnknown_203B374
_08039668:
ldr r0, _08039684
cmp r8, r0
bne _08039688
ldr r4, [r5]
movs r2, 0xF6
lsls r2, 1
adds r4, r2
_08039676:
bl sub_809769C
adds r1, r0, 0
adds r0, r4, 0
bl sub_8090228
b _08039696
.align 2, 0
_08039684: .4byte 0x000f1207
_08039688:
ldr r0, [r5]
movs r3, 0xF6
lsls r3, 1
adds r0, r3
_08039690:
ldr r1, _0803974C
_08039692:
bl sub_800D158
_08039696:
ldr r7, _08039750
ldr r2, [r7]
movs r0, 0xF6
lsls r0, 1
adds r2, r0
movs r6, 0
str r6, [sp]
movs r0, 0x40
movs r1, 0x18
movs r3, 0
bl xxx_call_draw_string
ldr r0, _08039754
ldr r0, [r0]
add r1, sp, 0x144
add r2, sp, 0x148
add r3, sp, 0x14C
bl DeconstructPlayTime
ldr r0, [r7]
movs r5, 0x84
lsls r5, 2
adds r0, r5
ldr r1, _08039758
add r2, sp, 0x144
ldr r2, [r2]
add r3, sp, 0x148
ldr r3, [r3]
add r4, sp, 0x14C
ldr r4, [r4]
str r4, [sp]
bl sub_800D158
ldr r2, [r7]
adds r2, r5
str r6, [sp]
movs r0, 0x40
movs r1, 0x24
movs r3, 0
bl xxx_call_draw_string
bl sub_8097778
adds r2, r0, 0
ldr r0, [r7]
movs r4, 0x8D
lsls r4, 2
adds r0, r4
ldr r1, _0803975C
bl sub_800D158
ldr r2, [r7]
adds r2, r4
str r6, [sp]
movs r0, 0x40
movs r1, 0x30
movs r3, 0
bl xxx_call_draw_string
ldr r0, _08039760
cmp r8, r0
bne _0803976C
ldr r0, _08039764
ldr r6, [r0]
movs r1, 0xC
ldrsh r0, [r6, r1]
cmp r0, 0
beq _0803976C
add r5, sp, 0x130
adds r1, r0, 0
adds r0, r5, 0
bl sub_808D930
add r4, sp, 0xE0
adds r1, r6, 0
adds r1, 0x50
adds r0, r4, 0
movs r2, 0xA
bl sub_80922B4
ldr r0, [r7]
movs r3, 0x96
lsls r3, 2
adds r0, r3
ldr r1, _08039768
adds r2, r4, 0
adds r3, r5, 0
bl sub_800D158
b _0803977C
.align 2, 0
_0803974C: .4byte gUnknown_80E780C
_08039750: .4byte gUnknown_203B374
_08039754: .4byte gPlayTimeRef
_08039758: .4byte gUnknown_80E7838
_0803975C: .4byte gUnknown_80E7848
_08039760: .4byte 0x000f1207
_08039764: .4byte gUnknown_203B484
_08039768: .4byte gUnknown_80E784C
_0803976C:
ldr r0, _080397AC
ldr r0, [r0]
movs r1, 0x96
lsls r1, 2
adds r0, r1
ldr r1, _080397B0
bl sub_800D158
_0803977C:
ldr r0, _080397AC
ldr r2, [r0]
movs r3, 0x96
lsls r3, 2
adds r2, r3
movs r0, 0
str r0, [sp]
movs r0, 0x40
movs r1, 0x3C
movs r3, 0
bl xxx_call_draw_string
bl sub_80397B4
movs r0, 0
bl sub_80073E0
add sp, 0x150
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080397AC: .4byte gUnknown_203B374
_080397B0: .4byte gUnknown_80E7854
thumb_func_end DrawLoadScreenText
thumb_func_start sub_80397B4
sub_80397B4:
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0xC
ldr r0, _08039834
ldr r1, _08039838
bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
movs r4, 0
_080397C8:
adds r0, r4, 0
adds r0, 0xB0
ldr r1, [r6, 0x4]
lsls r2, r4, 2
ldr r1, [r1, 0x4]
adds r1, r2
bl SetBGPaletteBufferColorArray
adds r4, 0x1
cmp r4, 0x3F
ble _080397C8
movs r7, 0x8
movs r0, 0x49
mov r8, r0
movs r4, 0
_080397E6:
ldr r0, _0803983C
lsls r5, r4, 2
adds r0, r5, r0
ldr r0, [r0]
bl sub_80023E4
lsls r0, 24
cmp r0, 0
beq _0803981C
movs r0, 0x10
str r0, [sp]
ldr r0, [r6, 0x4]
lsls r1, r4, 7
ldr r0, [r0]
adds r0, r1
str r0, [sp, 0x4]
ldr r0, _08039840
adds r0, r5, r0
ldr r0, [r0]
str r0, [sp, 0x8]
movs r0, 0
adds r1, r7, 0
mov r2, r8
movs r3, 0x10
bl sub_8007E20
adds r7, 0x10
_0803981C:
adds r4, 0x1
cmp r4, 0xB
ble _080397E6
adds r0, r6, 0
bl CloseFile
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08039834: .4byte gUnknown_80E785C
_08039838: .4byte gTitleMenuFileArchive
_0803983C: .4byte gUnknown_203B3B8
_08039840: .4byte gUnknown_203B388
thumb_func_end sub_80397B4
.align 2,0
asm/main_menu.s
-76
View File
@@ -1,76 +0,0 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start SetMenuItems
SetMenuItems:
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x8
adds r6, r0, 0
adds r4, r1, 0
adds r5, r2, 0
ldr r0, [sp, 0x24]
lsls r0, 24
lsrs r0, 24
mov r8, r0
lsls r0, r5, 1
adds r0, r5
lsls r0, 3
adds r0, r4
ldm r3!, {r1,r2,r7}
stm r0!, {r1,r2,r7}
ldm r3!, {r1,r2,r7}
stm r0!, {r1,r2,r7}
bl ResetUnusedInputStruct
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
mov r0, r8
cmp r0, 0
beq _08035C90
lsls r4, r5, 2
adds r0, r4, r5
lsls r0, 4
adds r0, r6, r0
ldr r1, [sp, 0x28]
str r1, [sp]
str r5, [sp, 0x4]
ldr r1, [sp, 0x20]
movs r2, 0
movs r3, 0
bl sub_8012D60
b _08035CA8
_08035C90:
lsls r4, r5, 2
adds r0, r4, r5
lsls r0, 4
adds r0, r6, r0
mov r1, r8
str r1, [sp]
str r5, [sp, 0x4]
ldr r1, [sp, 0x20]
movs r2, 0
movs r3, 0
bl sub_8012E04
_08035CA8:
adds r0, r4, r5
lsls r0, 4
adds r0, r6
adds r0, 0x4C
movs r1, 0x1
strb r1, [r0]
add sp, 0x8
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end SetMenuItems
.align 2,0
asm/makuhita_dojo.s
+908
View File
@@ -0,0 +1,908 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start UpdateMakuhitaDialogue
UpdateMakuhitaDialogue:
push {r4,r5,lr}
sub sp, 0x18
ldr r1, _0802FFA4
ldr r0, [r1]
ldr r0, [r0, 0x8]
adds r5, r1, 0
cmp r0, 0xD
bls _0802FF9A
b _080301A0
_0802FF9A:
lsls r0, 2
ldr r1, _0802FFA8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0802FFA4: .4byte gUnknown_203B318
_0802FFA8: .4byte _0802FFAC
.align 2, 0
_0802FFAC:
.4byte _0802FFE4
.4byte _08030000
.4byte _08030038
.4byte _08030050
.4byte _08030068
.4byte _08030074
.4byte _080300DC
.4byte _080300C4
.4byte _080300F4
.4byte _0803010C
.4byte _08030148
.4byte _08030174
.4byte _08030180
.4byte _080301A0
_0802FFE4:
bl sub_80301B0
ldr r2, _0802FFF8
ldr r0, _0802FFFC
ldr r5, [r0]
ldr r1, [r5, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
b _0803000E
.align 2, 0
_0802FFF8: .4byte gMakuhitaDialogue
_0802FFFC: .4byte gUnknown_203B318
_08030000:
ldr r2, _08030034
ldr r5, [r5]
ldr r1, [r5, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x4
_0803000E:
adds r0, r2
ldr r0, [r0]
ldr r2, [r5, 0x14]
adds r3, r5, 0
adds r3, 0x18
movs r4, 0
str r4, [sp]
movs r1, 0x4
str r1, [sp, 0x4]
str r4, [sp, 0x8]
ldr r1, [r5, 0x68]
str r1, [sp, 0xC]
movs r1, 0xC
str r1, [sp, 0x10]
movs r1, 0
bl sub_8014248
b _080301A0
.align 2, 0
_08030034: .4byte gMakuhitaDialogue
_08030038:
ldr r3, [r5]
movs r0, 0xD
str r0, [r3, 0xC]
ldr r2, _0803004C
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x8
b _0803015A
.align 2, 0
_0803004C: .4byte gMakuhitaDialogue
_08030050:
ldr r3, [r5]
movs r0, 0x4
str r0, [r3, 0xC]
ldr r2, _08030064
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0xC
b _0803015A
.align 2, 0
_08030064: .4byte gMakuhitaDialogue
_08030068:
movs r0, 0x3
movs r1, 0
movs r2, 0xA
bl sub_80302E8
b _080301A0
_08030074:
ldr r1, [r5]
movs r0, 0xD
str r0, [r1, 0xC]
movs r2, 0x10
ldrsh r0, [r1, r2]
bl sub_80A2740
lsls r0, 24
lsrs r0, 24
ldr r2, _080300B4
ldr r1, [sp, 0x14]
ands r1, r2
orrs r1, r0
ldr r0, _080300B8
ands r1, r0
movs r0, 0x80
lsls r0, 1
orrs r1, r0
str r1, [sp, 0x14]
ldr r0, _080300BC
add r1, sp, 0x14
bl sub_8090208
ldr r2, _080300C0
ldr r3, [r5]
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x10
b _0803015A
.align 2, 0
_080300B4: .4byte 0xffffff00
_080300B8: .4byte 0xffff00ff
_080300BC: .4byte gAvailablePokemonNames
_080300C0: .4byte gMakuhitaDialogue
_080300C4:
ldr r3, [r5]
movs r0, 0xD
str r0, [r3, 0xC]
ldr r2, _080300D8
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x18
b _0803015A
.align 2, 0
_080300D8: .4byte gMakuhitaDialogue
_080300DC:
ldr r3, [r5]
movs r0, 0xD
str r0, [r3, 0xC]
ldr r2, _080300F0
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x14
b _0803015A
.align 2, 0
_080300F0: .4byte gMakuhitaDialogue
_080300F4:
ldr r3, [r5]
movs r0, 0x9
str r0, [r3, 0xC]
ldr r2, _08030108
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x1C
b _0803015A
.align 2, 0
_08030108: .4byte gMakuhitaDialogue
_0803010C:
ldr r4, _08030138
bl sub_808D33C
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x6
bl sub_808D9AC
ldr r0, _0803013C
ldr r1, [r0]
movs r0, 0xB
str r0, [r1, 0xC]
movs r0, 0xCB
bl PlaySound
ldr r0, _08030140
ldr r3, _08030144
movs r1, 0
movs r2, 0
bl sub_80141B4
b _080301A0
.align 2, 0
_08030138: .4byte gPlayerName
_0803013C: .4byte gUnknown_203B318
_08030140: .4byte gUnknown_80E0778
_08030144: .4byte 0x00000101
_08030148:
ldr r3, [r5]
movs r0, 0xD
str r0, [r3, 0xC]
ldr r2, _0803016C
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x20
_0803015A:
adds r0, r2
ldr r0, [r0]
ldr r2, [r3, 0x68]
ldr r3, _08030170
movs r1, 0
bl sub_80141B4
b _080301A0
.align 2, 0
_0803016C: .4byte gMakuhitaDialogue
_08030170: .4byte 0x0000010d
_08030174:
movs r0, 0x1
movs r1, 0x49
movs r2, 0x1
bl sub_801B60C
b _080301A0
_08030180:
ldr r3, [r5]
movs r0, 0x1
str r0, [r3, 0xC]
ldr r2, _080301A8
ldr r1, [r3, 0x4]
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r2, 0x24
adds r0, r2
ldr r0, [r0]
ldr r2, [r3, 0x68]
ldr r3, _080301AC
movs r1, 0
bl sub_80141B4
_080301A0:
add sp, 0x18
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080301A8: .4byte gMakuhitaDialogue
_080301AC: .4byte 0x0000010d
thumb_func_end UpdateMakuhitaDialogue
thumb_func_start sub_80301B0
sub_80301B0:
push {r4,lr}
ldr r4, _080301F8
ldr r1, [r4]
movs r2, 0x2
str r2, [r1, 0x14]
ldr r0, _080301FC
str r0, [r1, 0x18]
str r2, [r1, 0x1C]
bl sub_80306A4
lsls r0, 24
cmp r0, 0
beq _080301D6
ldr r0, [r4]
movs r1, 0x1
negs r1, r1
str r1, [r0, 0x1C]
movs r1, 0x1
str r1, [r0, 0x14]
_080301D6:
ldr r1, [r4]
movs r2, 0x1
ldr r0, _08030200
ldr r0, [r0]
str r0, [r1, 0x20]
movs r0, 0x3
str r0, [r1, 0x24]
ldr r0, _08030204
ldr r0, [r0]
str r0, [r1, 0x28]
str r2, [r1, 0x2C]
movs r0, 0
str r0, [r1, 0x30]
str r2, [r1, 0x34]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080301F8: .4byte gUnknown_203B318
_080301FC: .4byte gUnknown_80E07D8
_08030200: .4byte gUnknown_80D4970
_08030204: .4byte gUnknown_80D4934
thumb_func_end sub_80301B0
thumb_func_start sub_8030208
sub_8030208:
push {lr}
sub sp, 0x4
mov r0, sp
bl sub_80144A4
cmp r0, 0
bne _08030250
ldr r0, _08030230
ldr r1, [r0]
ldr r0, [sp]
str r0, [r1, 0x14]
ldr r0, [sp]
cmp r0, 0x2
beq _0803023A
cmp r0, 0x2
bgt _08030234
cmp r0, 0x1
beq _0803024A
b _08030250
.align 2, 0
_08030230: .4byte gUnknown_203B318
_08030234:
cmp r0, 0x3
beq _08030242
b _08030250
_0803023A:
movs r0, 0x3
bl sub_802FF04
b _08030250
_08030242:
movs r0, 0xC
bl sub_802FF04
b _08030250
_0803024A:
movs r0, 0x2
bl sub_802FF04
_08030250:
add sp, 0x4
pop {r0}
bx r0
thumb_func_end sub_8030208
thumb_func_start sub_8030258
sub_8030258:
push {lr}
movs r0, 0x1
bl sub_80303AC
cmp r0, 0x2
beq _08030288
cmp r0, 0x2
bcc _0803029A
cmp r0, 0x3
bne _0803029A
bl sub_8030418
ldr r1, _08030284
ldr r1, [r1]
strh r0, [r1, 0x10]
bl sub_8030480
movs r0, 0x5
bl sub_802FF04
b _0803029A
.align 2, 0
_08030284: .4byte gUnknown_203B318
_08030288:
bl sub_8030480
ldr r0, _080302A0
ldr r1, [r0]
ldr r0, _080302A4
strh r0, [r1, 0x10]
movs r0, 0x1
bl sub_802FF04
_0803029A:
pop {r0}
bx r0
.align 2, 0
_080302A0: .4byte gUnknown_203B318
_080302A4: .4byte 0x0000ffff
thumb_func_end sub_8030258
thumb_func_start sub_80302A8
sub_80302A8:
push {lr}
bl sub_801B6AC
cmp r0, 0x1
bls _080302C0
cmp r0, 0x3
bhi _080302C0
bl sub_801B72C
movs r0, 0xA
bl sub_802FF04
_080302C0:
pop {r0}
bx r0
thumb_func_end sub_80302A8
thumb_func_start sub_80302C4
sub_80302C4:
push {lr}
sub sp, 0x4
mov r0, sp
bl sub_80144A4
cmp r0, 0
bne _080302DC
ldr r0, _080302E4
ldr r0, [r0]
ldr r0, [r0, 0xC]
bl sub_802FF04
_080302DC:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_080302E4: .4byte gUnknown_203B318
thumb_func_end sub_80302C4
thumb_func_start sub_80302E8
sub_80302E8:
push {r4-r7,lr}
mov r7, r8
push {r7}
adds r5, r0, 0
adds r6, r1, 0
mov r8, r2
bl sub_80306A4
lsls r0, 24
cmp r0, 0
beq _08030302
movs r0, 0
b _0803039A
_08030302:
ldr r4, _080303A4
ldr r0, [r4]
cmp r0, 0
bne _08030314
movs r0, 0xD0
movs r1, 0x8
bl MemoryAlloc
str r0, [r4]
_08030314:
ldr r0, [r4]
str r5, [r0, 0x64]
lsls r1, r5, 1
adds r1, r5
lsls r1, 3
adds r1, 0x6C
adds r1, r0, r1
str r1, [r0, 0x68]
adds r0, 0x6C
bl sub_8006518
ldr r1, [r4]
ldr r2, [r1, 0x64]
lsls r0, r2, 1
adds r0, r2
lsls r0, 3
adds r1, r0
adds r1, 0x6C
ldr r0, _080303A8
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldr r2, [r4]
ldr r1, [r2, 0x68]
adds r0, r2, 0
adds r0, 0xCC
str r0, [r1, 0x14]
cmp r6, 0
beq _08030362
ldr r1, [r2, 0x64]
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
adds r1, r2, 0
adds r1, 0x74
adds r1, r0
ldr r0, [r6]
str r0, [r1]
_08030362:
ldr r0, [r4]
ldr r0, [r0, 0x68]
mov r1, r8
bl sub_8012D08
bl ResetUnusedInputStruct
ldr r0, [r4]
adds r0, 0x6C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
ldr r4, [r4]
adds r4, 0x30
bl sub_8030668
adds r1, r0, 0
adds r0, r4, 0
mov r2, r8
adds r3, r5, 0
bl sub_8013818
bl sub_80304C8
bl sub_803053C
movs r0, 0x1
_0803039A:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_080303A4: .4byte gUnknown_203B31C
_080303A8: .4byte gUnknown_80E0804
thumb_func_end sub_80302E8
thumb_func_start sub_80303AC
sub_80303AC:
push {r4,lr}
lsls r0, 24
cmp r0, 0
bne _080303C8
ldr r0, _080303C4
ldr r0, [r0]
adds r0, 0x30
bl sub_8013660
movs r0, 0
b _08030410
.align 2, 0
_080303C4: .4byte gUnknown_203B31C
_080303C8:
ldr r4, _080303E4
ldr r0, [r4]
adds r0, 0x30
bl GetKeyPress
cmp r0, 0x1
beq _080303E8
cmp r0, 0x2
bne _080303F2
movs r0, 0x1
bl PlayMenuSoundEffect
movs r0, 0x2
b _08030410
.align 2, 0
_080303E4: .4byte gUnknown_203B31C
_080303E8:
movs r0, 0
bl PlayMenuSoundEffect
movs r0, 0x3
b _08030410
_080303F2:
ldr r0, [r4]
adds r0, 0x30
movs r1, 0x1
bl sub_80138B8
lsls r0, 24
cmp r0, 0
bne _08030406
movs r0, 0
b _08030410
_08030406:
bl sub_80304C8
bl sub_803053C
movs r0, 0x1
_08030410:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80303AC
thumb_func_start sub_8030418
sub_8030418:
ldr r0, _08030440
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x4E
movs r3, 0
ldrsh r1, [r0, r3]
subs r0, 0x2
movs r3, 0
ldrsh r0, [r0, r3]
muls r0, r1
adds r1, r2, 0
adds r1, 0x48
movs r3, 0
ldrsh r1, [r1, r3]
adds r0, r1
lsls r0, 1
adds r0, r2, r0
movs r1, 0
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_08030440: .4byte gUnknown_203B31C
thumb_func_end sub_8030418
thumb_func_start sub_8030444
sub_8030444:
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl sub_8030668
adds r1, r0, 0
ldr r5, _0803047C
ldr r0, [r5]
adds r2, r0, 0
adds r2, 0x52
strh r1, [r2]
adds r0, 0x30
bl sub_8013984
bl sub_80304C8
bl sub_803053C
cmp r4, 0
beq _08030476
ldr r0, [r5]
adds r0, 0x30
bl AddMenuCursorSprite
_08030476:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0803047C: .4byte gUnknown_203B31C
thumb_func_end sub_8030444
thumb_func_start sub_8030480
sub_8030480:
push {r4,r5,lr}
ldr r4, _080304C0
ldr r2, [r4]
cmp r2, 0
beq _080304BA
ldr r0, [r2, 0x64]
lsls r1, r0, 1
adds r1, r0
lsls r1, 3
adds r1, r2, r1
adds r1, 0x6C
ldr r0, _080304C4
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
bl ResetUnusedInputStruct
ldr r0, [r4]
adds r0, 0x6C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
ldr r0, [r4]
bl MemoryFree
movs r0, 0
str r0, [r4]
_080304BA:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080304C0: .4byte gUnknown_203B31C
_080304C4: .4byte gUnknown_80E07EC
thumb_func_end sub_8030480
thumb_func_start sub_80304C8
sub_80304C8:
push {r4,lr}
ldr r4, _08030538
ldr r0, [r4]
adds r0, 0xCC
movs r2, 0
movs r1, 0x1
strb r1, [r0]
ldr r0, [r4]
adds r0, 0xCD
strb r2, [r0]
ldr r0, [r4]
adds r0, 0xCE
movs r1, 0x8
strb r1, [r0]
ldr r0, [r4]
adds r0, 0xCF
strb r2, [r0]
ldr r0, [r4]
adds r0, 0x4A
movs r1, 0
ldrsh r0, [r0, r1]
movs r1, 0xC
bl sub_80095E4
adds r0, 0x2
lsls r0, 16
ldr r2, [r4]
ldr r3, [r2, 0x64]
lsls r1, r3, 1
adds r1, r3
lsls r1, 3
adds r1, r2, r1
adds r1, 0x7A
asrs r3, r0, 16
lsrs r0, 16
strh r0, [r1]
ldr r1, [r2, 0x64]
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
adds r2, r0
adds r3, 0x2
adds r2, 0x7C
strh r3, [r2]
bl ResetUnusedInputStruct
ldr r0, [r4]
adds r0, 0x6C
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08030538: .4byte gUnknown_203B31C
thumb_func_end sub_80304C8
thumb_func_start sub_803053C
sub_803053C:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x108
ldr r4, _08030658
ldr r0, [r4]
ldr r0, [r0, 0x64]
bl sub_8008C54
ldr r0, [r4]
ldr r0, [r0, 0x64]
bl sub_80073B8
ldr r2, _0803065C
ldr r0, [r4]
ldr r3, [r0, 0x64]
movs r0, 0
str r0, [sp]
movs r0, 0xA
movs r1, 0
bl xxx_call_draw_string
ldr r3, [r4]
adds r0, r3, 0
adds r0, 0xCE
ldrb r0, [r0]
lsls r0, 3
adds r0, 0x4
adds r1, r3, 0
adds r1, 0x4E
movs r5, 0
ldrsh r2, [r1, r5]
adds r2, 0x1
movs r1, 0x7
str r1, [sp]
ldr r1, [r3, 0x64]
str r1, [sp, 0x4]
movs r1, 0
movs r3, 0x2
bl sub_8012BC4
movs r0, 0
mov r9, r0
ldr r0, [r4]
adds r0, 0x4A
movs r1, 0
ldrsh r0, [r0, r1]
cmp r9, r0
bge _0803063E
mov r8, r4
_080305A2:
mov r3, r8
ldr r1, [r3]
adds r0, r1, 0
adds r0, 0x4E
movs r5, 0
ldrsh r2, [r0, r5]
subs r0, 0x2
movs r3, 0
ldrsh r0, [r0, r3]
muls r0, r2
add r0, r9
lsls r0, 1
adds r1, r0
movs r5, 0
ldrsh r4, [r1, r5]
adds r0, r4, 0
bl sub_80A2740
lsls r0, 24
lsrs r7, r0, 24
adds r0, r4, 0
bl sub_80A2668
adds r4, r0, 0
lsls r4, 16
asrs r4, 16
mov r1, r8
ldr r0, [r1]
adds r0, 0x30
mov r1, r9
bl sub_8013800
adds r6, r0, 0
movs r5, 0x7
adds r0, r4, 0
bl sub_809758C
lsls r0, 24
cmp r0, 0
beq _08030608
mov r3, r8
ldr r0, [r3]
ldr r3, [r0, 0x64]
movs r0, 0
str r0, [sp]
movs r0, 0x8
adds r1, r6, 0
ldr r2, _08030660
bl xxx_call_draw_string
movs r5, 0x4
_08030608:
adds r0, r7, 0
bl GetDungeonName1
adds r3, r0, 0
add r0, sp, 0x8
ldr r1, _08030664
adds r2, r5, 0
bl sub_800D158
mov r5, r8
ldr r0, [r5]
ldr r3, [r0, 0x64]
movs r0, 0
str r0, [sp]
movs r0, 0x10
adds r1, r6, 0
add r2, sp, 0x8
bl xxx_call_draw_string
movs r0, 0x1
add r9, r0
ldr r0, [r5]
adds r0, 0x4A
movs r1, 0
ldrsh r0, [r0, r1]
cmp r9, r0
blt _080305A2
_0803063E:
ldr r0, _08030658
ldr r0, [r0]
ldr r0, [r0, 0x64]
bl sub_80073E0
add sp, 0x108
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08030658: .4byte gUnknown_203B31C
_0803065C: .4byte gUnknown_80E081C
_08030660: .4byte gUnknown_80E0824
_08030664: .4byte gUnknown_80E0828
thumb_func_end sub_803053C
thumb_func_start sub_8030668
sub_8030668:
push {r4-r6,lr}
movs r6, 0
movs r5, 0
_0803066E:
lsls r0, r5, 16
asrs r4, r0, 16
adds r0, r4, 0
bl sub_8097504
lsls r0, 24
cmp r0, 0
beq _08030690
adds r0, r4, 0
bl sub_80A26CC
ldr r1, _080306A0
ldr r1, [r1]
lsls r2, r6, 1
adds r1, r2
strh r0, [r1]
adds r6, 0x1
_08030690:
adds r5, 0x1
cmp r5, 0x16
ble _0803066E
adds r0, r6, 0
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_080306A0: .4byte gUnknown_203B31C
thumb_func_end sub_8030668
thumb_func_start sub_80306A4
sub_80306A4:
movs r0, 0
bx lr
thumb_func_end sub_80306A4
.align 2,0
asm/other_menus.s
+1 -1
View File
@@ -223,7 +223,7 @@ _080375BE:
.align 2, 0
_080375CC: .4byte gUnknown_203B35C
_080375D0: .4byte 0xffff0000
_080375D4: .4byte gUnknown_203B45C
_080375D4: .4byte gRecruitedPokemonRef
_080375D8:
ldr r0, _08037610
ldr r0, [r0]
asm/pokemon.s
+21 -298
View File
@@ -55,7 +55,7 @@ _0808CE46:
pop {r0}
bx r0
.align 2, 0
_0808CE60: .4byte gUnknown_203B45C
_0808CE60: .4byte gRecruitedPokemonRef
_0808CE64: .4byte 0x0000019d
_0808CE68: .4byte 0x00008df8
_0808CE6C: .4byte 0x00008f90
@@ -232,7 +232,7 @@ _0808CFB8:
bx r0
.align 2, 0
_0808CFC8: .4byte gMonsterParameters
_0808CFCC: .4byte gUnknown_203B45C
_0808CFCC: .4byte gRecruitedPokemonRef
thumb_func_end sub_808CE74
thumb_func_start sub_808CFD0
@@ -579,7 +579,7 @@ _0808D26A:
pop {r1}
bx r1
.align 2, 0
_0808D274: .4byte gUnknown_203B45C
_0808D274: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D1DC
thumb_func_start sub_808D278
@@ -641,7 +641,7 @@ _0808D2DC:
pop {r1}
bx r1
.align 2, 0
_0808D2E4: .4byte gUnknown_203B45C
_0808D2E4: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D278
thumb_func_start sub_808D2E8
@@ -714,7 +714,7 @@ _0808D344:
adds r0, r2, 0
b _0808D370
.align 2, 0
_0808D360: .4byte gUnknown_203B45C
_0808D360: .4byte gRecruitedPokemonRef
_0808D364:
adds r3, 0x1
movs r0, 0xCE
@@ -754,7 +754,7 @@ _0808D39A:
adds r0, r2, 0
b _0808D3B4
.align 2, 0
_0808D3A4: .4byte gUnknown_203B45C
_0808D3A4: .4byte gRecruitedPokemonRef
_0808D3A8:
adds r3, 0x1
movs r0, 0xCE
@@ -790,7 +790,7 @@ _0808D3CC:
adds r0, r3, 0
b _0808D3F0
.align 2, 0
_0808D3E0: .4byte gUnknown_203B45C
_0808D3E0: .4byte gRecruitedPokemonRef
_0808D3E4:
adds r2, 0x58
adds r3, 0x58
@@ -826,7 +826,7 @@ _0808D408:
adds r0, r3, 0
b _0808D42C
.align 2, 0
_0808D41C: .4byte gUnknown_203B45C
_0808D41C: .4byte gRecruitedPokemonRef
_0808D420:
adds r2, 0x58
adds r3, 0x58
@@ -869,7 +869,7 @@ _0808D44C:
adds r0, r2, 0
b _0808D478
.align 2, 0
_0808D468: .4byte gUnknown_203B45C
_0808D468: .4byte gRecruitedPokemonRef
_0808D46C:
adds r4, 0x1
_0808D46E:
@@ -909,7 +909,7 @@ _0808D498:
pop {r1}
bx r1
.align 2, 0
_0808D4A8: .4byte gUnknown_203B45C
_0808D4A8: .4byte gRecruitedPokemonRef
_0808D4AC: .4byte 0x0000019d
thumb_func_end sub_808D480
@@ -955,7 +955,7 @@ _0808D4E4:
pop {r1}
bx r1
.align 2, 0
_0808D4F8: .4byte gUnknown_203B45C
_0808D4F8: .4byte gRecruitedPokemonRef
_0808D4FC: .4byte 0x0000fffd
thumb_func_end sub_808D4B0
@@ -993,7 +993,7 @@ _0808D526:
pop {r1}
bx r1
.align 2, 0
_0808D53C: .4byte gUnknown_203B45C
_0808D53C: .4byte gRecruitedPokemonRef
_0808D540: .4byte 0x0000fffd
thumb_func_end sub_808D500
@@ -1031,7 +1031,7 @@ _0808D56C:
pop {r1}
bx r1
.align 2, 0
_0808D57C: .4byte gUnknown_203B45C
_0808D57C: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D544
thumb_func_start sub_808D580
@@ -1059,7 +1059,7 @@ _0808D590:
adds r5, 0x1
b _0808D5BC
.align 2, 0
_0808D5AC: .4byte gUnknown_203B45C
_0808D5AC: .4byte gRecruitedPokemonRef
_0808D5B0:
adds r4, 0x1
adds r2, 0x58
@@ -1197,7 +1197,7 @@ _0808D68C:
pop {r1}
bx r1
.align 2, 0
_0808D6A0: .4byte gUnknown_203B45C
_0808D6A0: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D654
thumb_func_start sub_808D6A4
@@ -1237,7 +1237,7 @@ _0808D6CE:
pop {r1}
bx r1
.align 2, 0
_0808D6E4: .4byte gUnknown_203B45C
_0808D6E4: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D6A4
thumb_func_start sub_808D6E8
@@ -1287,7 +1287,7 @@ _0808D728:
movs r0, 0x1
b _0808D746
.align 2, 0
_0808D740: .4byte gUnknown_203B45C
_0808D740: .4byte gRecruitedPokemonRef
_0808D744:
movs r0, 0
_0808D746:
@@ -1361,7 +1361,7 @@ _0808D798:
movs r0, 0x1
b _0808D7CE
.align 2, 0
_0808D7C8: .4byte gUnknown_203B45C
_0808D7C8: .4byte gRecruitedPokemonRef
_0808D7CC:
movs r0, 0
_0808D7CE:
@@ -1391,7 +1391,7 @@ sub_808D7DC:
strb r0, [r1, 0x1]
bx lr
.align 2, 0
_0808D7FC: .4byte gUnknown_203B45C
_0808D7FC: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D7DC
thumb_func_start sub_808D800
@@ -1412,7 +1412,7 @@ sub_808D800:
strb r1, [r0]
bx lr
.align 2, 0
_0808D820: .4byte gUnknown_203B45C
_0808D820: .4byte gRecruitedPokemonRef
thumb_func_end sub_808D800
thumb_func_start sub_808D824
@@ -1484,7 +1484,7 @@ _0808D888:
movs r0, 0x1
b _0808D8B4
.align 2, 0
_0808D8A0: .4byte gUnknown_203B45C
_0808D8A0: .4byte gRecruitedPokemonRef
_0808D8A4:
cmp r4, r0
blt _0808D8B2
@@ -1501,282 +1501,5 @@ _0808D8B4:
bx r1
thumb_func_end sub_808D864
thumb_func_start CopySpeciesNametoBuffer
CopySpeciesNametoBuffer:
push {lr}
lsls r1, 16
asrs r1, 16
ldr r2, _0808D8DC
ldr r3, [r2]
lsls r2, r1, 3
adds r2, r1
lsls r2, 3
adds r2, r3
ldr r1, [r2]
movs r2, 0x14
bl strncpy
pop {r0}
bx r0
.align 2, 0
_0808D8DC: .4byte gMonsterParameters
thumb_func_end CopySpeciesNametoBuffer
thumb_func_start sub_808D8E0
sub_808D8E0:
push {r4,lr}
lsls r3, r1, 16
asrs r3, 16
ldr r1, _0808D900
ldr r2, _0808D904
ldr r4, [r2]
lsls r2, r3, 3
adds r2, r3
lsls r2, 3
adds r2, r4
ldr r2, [r2]
bl sub_800D158
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0808D900: .4byte gUnknown_8107600
_0808D904: .4byte gMonsterParameters
thumb_func_end sub_808D8E0
thumb_func_start sub_808D908
sub_808D908:
push {r4,lr}
lsls r3, r1, 16
asrs r3, 16
ldr r1, _0808D928
ldr r2, _0808D92C
ldr r4, [r2]
lsls r2, r3, 3
adds r2, r3
lsls r2, 3
adds r2, r4
ldr r2, [r2]
bl sub_800D158
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0808D928: .4byte gUnknown_8107608
_0808D92C: .4byte gMonsterParameters
thumb_func_end sub_808D908
thumb_func_start sub_808D930
sub_808D930:
push {r4-r7,lr}
adds r7, r0, 0
lsls r1, 16
asrs r6, r1, 16
adds r0, r6, 0
bl sub_808E770
lsls r0, 16
asrs r0, 16
cmp r0, 0xC9
bne _0808D970
ldr r5, _0808D968
movs r0, 0xC9
bl GetMonSpecies
adds r4, r0, 0
adds r0, r6, 0
bl sub_808E8C8
ldr r1, _0808D96C
adds r0, r1
ldrb r3, [r0]
adds r0, r7, 0
adds r1, r5, 0
adds r2, r4, 0
bl sub_800D158
b _0808D986
.align 2, 0
_0808D968: .4byte gUnknown_8107630
_0808D96C: .4byte gUnknown_8107610
_0808D970:
ldr r1, _0808D98C
ldr r0, _0808D990
ldr r2, [r0]
lsls r0, r6, 3
adds r0, r6
lsls r0, 3
adds r0, r2
ldr r2, [r0]
adds r0, r7, 0
bl sub_800D158
_0808D986:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0808D98C: .4byte gUnknown_8107638
_0808D990: .4byte gMonsterParameters
thumb_func_end sub_808D930
thumb_func_start GetMonSpecies
GetMonSpecies:
lsls r0, 16
asrs r0, 16
ldr r1, _0808D9A8
ldr r2, [r1]
lsls r1, r0, 3
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, [r1]
bx lr
.align 2, 0
_0808D9A8: .4byte gMonsterParameters
thumb_func_end GetMonSpecies
thumb_func_start sub_808D9AC
sub_808D9AC:
push {r4,r5,lr}
sub sp, 0x14
adds r5, r0, 0
adds r4, r2, 0
adds r1, 0x4C
mov r0, sp
movs r2, 0xA
bl sub_80922B4
cmp r4, 0
bne _0808D9C4
movs r4, 0x5
_0808D9C4:
ldr r1, _0808D9D8
adds r0, r5, 0
adds r2, r4, 0
mov r3, sp
bl sub_800D158
add sp, 0x14
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808D9D8: .4byte gUnknown_810763C
thumb_func_end sub_808D9AC
thumb_func_start sub_808D9DC
sub_808D9DC:
push {r4,r5,lr}
sub sp, 0x14
adds r5, r0, 0
adds r4, r2, 0
adds r1, 0x58
mov r0, sp
movs r2, 0xA
bl sub_80922B4
cmp r4, 0
bne _0808D9F4
movs r4, 0x6
_0808D9F4:
ldr r1, _0808DA08
adds r0, r5, 0
adds r2, r4, 0
mov r3, sp
bl sub_800D158
add sp, 0x14
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808DA08: .4byte gUnknown_810763C
thumb_func_end sub_808D9DC
thumb_func_start sub_808DA0C
sub_808DA0C:
push {r4,lr}
sub sp, 0x14
adds r4, r0, 0
adds r1, 0x58
mov r0, sp
movs r2, 0xA
bl sub_80922B4
ldr r1, _0808DA30
adds r0, r4, 0
mov r2, sp
bl sub_800D158
add sp, 0x14
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0808DA30: .4byte gUnknown_8107638
thumb_func_end sub_808DA0C
thumb_func_start sub_808DA34
sub_808DA34:
push {lr}
adds r1, 0x4C
movs r2, 0xA
bl sub_80922B4
pop {r0}
bx r0
thumb_func_end sub_808DA34
thumb_func_start sub_808DA44
sub_808DA44:
push {r4-r6,lr}
sub sp, 0x30
lsls r0, 16
asrs r4, r0, 16
lsls r1, 24
lsrs r2, r1, 24
cmp r2, 0xC
bls _0808DAA0
mov r1, sp
ldr r0, _0808DA98
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
beq _0808DA92
mov r1, sp
add r3, sp, 0x48
_0808DA76:
movs r5, 0
ldrsh r0, [r1, r5]
cmp r0, r4
bne _0808DA84
ldr r0, [r1, 0x4]
cmp r0, r2
beq _0808DA9C
_0808DA84:
adds r1, 0x8
cmp r1, r3
bgt _0808DA92
movs r6, 0
ldrsh r0, [r1, r6]
cmp r0, 0
bne _0808DA76
_0808DA92:
movs r0, 0
b _0808DAA6
.align 2, 0
_0808DA98: .4byte gUnknown_8107654
_0808DA9C:
movs r0, 0x1
b _0808DAA6
_0808DAA0:
ldr r0, _0808DAB0
adds r0, r2, r0
ldrb r0, [r0]
_0808DAA6:
add sp, 0x30
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0808DAB0: .4byte gUnknown_8107645
thumb_func_end sub_808DA44
.align 2,0
asm/pokemon_1.s
+72
View File
@@ -0,0 +1,72 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_808DA44
sub_808DA44:
push {r4-r6,lr}
sub sp, 0x30
lsls r0, 16
asrs r4, r0, 16
lsls r1, 24
lsrs r2, r1, 24
cmp r2, 0xC
bls _0808DAA0
mov r1, sp
ldr r0, _0808DA98
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
ldm r0!, {r3,r5,r6}
stm r1!, {r3,r5,r6}
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
beq _0808DA92
mov r1, sp
add r3, sp, 0x48
_0808DA76:
movs r5, 0
ldrsh r0, [r1, r5]
cmp r0, r4
bne _0808DA84
ldr r0, [r1, 0x4]
cmp r0, r2
beq _0808DA9C
_0808DA84:
adds r1, 0x8
cmp r1, r3
bgt _0808DA92
movs r6, 0
ldrsh r0, [r1, r6]
cmp r0, 0
bne _0808DA76
_0808DA92:
movs r0, 0
b _0808DAA6
.align 2, 0
_0808DA98: .4byte gUnknown_8107654
_0808DA9C:
movs r0, 0x1
b _0808DAA6
_0808DAA0:
ldr r0, _0808DAB0
adds r0, r2, r0
ldrb r0, [r0]
_0808DAA6:
add sp, 0x30
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_0808DAB0: .4byte gUnknown_8107645
thumb_func_end sub_808DA44
.align 2,0
asm/pokemon_square.s
+7112
View File
File diff suppressed because it is too large Load Diff
asm/unk_menu_203B364.s
+4 -4
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_8038630
sub_8038630:
thumb_func_start UpdateSaveMenu
UpdateSaveMenu:
push {r4-r6,lr}
sub sp, 0x18
ldr r5, _080386A8
@@ -31,7 +31,7 @@ _0803864C:
bl sub_8011C1C
adds r1, r0, 0
add r0, sp, 0x10
bl sub_801203C
bl WriteSavetoPak
adds r4, r0, 0
bl sub_8014114
cmp r4, 0
@@ -256,7 +256,7 @@ _08038826:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8038630
thumb_func_end UpdateSaveMenu
thumb_func_start sub_8038830
sub_8038830:
asm/wonder_mail.s
+1 -1
View File
@@ -768,7 +768,7 @@ _08028748:
b _0802878A
.align 2, 0
_08028760: .4byte 0x00000544
_08028764: .4byte gUnknown_203B45C
_08028764: .4byte gRecruitedPokemonRef
_08028768: .4byte gUnknown_203B2C0
_0802876C:
adds r1, r2, 0
asm/wonder_mail_1.s
+1 -1
View File
@@ -591,7 +591,7 @@ sub_802AB98:
movs r4, 0x98
lsls r4, 1
adds r1, r4, 0
bl sub_808D8E0
bl CopyYellowSpeciesNametoBuffer
adds r0, r4, 0
bl GetMonSpecies
adds r1, r0, 0
asm/wonder_mail_3.s
+10 -4411
View File
File diff suppressed because it is too large Load Diff
asm/wonder_mail_4.s
+1821
View File
File diff suppressed because it is too large Load Diff
asm/wonder_mail_5.s
+571
View File
@@ -0,0 +1,571 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_8031AE8
sub_8031AE8:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xDC
ldr r7, _08031B24
ldr r0, [r7]
ldr r0, [r0, 0x10]
bl sub_80073B8
ldr r2, _08031B28
ldr r0, [r7]
ldr r3, [r0, 0x10]
movs r6, 0
str r6, [sp]
movs r0, 0xA
movs r1, 0
bl xxx_call_draw_string
ldr r1, [r7]
ldrb r0, [r1, 0xC]
cmp r0, 0x1
beq _08031B2C
cmp r0, 0x1
bgt _08031B1E
b _08031CD4
_08031B1E:
cmp r0, 0x2
beq _08031B94
b _08031CD4
.align 2, 0
_08031B24: .4byte gUnknown_203B330
_08031B28: .4byte gUnknown_80E1F30
_08031B2C:
add r4, sp, 0x68
adds r0, r4, 0
bl sub_8099394
ldrb r0, [r4]
bl sub_8095228
adds r5, r0, 0
ldr r0, [r7]
ldr r3, [r0, 0x10]
movs r0, 0xA
movs r1, 0x10
movs r2, 0x3
bl sub_803B6B0
ldr r1, _08031B8C
ldrb r2, [r5, 0x5]
add r0, sp, 0x4
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
movs r0, 0x15
movs r1, 0x10
add r2, sp, 0x4
bl xxx_call_draw_string
ldr r4, _08031B90
movs r1, 0xC
ldrsh r0, [r5, r1]
bl GetMonSpecies
adds r2, r0, 0
add r0, sp, 0x4
adds r1, r4, 0
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
movs r0, 0x28
movs r1, 0x10
add r2, sp, 0x4
bl xxx_call_draw_string
b _08031D4E
.align 2, 0
_08031B8C: .4byte gUnknown_80E1F3C
_08031B90: .4byte gUnknown_80E1F40
_08031B94:
ldrb r0, [r1, 0xD]
bl sub_80969D0
adds r1, r0, 0
cmp r1, 0
bne _08031BB0
ldr r2, _08031BAC
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r1, [sp]
b _08031D2C
.align 2, 0
_08031BAC: .4byte gUnknown_80E1F54
_08031BB0:
movs r6, 0x10
movs r2, 0
mov r10, r2
mov r8, r2
ldr r0, _08031C28
mov r9, r0
mov r1, sp
adds r1, 0x6C
str r1, [sp, 0xD8]
_08031BC2:
mov r2, r10
lsls r0, r2, 24
lsrs r0, 24
bl sub_8096AB4
adds r4, r0, 0
ldr r1, [r7]
ldrb r0, [r4, 0x4]
ldrb r2, [r1, 0xD]
cmp r0, r2
bne _08031CC2
ldrb r0, [r4]
cmp r0, 0
beq _08031CC2
cmp r0, 0x5
beq _08031CC2
cmp r0, 0x7
beq _08031CC2
ldr r3, [r1, 0x10]
movs r0, 0xA
adds r1, r6, 0
movs r2, 0x3
bl sub_803B6B0
ldrb r0, [r4, 0x1]
add r5, sp, 0x6C
cmp r0, 0x3
beq _08031C16
ldrb r2, [r4, 0x5]
ldr r0, [sp, 0xD8]
ldr r1, _08031C2C
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r0, r8
str r0, [sp]
movs r0, 0x15
adds r1, r6, 0
ldr r2, [sp, 0xD8]
bl xxx_call_draw_string
_08031C16:
ldrb r0, [r4, 0x1]
cmp r0, 0x3
beq _08031C58
cmp r0, 0x3
bgt _08031C30
cmp r0, 0x2
beq _08031C70
b _08031C9C
.align 2, 0
_08031C28: .4byte gUnknown_202DE58
_08031C2C: .4byte gUnknown_80E1F3C
_08031C30:
cmp r0, 0x4
bne _08031C9C
ldrb r1, [r4, 0x10]
mov r0, r9
movs r2, 0
bl sub_8090DC4
adds r0, r5, 0
ldr r1, _08031C54
mov r2, r9
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r1, r8
str r1, [sp]
b _08031C8A
.align 2, 0
_08031C54: .4byte gUnknown_80E1F60
_08031C58:
ldrb r1, [r4, 0x10]
mov r0, r9
movs r2, 0
bl sub_8090DC4
adds r0, r5, 0
ldr r1, _08031C6C
mov r2, r9
b _08031C7E
.align 2, 0
_08031C6C: .4byte gUnknown_80E1F70
_08031C70:
movs r1, 0xE
ldrsh r0, [r4, r1]
bl GetMonSpecies
adds r2, r0, 0
adds r0, r5, 0
ldr r1, _08031C98
_08031C7E:
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
str r2, [sp]
_08031C8A:
movs r0, 0x28
adds r1, r6, 0
adds r2, r5, 0
bl xxx_call_draw_string
b _08031CC0
.align 2, 0
_08031C98: .4byte gUnknown_80E1F80
_08031C9C:
movs r1, 0xE
ldrsh r0, [r4, r1]
bl GetMonSpecies
adds r2, r0, 0
adds r0, r5, 0
ldr r1, _08031CD0
bl sub_800D158
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
str r2, [sp]
movs r0, 0x28
adds r1, r6, 0
adds r2, r5, 0
bl xxx_call_draw_string
_08031CC0:
adds r6, 0xC
_08031CC2:
movs r0, 0x1
add r10, r0
mov r1, r10
cmp r1, 0x7
bgt _08031CCE
b _08031BC2
_08031CCE:
b _08031D4E
.align 2, 0
_08031CD0: .4byte gUnknown_80E1F40
_08031CD4:
add r0, sp, 0xD0
mov r4, sp
adds r4, 0xD2
adds r1, r4, 0
bl sub_80992E0
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
beq _08031D04
movs r2, 0
ldrsh r0, [r4, r2]
bl GetCurrentMissionText
adds r2, r0, 0
ldr r0, _08031D00
ldr r0, [r0]
ldr r3, [r0, 0x10]
movs r0, 0
str r0, [sp]
b _08031D2C
.align 2, 0
_08031D00: .4byte gUnknown_203B330
_08031D04:
add r4, sp, 0xD4
adds r0, r4, 0
bl sub_8099360
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
beq _08031D3C
ldrb r0, [r4]
bl sub_80A2688
lsls r0, 16
asrs r0, 16
bl sub_80975DC
adds r2, r0, 0
ldr r0, _08031D38
ldr r0, [r0]
ldr r3, [r0, 0x10]
str r5, [sp]
_08031D2C:
movs r0, 0xA
movs r1, 0x10
bl xxx_call_draw_string
b _08031D4E
.align 2, 0
_08031D38: .4byte gUnknown_203B330
_08031D3C:
ldr r2, _08031D68
ldr r0, _08031D6C
ldr r0, [r0]
ldr r3, [r0, 0x10]
str r1, [sp]
movs r0, 0xA
movs r1, 0x10
bl xxx_call_draw_string
_08031D4E:
ldr r0, _08031D6C
ldr r0, [r0]
ldr r0, [r0, 0x10]
bl sub_80073E0
add sp, 0xDC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08031D68: .4byte gUnknown_80E1F94
_08031D6C: .4byte gUnknown_203B330
thumb_func_end sub_8031AE8
thumb_func_start sub_8031D70
sub_8031D70:
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
ldr r5, _08031DC4
movs r0, 0x7C
movs r1, 0x8
bl MemoryAlloc
str r0, [r5]
stm r0!, {r6}
bl sub_801317C
ldr r0, [r5]
str r4, [r0, 0x10]
lsls r1, r4, 1
adds r1, r4
lsls r1, 3
adds r1, 0x18
adds r1, r0, r1
str r1, [r0, 0x14]
adds r0, 0x18
bl sub_8006518
ldr r1, [r5]
ldr r2, [r1, 0x10]
lsls r0, r2, 1
adds r0, r2
lsls r0, 3
adds r1, r0
adds r1, 0x18
ldr r0, _08031DC8
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
ldm r0!, {r2-r4}
stm r1!, {r2-r4}
bl sub_8031E00
movs r0, 0x1
pop {r4-r6}
pop {r1}
bx r1
.align 2, 0
_08031DC4: .4byte gUnknown_203B334
_08031DC8: .4byte gUnknown_80E1FC4
thumb_func_end sub_8031D70
thumb_func_start sub_8031DCC
sub_8031DCC:
push {lr}
ldr r0, _08031DEC
ldr r1, [r0]
adds r0, r1, 0x4
ldr r1, [r1, 0x10]
bl sub_8012A64
cmp r0, 0x1
beq _08031DF0
cmp r0, 0x2
bne _08031DFA
movs r0, 0x1
bl PlayMenuSoundEffect
movs r0, 0x2
b _08031DFC
.align 2, 0
_08031DEC: .4byte gUnknown_203B334
_08031DF0:
movs r0, 0
bl PlayMenuSoundEffect
movs r0, 0x3
b _08031DFC
_08031DFA:
movs r0, 0
_08031DFC:
pop {r1}
bx r1
thumb_func_end sub_8031DCC
thumb_func_start sub_8031E00
sub_8031E00:
push {lr}
bl sub_8031E58
bl sub_8031E74
pop {r0}
bx r0
thumb_func_end sub_8031E00
thumb_func_start sub_8031E10
sub_8031E10:
push {r4,r5,lr}
ldr r4, _08031E50
ldr r2, [r4]
cmp r2, 0
beq _08031E4A
ldr r0, [r2, 0x10]
lsls r1, r0, 1
adds r1, r0
lsls r1, 3
adds r1, r2, r1
adds r1, 0x18
ldr r0, _08031E54
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
bl ResetUnusedInputStruct
ldr r0, [r4]
adds r0, 0x18
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
ldr r0, [r4]
bl MemoryFree
movs r0, 0
str r0, [r4]
_08031E4A:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08031E50: .4byte gUnknown_203B334
_08031E54: .4byte gUnknown_80E1FA8
thumb_func_end sub_8031E10
thumb_func_start sub_8031E58
sub_8031E58:
push {lr}
bl ResetUnusedInputStruct
ldr r0, _08031E70
ldr r0, [r0]
adds r0, 0x18
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
pop {r0}
bx r0
.align 2, 0
_08031E70: .4byte gUnknown_203B334
thumb_func_end sub_8031E58
thumb_func_start sub_8031E74
sub_8031E74:
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x3C
ldr r3, _08031EC0
ldr r5, _08031EC4
ldr r2, [r5]
ldr r1, [r2]
lsls r0, r1, 1
adds r0, r1
lsls r0, 4
ldr r4, [r3]
adds r4, r0
ldr r0, [r2, 0x10]
bl sub_80073B8
ldr r2, _08031EC8
ldr r0, [r5]
ldr r3, [r0, 0x10]
movs r0, 0
str r0, [sp]
movs r0, 0x14
movs r1, 0
bl xxx_call_draw_string
add r0, sp, 0x4
adds r1, r4, 0
bl sub_803D2C0
movs r7, 0
mov r8, r5
_08031EB2:
cmp r7, 0x4
ble _08031ED0
cmp r7, 0xC
bgt _08031ECC
movs r6, 0x6
movs r5, 0x16
b _08031F00
.align 2, 0
_08031EC0: .4byte gUnknown_203B480
_08031EC4: .4byte gUnknown_203B334
_08031EC8: .4byte gUnknown_80E1FDC
_08031ECC:
cmp r7, 0x11
bgt _08031ED6
_08031ED0:
movs r6, 0x7
movs r5, 0x15
b _08031F00
_08031ED6:
cmp r7, 0x16
ble _08031EE8
cmp r7, 0x1E
bgt _08031EE4
movs r6, 0x6
movs r5, 0x25
b _08031F00
_08031EE4:
cmp r7, 0x23
bgt _08031EEE
_08031EE8:
movs r6, 0x7
movs r5, 0x24
b _08031F00
_08031EEE:
cmp r7, 0x28
ble _08031EFC
cmp r7, 0x30
bgt _08031EFC
movs r6, 0x6
movs r5, 0x34
b _08031F00
_08031EFC:
movs r6, 0x7
movs r5, 0x33
_08031F00:
adds r0, r7, 0
movs r1, 0x12
bl __modsi3
movs r1, 0xB
adds r4, r0, 0
muls r4, r1
adds r4, 0x6
mov r0, sp
adds r0, r7
adds r0, 0x4
ldrb r2, [r0]
mov r1, r8
ldr r0, [r1]
ldr r0, [r0, 0x10]
str r0, [sp]
adds r0, r4, 0
adds r1, r5, 0
adds r3, r6, 0
bl sub_8012C60
mov r1, r8
ldr r0, [r1]
ldr r0, [r0, 0x10]
adds r2, r5, 0
adds r2, 0xA
movs r1, 0x5
str r1, [sp]
adds r1, r4, 0
movs r3, 0xA
bl sub_80078A4
adds r7, 0x1
cmp r7, 0x35
ble _08031EB2
ldr r0, _08031F5C
ldr r0, [r0]
ldr r0, [r0, 0x10]
bl sub_80073E0
add sp, 0x3C
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08031F5C: .4byte gUnknown_203B334
thumb_func_end sub_8031E74
.align 2,0
data/data_80B9BB8.s
+115 -27
View File
@@ -1,17 +1,5 @@
.section .rodata
.string "pksdir0\0"
.align 2,0
.global gByteShiftLookup
gByteShiftLookup: @ 80B9BB8
.4byte 0
.4byte 8
.4byte 16
.4byte 24
.string "pksdir0\0"
.string "pksdir0\0"
.string "PKD ROM USER DATA 000000\0"
.global gUnknown_80B9BF1
@@ -526,7 +514,13 @@ gUnknown_80D4120: @ 80D4120
.global gUnknown_80D4124
gUnknown_80D4124: @ 80D4124
.incbin "baserom.gba", 0xD4124, 0x20
.string "$i0($v02"
.byte 0x81, 0x5E
.asciz "$v12)"
.align 2,0
.asciz "pksdir0"
.asciz "pksdir0"
.global gUnknown_80D4144
gUnknown_80D4144: @ 80D4144
@@ -768,11 +762,42 @@ gUnknown_80D47B8: @ 80D47B8
.byte 0x07, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.global UnkData_80D47C4
UnkData_80D47C4:
.byte 0x01, 0x00, 0x10, 0x00
.global gUnknown_80D47C8
gUnknown_80D47C8: @ 80D47C8
.incbin "baserom.gba", 0xD47C8, 0x60
@ replacing .incbin "baserom.gba", 0x000d47c8, 0x60
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x1a, 0x00, 0x0c, 0x00
.byte 0x0c, 0x00, 0x00, 0x00
.4byte UnkData_80D47C4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80D4828
gUnknown_80D4828: @ 80D4828
@@ -781,30 +806,43 @@ gUnknown_80D4828: @ 80D4828
.global gUnknown_80D4830
gUnknown_80D4830: @ 80D4830
.incbin "baserom.gba", 0xD4830, 0x2C
.byte 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x10, 0x27, 0x00, 0x00, 0xa0, 0x86, 0x01, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x80, 0x96, 0x98, 0x00
.byte 0x00, 0xe1, 0xf5, 0x05
.asciz "pksdir0"
.global gUnknown_80D485C
gUnknown_80D485C: @ 80D485C
.byte 0x78, 0x48, 0x0D, 0x08
.4byte Data_80D4878
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x74, 0x48, 0x0D, 0x08
.4byte Data_80D4874
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global Data_80D4874
Data_80D4874:
.string "No\0"
.align 2,0
.global Data_80D4878
Data_80D4878:
.string "*Yes\0"
.align 2,0
.global gUnknown_80D4880
gUnknown_80D4880: @ 80D4880
.byte 0x9C, 0x48, 0x0D, 0x08 @ Pointer to Yes
.4byte Data_80D489C
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x98, 0x48, 0x0D, 0x08 @ Pointer to No
.4byte Data_80D4898
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00 @ End of table
.byte 0xFF, 0xFF, 0xFF, 0xFF
.global Data_80D4898
Data_80D4898:
.string "*No\0"
.global Data_80D489C
Data_80D489C:
.string "Yes\0"
.align 2,0
@@ -1765,6 +1803,8 @@ gUnknown_80DBE7C: @ 80DBE7C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global UnkData_80DBE94
UnkData_80DBE94:
.byte 0x01, 0x00, 0x07, 0x00
.global gUnknown_80DBE98
@@ -1775,7 +1815,7 @@ gUnknown_80DBE98: @ 80DBE98
.byte 0x09, 0x00, 0x06, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x94, 0xBE, 0x0D, 0x08
.4byte UnkData_80DBE94
.global gUnknown_80DBEB0
gUnknown_80DBEB0: @ 80DBEB0
@@ -1860,6 +1900,8 @@ gUnknown_80DBFB0: @ 80DBFB0
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global UnkData_80DBFC8
UnkData_80DBFC8:
.byte 0x01, 0x00, 0x07, 0x00
.global gUnknown_80DBFCC
@@ -1870,7 +1912,7 @@ gUnknown_80DBFCC: @ 80DBFCC
.byte 0x0A, 0x00, 0x06, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0xC8, 0xBF, 0x0D, 0x08
.4byte UnkData_80DBFC8
.global gOthers_MenuOption
gOthers_MenuOption: @ 80DBFE4
@@ -1903,6 +1945,8 @@ gUnknown_80DC020: @ 80DC020
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global UnkData_80DC038
UnkData_80DC038:
.byte 0x01, 0x00, 0x0a, 0x00
.global gUnknown_80DC03C
@@ -1913,7 +1957,7 @@ gUnknown_80DC03C: @ 80DC03C
.byte 0x18, 0x00, 0x10, 0x00
.byte 0x12, 0x00, 0x00, 0x00
.byte 0x38, 0xC0, 0x0D, 0x08
.4byte UnkData_80DC038
@ Window Settings
@@ -1955,6 +1999,8 @@ gUnknown_80DC0A0: @ 80DC0A0
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global Data_80DC0B8
Data_80DC0B8:
.byte 0x01, 0x00, 0x08, 0x00
.global gUnknown_80DC0BC
@@ -1965,7 +2011,7 @@ gUnknown_80DC0BC: @ 80DC0BC
.byte 0x18, 0x00, 0x0E, 0x00
.byte 0x0E, 0x00, 0x00, 0x00
.byte 0xB8, 0xC0, 0x0D, 0x08
.4byte Data_80DC0B8
.global gUnknown_80DC0D4
gUnknown_80DC0D4: @ 80DC0D4
@@ -2005,7 +2051,18 @@ gUnknown_80DC11C: @ 80DC11C
.global gUnknown_80DC134
gUnknown_80DC134: @ 80DC134
.incbin "baserom.gba", 0xDC134, 0x30
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x16, 0x00, 0x04, 0x00
.byte 0x06, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x16, 0x00, 0x0e, 0x00
.byte 0x06, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80DC164
gUnknown_80DC164: @ 80DC164
@@ -2042,6 +2099,8 @@ gUnknown_80DC240: @ 80DC240
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global Data_80DC258
Data_80DC258:
.byte 0x01, 0x00, 0x0f, 0x00
.global gUnknown_80DC25C
@@ -2056,7 +2115,8 @@ gUnknown_80DC25C: @ 80DC25C
.byte 0x08, 0x00
.byte 0x08, 0x00
.byte 0x00, 0x00
.byte 0x58, 0xc2, 0x0d, 0x08
.4byte Data_80DC258
.global gUnknown_80DC274
gUnknown_80DC274: @ 80DC274
@@ -2909,7 +2969,17 @@ gUnknown_80DDA80: @ 80DDA80
.global gUnknown_80DDAA0
gUnknown_80DDAA0: @ 80DDAA0
.incbin "baserom.gba", 0xDDAA0, 0x2C
.4byte SendWOPokemon
.byte 0x12, 0x00, 0x00, 0x00
.4byte gWonderMailCancel
.byte 0x0a, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.global SendWOPokemon
SendWOPokemon:
.string "Send w/o Pokémon\0"
.align 2,0
.global gUnknown_80DDACC
gUnknown_80DDACC: @ 80DDACC
@@ -2971,5 +3041,23 @@ gUnknown_80DDB24: @ 80DDB24
.global gUnknown_80DDB60
gUnknown_80DDB60: @ 80DDB60
.incbin "baserom.gba", 0xDDB60, 0x48
.4byte SendPokemon_80DDB98
.byte 0x11, 0x00, 0x00, 0x00
.4byte DontSendPokemon_80DDB80
.byte 0x12, 0x00, 0x00, 0x00
.4byte gWonderMailCancel
.byte 0x0a, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.global DontSendPokemon_80DDB80
DontSendPokemon_80DDB80:
.string "Don~27t Send Pokémon\0"
.align 2,0
.global SendPokemon_80DDB98
SendPokemon_80DDB98:
.string "Send Pokémon\0"
.align 2,0
data/data_80DED44.s
+24 -250
View File
@@ -2,7 +2,6 @@
.global gUnknown_80DED48
gUnknown_80DED48: @ 80DED48
@ replacing .incbin "baserom.gba", 0x000ded48, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x15, 0x00, 0x04, 0x00
@@ -12,7 +11,6 @@ gUnknown_80DED48: @ 80DED48
.global gUnknown_80DED60
gUnknown_80DED60: @ 80DED60
@ replacing .incbin "baserom.gba", 0x000ded60, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x16, 0x00, 0x07, 0x00
@@ -22,7 +20,6 @@ gUnknown_80DED60: @ 80DED60
.global gUnknown_80DED78
gUnknown_80DED78: @ 80DED78
@ replacing .incbin "baserom.gba", 0x000ded78, 0x40
.4byte Confirm_80DED98
.byte 0x0b, 0x00, 0x00, 0x00
.4byte Info_80DED90
@@ -48,7 +45,6 @@ gUnknown_80DED78: @ 80DED78
.global gUnknown_80DEDB8
gUnknown_80DEDB8: @ 80DEDB8
@ replacing .incbin "baserom.gba", 0x000dedb8, 0x50
.4byte SendThankYou_Text
.byte 0x01, 0x00, 0x00, 0x00
.4byte GetThankYou_Text
@@ -76,7 +72,6 @@ gUnknown_80DEDB8: @ 80DEDB8
.global gUnknown_80DEE08
gUnknown_80DEE08: @ 80DEE08
@ Thank You Mail Pelipper Menu
@ replacing .incbin "baserom.gba", 0x000dee08, 0x3c
.4byte GameLinkCable_Text
.byte 0x03, 0x00, 0x00, 0x00
.4byte Password_Text
@@ -99,7 +94,6 @@ gUnknown_80DEE08: @ 80DEE08
.global gUnknown_80DEE44
gUnknown_80DEE44: @ 80DEE44
@ Game Link Cable Thank-You Mail Menu
@ replacing .incbin "baserom.gba", 0x000dee44, 0x1c
.4byte Yes_80DEE5C
.byte 0x07, 0x00, 0x00, 0x00
.4byte Cancel_80DEDD8
@@ -114,7 +108,6 @@ gUnknown_80DEE44: @ 80DEE44
.global gUnknown_80DEE60
gUnknown_80DEE60: @ 80DEE60
@ replacing .incbin "baserom.gba", 0x000dee60, 0x1c
.4byte Yes_80DEE5C
.byte 0x07, 0x00, 0x00, 0x00
.4byte No_80DEE78
@@ -129,7 +122,6 @@ gUnknown_80DEE60: @ 80DEE60
.global gUnknown_80DEE7C
gUnknown_80DEE7C: @ 80DEE7C
@ replacing .incbin "baserom.gba", 0x000dee7c, 0x40
.4byte SendItem_Text
.byte 0x09, 0x00, 0x00, 0x00
.4byte DontSendItemText
@@ -151,7 +143,6 @@ gUnknown_80DEE7C: @ 80DEE7C
.global gUnknown_80DEEBC
gUnknown_80DEEBC: @ 80DEEBC
@ replacing .incbin "baserom.gba", 0x000deebc, 0x28
.4byte SendWOItem_Text
.byte 0x0a, 0x00, 0x00, 0x00
.4byte Cancel_80DEDD8
@@ -166,7 +157,6 @@ gUnknown_80DEEBC: @ 80DEEBC
.global gUnknown_80DEEE4
gUnknown_80DEEE4: @ 80DEEE4
@ replacing .incbin "baserom.gba", 0x000deee4, 0x20
.4byte Yes_80DEE5C
.byte 0x07, 0x00, 0x00, 0x00
.4byte No_80DEE78
@@ -193,12 +183,10 @@ gUnknown_80DFBD0: @ 80DFBD0
.global gUnknown_80DFBE8
gUnknown_80DFBE8: @ 80DFBE8
@ replacing .incbin "baserom.gba", 0x000dfbe8, 0x4
.byte 0x01, 0x00, 0x0c, 0x00
.global gUnknown_80DFBEC
gUnknown_80DFBEC: @ 80DFBEC
@ replacing .incbin "baserom.gba", 0x000dfbec, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
@@ -251,7 +239,6 @@ gUnknown_80DFC50: @ 80DFC50
.global gUnknown_80DFC5C
gUnknown_80DFC5C: @ 80DFC5C
@ replacing .incbin "baserom.gba", 0x000dfc5c, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -261,7 +248,6 @@ gUnknown_80DFC5C: @ 80DFC5C
.global gUnknown_80DFC74
gUnknown_80DFC74: @ 80DFC74
@ replacing .incbin "baserom.gba", 0x000dfc74, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
@@ -276,7 +262,6 @@ gMailboxText: @ 80DFC8C
.global gUnknown_80DFC9C
gUnknown_80DFC9C: @ 80DFC9C
@ replacing .incbin "baserom.gba", 0x000dfc9c, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -286,7 +271,6 @@ gUnknown_80DFC9C: @ 80DFC9C
.global gUnknown_80DFCB4
gUnknown_80DFCB4: @ 80DFCB4
@ replacing .incbin "baserom.gba", 0x000dfcb4, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
@@ -302,7 +286,6 @@ gBulletinBoardText: @ 80DFCCC
.global gUnknown_80DFCE4
gUnknown_80DFCE4: @ 80DFCE4
@ replacing .incbin "baserom.gba", 0x000dfce4, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -312,7 +295,6 @@ gUnknown_80DFCE4: @ 80DFCE4
.global gUnknown_80DFCFC
gUnknown_80DFCFC: @ 80DFCFC
@ replacing .incbin "baserom.gba", 0x000dfcfc, 0x18
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x06, 0x00
@@ -334,7 +316,6 @@ gUnknown_80DFD14: @ 80DFD14
.global gUnknown_80DFD28
gUnknown_80DFD28: @ 80DFD28
@ replacing .incbin "baserom.gba", 0x000dfd28, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -344,7 +325,6 @@ gUnknown_80DFD28: @ 80DFD28
.global gUnknown_80DFD40
gUnknown_80DFD40: @ 80DFD40
@ replacing .incbin "baserom.gba", 0x000dfd40, 0x18
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x04, 0x00
@@ -360,7 +340,6 @@ gUnknown_80DFD40: @ 80DFD40
.global gUnknown_80DFD58
gUnknown_80DFD58: @ 80DFD58
@ replacing .incbin "baserom.gba", 0x000dfd58, 0x18
.byte 0x00, 0x00
.byte 0x00, 0x00
.byte 0x04, 0x00
@@ -386,7 +365,6 @@ gUnknown_80DFD7C: @ 80DFD7C
.global gUnknown_80DFD8C
gUnknown_80DFD8C: @ 80DFD8C
@ replacing .incbin "baserom.gba", 0x000dfd8c, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -396,7 +374,6 @@ gUnknown_80DFD8C: @ 80DFD8C
.global gUnknown_80DFDA4
gUnknown_80DFDA4: @ 80DFDA4
@ replacing .incbin "baserom.gba", 0x000dfda4, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x0
@@ -614,7 +591,19 @@ gUnknown_80E03B8: @ 80E03B8
.global gUnknown_80E03C4
gUnknown_80E03C4: @ 80E03C4
.incbin "baserom.gba", 0xE03C4, 0x30
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x03, 0x00
.byte 0x07, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E03F4
gUnknown_80E03F4: @ 80E03F4
@@ -650,7 +639,11 @@ gUnknown_80E0434: @ 80E0434
.global gUnknown_80E045C
gUnknown_80E045C: @ 80E045C
.incbin "baserom.gba", 0xE045C, 0x28
@ replacing .incbin "baserom.gba", 0x000e045c, 0x28
.string "#+#CN$m0#R received\n"
.string "#+#C5$d0#R"
.byte 0x20, 0x83
.byte 0xbf, 0x83, 0xc4, 0x2e, 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E0484
gUnknown_80E0484: @ 80E0484
@@ -977,232 +970,13 @@ gUnknown_80E09C0: @ 80E09C0
.global gUnknown_80E09D8
gUnknown_80E09D8: @ 80E09D8
.incbin "baserom.gba", 0xE09D8, 0x34
.string " ...Uh~2c no?\n"
.asciz "You don~27t have any #CGSOS Mail#R."
.align 2,0
.global gUnknown_80E0A0C
gUnknown_80E0A0C: @ 80E0A0C
.incbin "baserom.gba", 0xE0A0C, 0x3C
.global gUnknown_80E0A48
gUnknown_80E0A48: @ 80E0A48
@ Pelipper help menu (one not at the counter on the right)
.incbin "baserom.gba", 0xE0A48, 0x74
.global gUnknown_80E0ABC
gUnknown_80E0ABC: @ 80E0ABC
@ Friend Rescue menu from help menu
@ replacing .incbin "baserom.gba", 0x000e0abc, 0x80
.4byte FriendRescueInfo_Text
.byte 0x06, 0x00, 0x00, 0x00
.4byte GoRescue_Text
.byte 0x07, 0x00, 0x00, 0x00
.4byte GetHelp_Text
.byte 0x08, 0x00, 0x00, 0x00
.4byte DeletingMailInfo_Text
.byte 0x09, 0x00, 0x00, 0x00
.4byte Exit_80EA0EC
.byte 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.global Exit_80E0AEC
Exit_80EA0EC:
.string "Exit\0"
.align 2,0
.global DeletingMailInfo_Text
DeletingMailInfo_Text:
.string "Deleting Mail Info\0"
.align 2,0
.global GetHelp_Text
GetHelp_Text:
.string "#C6Get help#R \0"
.align 2,0
.global GoRescue_Text
GoRescue_Text:
.string "#C6Go rescue#R \0"
.align 2,0
.global FriendRescueInfo_Text
FriendRescueInfo_Text:
.string "Friend Rescue Info\0"
.align 2,0
.global gUnknown_80E0B3C
gUnknown_80E0B3C: @ 80E0B3C
@ Go Resuce menu from Peilipper help menu
@ replacing .incbin "baserom.gba", 0x000e0b3c, 0x98
.4byte RescueProcedures_Text
.byte 0x0a, 0x00, 0x00, 0x00
.4byte ReceiveSOSMail_Text
.byte 0x0b, 0x00, 0x00, 0x00
.4byte LeaveForRescue_Text
.byte 0x0c, 0x00, 0x00, 0x00
.4byte SendAOKMail_Text
.byte 0x0d, 0x00, 0x00, 0x00
.4byte GetThankYouMail_Text
.byte 0x0e, 0x00, 0x00, 0x00
.4byte Exit_80EA0EC
.byte 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.global GetThankYouMail_Text
GetThankYouMail_Text:
.string "Get Thank-You Mail\0"
.align 2,0
.global SendAOKMail_Text
SendAOKMail_Text:
.string "Send A-OK Mail\0"
.align 2,0
.global LeaveForResuce_Text
LeaveForRescue_Text:
.string "Leave for Rescue\0"
.align 2,0
.global ReceiveSOSMail_Text
ReceiveSOSMail_Text:
.string "Receive SOS Mail\0"
.align 2,0
.global RescueProcedures_Text
RescueProcedures_Text:
.string "Rescue Procedures\0"
.align 2,0
.global gUnknown_80E0BD4
gUnknown_80E0BD4: @ 80E0BD4
@ Get help menu from Pelipper help menu
@ replacing .incbin "baserom.gba", 0x000e0bd4, 0x78
.4byte GettingHelp_Text
.byte 0x0f, 0x00, 0x00, 0x00
.4byte SendSOSMail_Text
.byte 0x10, 0x00, 0x00, 0x00
.4byte RecieveAOKMail_Text
.byte 0x11, 0x00, 0x00, 0x00
.4byte SentThankYouMail_Text
.byte 0x12, 0x00, 0x00, 0x00
.4byte Exit_80EA0EC
.byte 0x05, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00
.global SendThankYouMail_Text
SentThankYouMail_Text:
.string "Send Thank-You Mail\0"
.align 2,0
.global ReceiveAOKMail_Text
RecieveAOKMail_Text:
.string "Receive A-OK Mail\0"
.align 2,0
.global SendSOSMail_Text
SendSOSMail_Text:
.string "Send SOS Mail\0"
.align 2,0
.global GettingHelp_Text
GettingHelp_Text:
.string "Getting Help\0"
.align 2,0
.include "data/text/wonder_mail_4.inc"
.global gUnknown_80E1EFC
gUnknown_80E1EFC: @ 80E1EFC
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnkData_80E1F14
gUnkData_80E1F14:
.byte 0x01, 0x00, 0x08, 0x00
.global gUnknown_80E1F18
gUnknown_80E1F18: @ 80E1F18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x14, 0x00, 0x04, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.4byte gUnkData_80E1F14
.global gUnknown_80E1F30
gUnknown_80E1F30: @ 80E1F30
.string "Objectives\0"
.align 2,0
.global gUnknown_80E1F3C
gUnknown_80E1F3C: @ 80E1F3C
.string "%dF\0"
.global gUnknown_80E1F40
gUnknown_80E1F40: @ 80E1F40
.string " Rescue #C6%s#R\0"
.align 2,0
.global gUnknown_80E1F54
gUnknown_80E1F54: @ 80E1F54
.string "Just go!\0"
.align 2,0
.global gUnknown_80E1F60
gUnknown_80E1F60: @ 80E1F60
.string " Bring #C4%s#R\0"
.align 2,0
.global gUnknown_80E1F70
gUnknown_80E1F70: @ 80E1F70
.string " Find #C4%s#R\0"
.align 2,0
.global gUnknown_80E1F80
gUnknown_80E1F80: @ 80E1F80
.string " Escort to #C6%s#R\0"
.align 2,0
.global gUnknown_80E1F94
gUnknown_80E1F94: @ 80E1F94
.string "#CW???#R\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80E1FA8
gUnknown_80E1FA8: @ 80E1FA8
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnkData_80E1FC0
gUnkData_80E1FC0:
.byte 0x01, 0x00, 0x0A, 0x00
.global gUnknown_80E1FC4
gUnknown_80E1FC4: @ 80E1FC4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x1a, 0x00, 0x0a, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.4byte gUnkData_80E1FC0
.global gUnknown_80E1FDC
gUnknown_80E1FDC: @ 80E1FDC
.string "Password\0"
.align 2,0
.string "pksdir0\0"
.string " ...Uh~2c no?\n"
.asciz "You don~27t have any #CGA-OK Mail#R."
.align 2,0
.asciz "pksdir0"
data/data_80E1F30.s
+71
View File
@@ -0,0 +1,71 @@
.section .rodata
.global gUnknown_80E1F30
gUnknown_80E1F30: @ 80E1F30
.string "Objectives\0"
.align 2,0
.global gUnknown_80E1F3C
gUnknown_80E1F3C: @ 80E1F3C
.string "%dF\0"
.global gUnknown_80E1F40
gUnknown_80E1F40: @ 80E1F40
.string " Rescue #C6%s#R\0"
.align 2,0
.global gUnknown_80E1F54
gUnknown_80E1F54: @ 80E1F54
.string "Just go!\0"
.align 2,0
.global gUnknown_80E1F60
gUnknown_80E1F60: @ 80E1F60
.string " Bring #C4%s#R\0"
.align 2,0
.global gUnknown_80E1F70
gUnknown_80E1F70: @ 80E1F70
.string " Find #C4%s#R\0"
.align 2,0
.global gUnknown_80E1F80
gUnknown_80E1F80: @ 80E1F80
.string " Escort to #C6%s#R\0"
.align 2,0
.global gUnknown_80E1F94
gUnknown_80E1F94: @ 80E1F94
.string "#CW???#R\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80E1FA8
gUnknown_80E1FA8: @ 80E1FA8
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnkData_80E1FC0
gUnkData_80E1FC0:
.byte 0x01, 0x00, 0x0A, 0x00
.global gUnknown_80E1FC4
gUnknown_80E1FC4: @ 80E1FC4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x1a, 0x00, 0x0a, 0x00
.byte 0x0a, 0x00, 0x00, 0x00
.4byte gUnkData_80E1FC0
.global gUnknown_80E1FDC
gUnknown_80E1FDC: @ 80E1FDC
.string "Password\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
data/data_80E2068.s
+483 -609
View File
File diff suppressed because it is too large Load Diff
data/data_80E7D40.s
+653
View File
@@ -0,0 +1,653 @@
.section .rodata
.global gUnknown_80E7E34
gUnknown_80E7E34: @ 80E7E34
@ replacing .incbin "baserom.gba", 0x000e7e34, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7E4C
gUnknown_80E7E4C: @ 80E7E4C
@ replacing .incbin "baserom.gba", 0x000e7e4c, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x14, 0x00, 0x04, 0x00
.byte 0x06, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7E64
gUnknown_80E7E64: @ 80E7E64
@ replacing .incbin "baserom.gba", 0x000e7e64, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x14, 0x00, 0x0e, 0x00
.byte 0x06, 0x00, 0x04, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gDebug_NumberText
gDebug_NumberText: @ 80E7E7C
.string "Number?\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E7E8C
gUnknown_80E7E8C: @ 80E7E8C
@ replacing .incbin "baserom.gba", 0x000e7e8c, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7EA4
gUnknown_80E7EA4: @ 80E7EA4
@ replacing .incbin "baserom.gba", 0x000e7ea4, 0x18
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x15, 0x00, 0x04, 0x00
.byte 0x06, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gDebug_CloseText
gDebug_CloseText: @ 80E7EBC
.string "CLOSE\0"
.align 2,0
.global gDebug_OpenText
gDebug_OpenText: @ 80E7EC4
.string "OPEN\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E7ED4
gUnknown_80E7ED4: @ 80E7ED4
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7EEC
gUnknown_80E7EEC: @ 80E7EEC
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x13, 0x00, 0x04, 0x00
.byte 0x09, 0x00, 0x03, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7F04
gUnknown_80E7F04: @ 80E7F04
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x13, 0x00, 0x0e, 0x00
.byte 0x06, 0x00, 0x04, 0x00
.byte 0x04, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gDebug_NumberText2
gDebug_NumberText2: @ 80E7F1C
.string "Number?\0"
.align 2,0
.global gDebug_LevelText
gDebug_LevelText: @ 80E7F24
.string "LEVEL\0"
.align 2,0
.global gUnknown_80E7F2C
gUnknown_80E7F2C: @ 80E7F2C
.string "Name\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E7F3C
gUnknown_80E7F3C: @ 80E7F3C
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7F54
gUnknown_80E7F54: @ 80E7F54
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x02, 0x00
.byte 0x18, 0x00, 0x11, 0x00
.byte 0x11, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global gUnknown_80E7F6C
gUnknown_80E7F6C: @ 80E7F6C
.string "Script\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E7F94
gUnknown_80E7F94: @ 80E7F94
.incbin "baserom.gba", 0xE7F94, 0x10C
.global gUnknown_80E80A0
gUnknown_80E80A0: @ 80E80A0
.incbin "baserom.gba", 0xE80A0, 0x40
.global gUnknown_80E80E0
gUnknown_80E80E0: @ 80E80E0
.incbin "baserom.gba", 0xE80E0, 0x46
.global gUnknown_80E8126
gUnknown_80E8126: @ 80E8126
.incbin "baserom.gba", 0xE8126, 0x42
.global gUnknown_80E8168
gUnknown_80E8168: @ 80E8168
.incbin "baserom.gba", 0xE8168, 0x18
.global gUnknown_80E8180
gUnknown_80E8180: @ 80E8180
.incbin "baserom.gba", 0xE8180, 0x54
.global gUnknown_80E81D4
gUnknown_80E81D4: @ 80E81D4
.incbin "baserom.gba", 0xE81D4, 0x608
.global gMankeyMission
gMankeyMission: @ 80E87DC
.string "Punish bad #C6Mankey#R!\0"
.align 2,0
.global gSmeargleMission
gSmeargleMission: @ 80E87F4
.string "#C6Smeargle#R~27s desperate plea!\0"
.align 2,0
.global gMedichamMission
gMedichamMission: @ 80E8818
.string "#C6Medicham#R: Help me!\0"
.align 2,0
.global gUnknown_80E8830
gUnknown_80E8830: @ 80E8830
.string "Deliver one #C4%s#R.\0"
.align 2,0
.global gUnknown_80E8848
gUnknown_80E8848: @ 80E8848
.string "One #C4%s#R wanted!\0"
.align 2,0
.global gUnknown_80E885C
gUnknown_80E885C: @ 80E885C
.string "Save my child!\0"
.align 2,0
.global gUnknown_80E886C
gUnknown_80E886C: @ 80E886C
.string "Escort me to my love!\0"
.align 2,0
.global gUnknown_80E8884
gUnknown_80E8884: @ 80E8884
.string "Near %s\0"
.align 2,0
.global gUnknown_80E888C
gUnknown_80E888C: @ 80E888C
.string "Rescue Description\0"
.align 2,0
.global gMankeyMissionDescription
gMankeyMissionDescription: @ 80E88A0
.string "Please punish bad #C6Mankey#R~27s gang.\0"
.align 2,0
.global gSmeargleMissionDescription
gSmeargleMissionDescription: @ 80E88C8
.string "I didn~27t want to become a grown-up~2c so I\n"
.string "fled~2c but now I~27ve lost my way! Help!\0"
.align 2,0
.global gMedichamMissionDescription
gMedichamMissionDescription: @ 80E8920
.string "This is #C6Medicham#R. Rescue me~2c please!\n"
.string "The reward is a secret"
.byte 0x81, 0x60
.string "♪ "
.align 2,0
.global gUnknown_80E8968
gUnknown_80E8968: @ 80E8968
.string "With the item #C4%s#R~2c I can\n"
.string "evolve! I~27m yearning to evolve! Help!\0"
.align 2,0
.global gUnknown_80E89B0
gUnknown_80E89B0: @ 80E89B0
.string "The #C4%s#R! What I love to eat\n"
.string "and can~27t live without! Please get one!\0"
.align 2,0
.global gUnknown_80E89FC
gUnknown_80E89FC: @ 80E89FC
.string "This is a rescue through communication.\n"
.string "Get a friend to help you!\0"
.align 2,0
.global gUnknown_80E8A40
gUnknown_80E8A40: @ 80E8A40
.string "This is a rescue through communication.\n"
.string "Rescue a friend!\0"
.align 2,0
.global gUnknown_80E8A7C
gUnknown_80E8A7C: @ 80E8A7C
.string "This is a rescue through communication.\n"
.string "Send your thanks to your friend!\0"
.align 2,0
.global gUnknown_80E8AC8
gUnknown_80E8AC8: @ 80E8AC8
.string "Client:\0"
.align 2,0
.global gUnknown_80E8AD0
gUnknown_80E8AD0: @ 80E8AD0
.string "%s#C4"
.byte 0x81
.string "i%s"
.byte 0x81
.string "j#R\0"
.align 2,0
.global gUnknown_80E8AE0
gUnknown_80E8AE0: @ 80E8AE0
.string "Objective:\0"
.align 2,0
.global gUnknown_80E8AEC
gUnknown_80E8AEC: @ 80E8AEC
.string "Friend Rescue\0"
.align 2,0
.global gUnknown_80E8AFC
gUnknown_80E8AFC: @ 80E8AFC
.string "Deliver #C4%s#R.\0"
.align 2,0
.global gUnknown_80E8B10
gUnknown_80E8B10: @ 80E8B10
.string "Find #C4%s#R.\0"
.align 2,0
.global gUnknown_80E8B20
gUnknown_80E8B20: @ 80E8B20
.string "Help me.\0"
.align 2,0
.global gUnknown_80E8B2C
gUnknown_80E8B2C: @ 80E8B2C
.string "Escort to #C6%s#R.\0"
.align 2,0
.global gUnknown_80E8B40
gUnknown_80E8B40: @ 80E8B40
.string "Find #C6%s#R.\0"
.align 2,0
.global gSpecialMissionText
gSpecialMissionText: @ 80E8B50
.string "Special mission\0"
.align 2,0
.global gPlaceText
gPlaceText: @ 80E8B60
.string "Place:\0"
.align 2,0
.global gDifficultyText
gDifficultyText: @ 80E8B68
.string "Difficulty:\0"
.align 2,0
.global gRewardText
gRewardText: @ 80E8B74
.string "Reward:\0"
.align 2,0
.global gUnknown_80E8B7C
gUnknown_80E8B7C: @ 80E8B7C
.string "Wonder Mail:\0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global gUnknown_80E8B94
gUnknown_80E8B94: @ 80E8B94
@ replacing .incbin "baserom.gba", 0x000e8b94, 0x38
.4byte UnkData_80E8BC8
.4byte UnkData_80E8BC4
.4byte UnkData_80E8BC0
.4byte UnkData_80E8BBC
.4byte UnkData_80E8BB8
.4byte UnkData_80E8BB4
.4byte UnkData_80E8BB0
.global UnkData_80E8BB0
UnkData_80E8BB0:
.byte 0x83, 0xc3, 0x00, 0x00
.global UnkData_80E8BB4
UnkData_80E8BB4:
.byte 0x83, 0xc2, 0x00, 0x00
.global UnkData_80E8BB8
UnkData_80E8BB8:
.byte 0x83, 0xc1, 0x00, 0x00
.global UnkData_80E8BBC
UnkData_80E8BBC:
.byte 0x83, 0xc0, 0x00, 0x00
.global UnkData_80E8BC0
UnkData_80E8BC0:
.byte 0x87, 0x40, 0x00, 0x00
.global UnkData_80E8BC4
UnkData_80E8BC4:
.byte 0x84, 0x87, 0x00, 0x00
.global UnkData_80E8BC8
UnkData_80E8BC8:
.byte 0x81, 0x40, 0x00, 0x00
.global gUnknown_80E8BCC
gUnknown_80E8BCC: @ 80E8BCC
.4byte UnkData_80E8BC8
.4byte SuspendText
.4byte TakeJobText
.4byte DoneText
.global DoneText
DoneText:
.string "Done\0"
.align 2,0
.global TakeJobText
TakeJobText:
.string "Take Job\0"
.align 2,0
.global SuspendText
SuspendText:
.string "Suspend\0"
.align 2,0
.global gUnknown_80E8BF8
gUnknown_80E8BF8: @ 80E8BF8
.incbin "baserom.gba", 0xE8BF8, 0x50
.global gMissionRewardText
gMissionRewardText: @ 80E8C48
.incbin "baserom.gba", 0xE8C48, 0x50
.global gUnknown_80E8C98
gUnknown_80E8C98: @ 80E8C98
.incbin "baserom.gba", 0xE8C98, 0x14C
.global gUnknown_80E8DE4
gUnknown_80E8DE4: @ 80E8DE4
.incbin "baserom.gba", 0xE8DE4, 0x1CC
.global gUnknown_80E8FB0
gUnknown_80E8FB0: @ 80E8FB0
.incbin "baserom.gba", 0xE8FB0, 0x15C
.global gUnknown_80E910C
gUnknown_80E910C: @ 80E910C
.incbin "baserom.gba", 0xE910C, 0xC8
.global gUnknown_80E91D4
gUnknown_80E91D4: @ 80E91D4
.incbin "baserom.gba", 0xE91D4, 0x64C
.global gUnknown_80E9820
gUnknown_80E9820: @ 80E9820
.incbin "baserom.gba", 0xE9820, 0x100
.global gUnknown_80E9920
gUnknown_80E9920: @ 80E9920
.incbin "baserom.gba", 0xE9920, 0x66C
.global gUnknown_80E9F8C
gUnknown_80E9F8C: @ 80E9F8C
.incbin "baserom.gba", 0xE9F8C, 0xED0
@ Escort Mission Text
.global gUnknown_80EAE5C
gUnknown_80EAE5C: @ 80EAE5C
.4byte TakeMe_Text
.4byte WantToSee_Text
.4byte TakeMeWith_Text
.4byte EscortMe_Text
.global EscortMe_Text
EscortMe_Text:
.asciz "Escort me!"
.align 2,0
.global TakeMeWith_Text
TakeMeWith_Text:
.asciz "Please take me with you!"
.align 2,0
.global WantToSee_Text
WantToSee_Text:
.asciz "I want to see #C6%s#R."
.align 2,0
.global TakeMe_Text
TakeMe_Text:
.asciz "Take me!"
.align 2,0
.global gUnknown_80EAEB8
gUnknown_80EAEB8: @ 80EAEB8
@ replacing .incbin "baserom.gba", 0x000eaeb8, 0x2e0
.byte 0x7c, 0xb1, 0x0e, 0x08
.byte 0x58, 0xb1, 0x0e, 0x08
.byte 0x38, 0xb1, 0x0e, 0x08
.byte 0x18, 0xb1, 0x0e, 0x08
.byte 0xfc, 0xb0, 0x0e, 0x08
.byte 0xdc, 0xb0, 0x0e, 0x08
.byte 0xb4, 0xb0, 0x0e, 0x08
.byte 0x90, 0xb0, 0x0e, 0x08
.byte 0x6c, 0xb0, 0x0e, 0x08
.byte 0x48, 0xb0, 0x0e, 0x08
.byte 0x30, 0xb0, 0x0e, 0x08
.byte 0x14, 0xb0, 0x0e, 0x08
.byte 0xf0, 0xaf, 0x0e, 0x08
.byte 0xd4, 0xaf, 0x0e, 0x08
.byte 0xa4, 0xaf, 0x0e, 0x08
.byte 0x94, 0xaf, 0x0e, 0x08
.byte 0x70, 0xaf, 0x0e, 0x08
.byte 0x4c, 0xaf, 0x0e, 0x08
.byte 0x2c, 0xaf, 0x0e, 0x08
.byte 0x08, 0xaf, 0x0e, 0x08
.asciz "I~27m close friends with #C6%s#R!"
.align 2,0
.asciz "I want to apologize to #C6%s#R."
.align 2,0
.asciz "I don~27t care how--we must meet!"
.align 2,0
.asciz "We have to meet--whatever it takes!"
.align 2,0
.asciz "I have to go!"
.align 2,0
.asciz "We haven~27t seen each other in a long time."
.align 2,0
.asciz "I~27m sick with worry..."
.align 2,0
.asciz "#C6%s#R may have fainted inside..."
.align 2,0
.asciz "#C6%s#R hasn~27t returned!"
.align 2,0
.asciz "I want to help #C6%s#R!"
.align 2,0
.asciz "Hurry~2c #C6%s#R is in trouble..."
.align 2,0
.asciz "#C6%s#R has been waiting forever..."
.align 2,0
.asciz "#C6%s#R is waiting in the dungeon."
.align 2,0
.asciz "I~27m too weak. It~27s not possible."
.align 2,0
.asciz "I can~27t go on my own power..."
.align 2,0
.asciz "I can~27t go by myself..."
.align 2,0
.asciz "I~27m worried about #C6%s#R..."
.align 2,0
.asciz "I want to meet with #C6%s#R."
.align 2,0
.asciz "We promised to meet in the dungeon!"
.align 2,0
.asciz "#C6%s#R is waiting for me!"
.align 2,0
.global gUnknown_80EB198
gUnknown_80EB198: @ 80EB198
.4byte PleaseTakeMeToSee
.4byte PleaseTakeMeThere
.4byte PleaseEscortMe
.4byte SomeonePleaseEscort
.global SomeonePleaseEscort
SomeonePleaseEscort:
.asciz "Someone~2c please escort me!"
.align 2,0
.global PleaseEscortMe
PleaseEscortMe:
.asciz "Please escort me there!"
.align 2,0
.global PleaseTakeMeThere
PleaseTakeMeThere:
.asciz "Please take me there with you!"
.align 2,0
.global PleaseTakeMeToSee
PleaseTakeMeToSee:
.asciz "Please take me to see #C6%s#R!"
.align 2,0
.global gUnknown_80EB220
gUnknown_80EB220: @ 80EB220
@ replacing .incbin "baserom.gba", 0x000eb220, 0xd0
.byte 0xcc, 0xb2, 0x0e, 0x08
.byte 0xac, 0xb2, 0x0e, 0x08
.byte 0x94, 0xb2, 0x0e, 0x08
.byte 0x74, 0xb2, 0x0e, 0x08
.byte 0x50, 0xb2, 0x0e, 0x08
.byte 0x38, 0xb2, 0x0e, 0x08
.asciz "Without #C6%s#R~2c I..."
.align 2,0
.asciz "I~27m so worried about #C6%s#R..."
.align 2,0
.asciz "I really want to meet #C6%s#R!"
.align 2,0
.asciz "Help me meet #C6%s#R!"
.align 2,0
.asciz "Please escort me to my #C6%s#R!"
.align 2,0
.asciz "Please! Take me to meet #C6%s#R!"
.align 2,0
.global gUnknown_80EB2F0
gUnknown_80EB2F0: @ 80EB2F0
@ replacing .incbin "baserom.gba", 0x000eb2f0, 0x108
.byte 0xcc, 0xb3, 0x0e, 0x08
.byte 0xa4, 0xb3, 0x0e, 0x08
.byte 0x7c, 0xb3, 0x0e, 0x08
.byte 0x5c, 0xb3, 0x0e, 0x08
.byte 0x34, 0xb3, 0x0e, 0x08
.byte 0x08, 0xb3, 0x0e, 0x08
.asciz "I~27m very lonely! Please take me with you!"
.align 2,0
.asciz "It~27s no good if we~27re not together!"
.align 2,0
.asciz "This means everything to me!"
.align 2,0
.asciz "We~27ve promised our futures together."
.align 2,0
.asciz "We belong together! Please escort me!"
.align 2,0
.asciz "We~27re in love! Please~2c take me there!"
.align 2,0
@ Item Delivery Mission Text
.global gUnknown_80EB3F8
gUnknown_80EB3F8: @ 80EB3F8
.incbin "baserom.gba", 0xEB3F8, 0x334
.global gUnknown_80EB72C
gUnknown_80EB72C: @ 80EB72C
.incbin "baserom.gba", 0xEB72C, 0x2EC
data/data_80F4278.s
+3 -3
View File
@@ -7799,8 +7799,8 @@ gUnknown_8107608: @ 8107608
.string "%s#r"
.align 2,0
.global gUnknown_8107610
gUnknown_8107610: @ 8107610
.global gUnownLetters
gUnownLetters: @ 8107610
.string "ABCDEFGHIJKLMNOPQRSTUVWXYZ!?\0"
.align 2,0
@@ -7816,7 +7816,7 @@ gUnknown_8107638: @ 8107638
.global gUnknown_810763C
gUnknown_810763C: @ 810763C
.incbin "baserom.gba", 0x10763C, 0x9
.string "#c%c%s#r\0"
.global gUnknown_8107645
gUnknown_8107645: @ 8107645
data/data_810AE24.s
+2 -2
View File
@@ -831,7 +831,7 @@ gUnknown_81161E8: @ 81161E8
@ replacing .incbin "baserom.gba", 0x001161e8, 0x10
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_801641C
.4byte CleanFelicityBank
.4byte sub_80163A0
.global gUnknown_81161F8
@@ -887,7 +887,7 @@ gUnknown_8116258: @ 8116258
@ replacing .incbin "baserom.gba", 0x00116258, 0x10
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte sub_80315C0
.4byte CleanHelperPelipper
.4byte sub_8031540
.global gUnknown_8116268
data/dungeon/Autopilot/floor_id.inc
+11 -6
View File
@@ -1,9 +1,14 @@
.global AutopilotFloorID
AutopilotFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x6a, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6b, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x6c, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6d, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x6e, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x6f, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x70, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x71, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x72, 0x04, 0x13, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x69, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6a, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6b, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x7e, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6c, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6d, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6e, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x6f, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x70, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x71, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x72, 0x04, 0x13, 0x02, 0x0a, 0x00, 0x7f, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
data/dungeon/Boss9/floor_id.inc
+11 -7
View File
@@ -1,12 +1,16 @@
.global Boss9FloorID
Boss9FloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xd8, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0xd9, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xda, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0xdb, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xdc, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0xdd, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xde, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0xdf, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xe0, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0xe1, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0xe2, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00
.byte 0xd8, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xd9, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xda, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xdb, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xdc, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xdd, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xde, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xdf, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xe0, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xe1, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xe2, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0xe3, 0x02, 0x53, 0x01, 0x3f, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
data/dungeon/D50/floor_id.inc
+3 -3
View File
@@ -1,6 +1,6 @@
.global D50FloorID
D50FloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x73, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00, 0x74, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x42, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x73, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x74, 0x04, 0x0e, 0x02, 0x57, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x42, 0x00, 0x00, 0x00
data/dungeon/D54/floor_id.inc
+31 -17
View File
@@ -1,21 +1,35 @@
.global D54FloorID
D54FloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xf8, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf9, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xfa, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfb, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xfc, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfd, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xfe, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xff, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x05, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x02, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x06, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x07, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x08, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x0a, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0b, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x0c, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0d, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x0e, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0f, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x10, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x11, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x12, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x13, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x14, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x15, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf8, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xf9, 0x04, 0x0e, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xfa, 0x04, 0x0f, 0x02, 0x0a, 0x00, 0x57, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xfb, 0x04, 0x10, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xfc, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xfd, 0x04, 0x11, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xfe, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xff, 0x04, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x05, 0x12, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x01, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x02, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x03, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x04, 0x05, 0x13, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x05, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x06, 0x05, 0x16, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x07, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x08, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x09, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0a, 0x05, 0x17, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0b, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0c, 0x05, 0x18, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0d, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0e, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0f, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x10, 0x05, 0x19, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x11, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x12, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x13, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x14, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x15, 0x05, 0x1a, 0x02, 0x0a, 0x00, 0x58, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
data/dungeon/DesertRegion/floor_id.inc
+10 -6
View File
@@ -10,11 +10,15 @@ DesertRegionFloorID:
.byte 0xea, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xeb, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xec, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xed, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00
.byte 0x5b, 0x00, 0x00, 0x00, 0xee, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xef, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00
.byte 0x5b, 0x00, 0x00, 0x00, 0xf0, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf1, 0x02, 0x57, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00
.byte 0x5b, 0x00, 0x00, 0x00, 0xf2, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf3, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00
.byte 0x5b, 0x00, 0x00, 0x00, 0xf4, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00, 0xf5, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00
.byte 0x5b, 0x00, 0x00, 0x00, 0xf6, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xed, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xee, 0x02, 0x55, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xef, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf0, 0x02, 0x56, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf1, 0x02, 0x57, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf2, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf3, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf4, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf5, 0x02, 0x58, 0x01, 0x40, 0x00, 0x59, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf6, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
.byte 0xf7, 0x02, 0x58, 0x01, 0x40, 0x00, 0x5c, 0x00, 0x5a, 0x00, 0x2e, 0x00, 0x5b, 0x00, 0x00, 0x00
data/dungeon/GreatCanyon/pokemon_found.inc
+85
View File
@@ -0,0 +1,85 @@
.global GreatCanyon_1F_3F_Pokemon
GreatCanyon_1F_3F_Pokemon:
.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_4F_Pokemon
GreatCanyon_4F_Pokemon:
.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_5F_Pokemon
GreatCanyon_5F_Pokemon:
.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_6F_Pokemon
GreatCanyon_6F_Pokemon:
.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_7F_Pokemon
GreatCanyon_7F_Pokemon:
.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_8F_Pokemon
GreatCanyon_8F_Pokemon:
.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_9F_Pokemon
GreatCanyon_9F_Pokemon:
.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_10F_11F_Pokemon
GreatCanyon_10F_11F_Pokemon:
.byte 0x80, 0x1e, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00
.byte 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00
.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_12F_Pokemon
GreatCanyon_12F_Pokemon:
.byte 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/LapisCave/pokemon_found.inc
+57
View File
@@ -0,0 +1,57 @@
.global LapisCave_1F_3F_Pokemon
LapisCave_1F_3F_Pokemon:
.byte 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_4F_Pokemon
LapisCave_4F_Pokemon:
.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_5F_8F_Pokemon
LapisCave_5F_8F_Pokemon:
.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x53, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_9F_10F_Pokemon
LapisCave_9F_10F_Pokemon:
.byte 0x72, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_11F_12F_Pokemon
LapisCave_11F_12F_Pokemon:
.byte 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_13F_Pokemon
LapisCave_13F_Pokemon:
.byte 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_14F_Pokemon
LapisCave_14F_Pokemon:
.byte 0x2a, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/MtSteel/pokemon_found.inc
+53
View File
@@ -0,0 +1,53 @@
.global MtSteel_1F_4F_Pokemon
MtSteel_1F_4F_Pokemon:
.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00
.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_5F_Pokemon
MtSteel_5F_Pokemon:
.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00
.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_6F_Pokemon
MtSteel_6F_Pokemon:
.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00
.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_7F_8F_Pokemon
MtSteel_7F_8F_Pokemon:
.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00
.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00
.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00
.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00
.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_9F_Pokemon
MtSteel_9F_Pokemon:
.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/MtThunder/pokemon_found.inc
+84
View File
@@ -0,0 +1,84 @@
.global MtThunder_1F_Pokemon
MtThunder_1F_Pokemon:
.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00
.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_2F_4F_Pokemon
MtThunder_2F_4F_Pokemon:
.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00
.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_5F_Pokemon
MtThunder_5F_Pokemon:
.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00
.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_6F_Pokemon
MtThunder_6F_Pokemon:
.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00
.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00
.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_7F_Pokemon
MtThunder_7F_Pokemon:
.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00
.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_8F_Pokemon
MtThunder_8F_Pokemon:
.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00
.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00
.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00
.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00
.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_9F_Pokemon
MtThunder_9F_Pokemon:
.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_10F_Pokemon
MtThunder_10F_Pokemon:
.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00
.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/MtThunderPeak/pokemon_found.inc
+17
View File
@@ -0,0 +1,17 @@
.global MtThunderPeak_1F_2F_Pokemon
MtThunderPeak_1F_2F_Pokemon:
.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunderPeak_3F_Pokemon
MtThunderPeak_3F_Pokemon:
.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/PitfallValley/floor_id.inc
+23 -15
View File
@@ -2,20 +2,28 @@
PitfallValleyFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa6, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xa7, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xa8, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xa9, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xaa, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xab, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xac, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xad, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xae, 0x02, 0x40, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xaf, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb0, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xb1, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb2, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xb3, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb4, 0x02, 0x43, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xb5, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb6, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xb7, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xb8, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xb9, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0xba, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0xbb, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xbc, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0xa7, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xa8, 0x02, 0x3d, 0x01, 0x3b, 0x00, 0x54, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xa9, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xaa, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xab, 0x02, 0x3e, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xac, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xad, 0x02, 0x3f, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xae, 0x02, 0x40, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xaf, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb0, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb1, 0x02, 0x41, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb2, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb3, 0x02, 0x42, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb4, 0x02, 0x43, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb5, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb6, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb7, 0x02, 0x44, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb8, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xb9, 0x02, 0x45, 0x01, 0x3b, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xba, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xbb, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x55, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xbc, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xbd, 0x02, 0x46, 0x01, 0x3c, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0xbe, 0x02, 0x46, 0x01, 0x3d, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0xbe, 0x02, 0x46, 0x01, 0x3d, 0x00, 0x56, 0x00, 0x25, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
data/dungeon/RemainsIsland/floor_id.inc
+21 -12
View File
@@ -1,15 +1,24 @@
.global RemainsIslandFloorID
RemainsIslandFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x1b, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x1c, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x1d, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x1e, 0x04, 0xec, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x1f, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x20, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x21, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x22, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x23, 0x04, 0xef, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x24, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x25, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x26, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x27, 0x04, 0xf1, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x28, 0x04, 0xf2, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x29, 0x04, 0xf3, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2a, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x2b, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2c, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00, 0x2d, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x2e, 0x04, 0xf5, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00
.byte 0x6d, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x1b, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x1c, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x1d, 0x04, 0xeb, 0x01, 0x3e, 0x00, 0x77, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x1e, 0x04, 0xec, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x1f, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x20, 0x04, 0xed, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x21, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x22, 0x04, 0xee, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x23, 0x04, 0xef, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x24, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x25, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x26, 0x04, 0xf0, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x27, 0x04, 0xf1, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x28, 0x04, 0xf2, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x29, 0x04, 0xf3, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x2a, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x2b, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x2c, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x2d, 0x04, 0xf4, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
.byte 0x2e, 0x04, 0xf5, 0x01, 0x3e, 0x00, 0x78, 0x00, 0x25, 0x00, 0x02, 0x00, 0x6d, 0x00, 0x00, 0x00
data/dungeon/RockPath/floor_id.inc
+5 -3
View File
@@ -1,7 +1,9 @@
.global RockPathFloorID
RockPathFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x62, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x63, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x64, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x61, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x62, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x63, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x64, 0x04, 0x09, 0x02, 0x0a, 0x00, 0x7b, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
data/dungeon/SilentChasm/pokemon_found.inc
+84
View File
@@ -0,0 +1,84 @@
.global SilentChasm_1F_3F_Pokemon
SilentChasm_1F_3F_Pokemon:
.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00
.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_4F_Pokemon
SilentChasm_4F_Pokemon:
.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00
.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_5F_Pokemon
SilentChasm_5F_Pokemon:
.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00
.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00
.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_6F_Pokemon
SilentChasm_6F_Pokemon:
.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00
.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00
.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00
.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00
.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00
.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_7F_Pokemon
SilentChasm_7F_Pokemon:
.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00
.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00
.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00
.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00
.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_8F_Pokemon
SilentChasm_8F_Pokemon:
.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_9F_Pokemon
SilentChasm_9F_Pokemon:
.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00
.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00
.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/SinisterWoods/pokemon_found.inc
+126
View File
@@ -0,0 +1,126 @@
.global SinisterWoods_1F_Pokemon
SinisterWoods_1F_Pokemon:
.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00
.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_2F_Pokemon
SinisterWoods_2F_Pokemon:
.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00
.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_3F_Pokemon
SinisterWoods_3F_Pokemon:
.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00
.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00
.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_4F_Pokemon
SinisterWoods_4F_Pokemon:
.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00
.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00
.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00
.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_5F_Pokemon
SinisterWoods_5F_Pokemon:
.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00
.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_6F_Pokemon
SinisterWoods_6F_Pokemon:
.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00
.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00
.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_7F_Pokemon
SinisterWoods_7F_Pokemon:
.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00
.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00
.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_8F_9F_Pokemon
SinisterWoods_8F_9F_Pokemon:
.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00
.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00
.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_10F_Pokemon
SinisterWoods_10F_Pokemon:
.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00
.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00
.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00
.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_11F_Pokemon
SinisterWoods_11F_Pokemon:
.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_12F_Pokemon
SinisterWoods_12F_Pokemon:
.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_13F_Pokemon
SinisterWoods_13F_Pokemon:
.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/SnowPath/floor_id.inc
+5 -4
View File
@@ -1,7 +1,8 @@
.global SnowPathFloorID
SnowPathFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x65, 0x04, 0x0a, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x66, 0x04, 0x0b, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x04, 0x0c, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x68, 0x04, 0x0d, 0x02, 0x0a, 0x00, 0x7d, 0x00, 0x01, 0x00, 0x02, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x65, 0x04, 0x0a, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x66, 0x04, 0x0b, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x67, 0x04, 0x0c, 0x02, 0x0a, 0x00, 0x7c, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x68, 0x04, 0x0d, 0x02, 0x0a, 0x00, 0x7d, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
data/dungeon/SolarCave/floor_id.inc
+19 -11
View File
@@ -1,16 +1,24 @@
.global SolarCaveFloorID
SolarCaveFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x84, 0x03, 0x9c, 0x01, 0x4b, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x85, 0x03, 0x9c, 0x01, 0x4c, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x86, 0x03, 0x9c, 0x01, 0x4d, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x87, 0x03, 0x9d, 0x01, 0x4e, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x88, 0x03, 0x9e, 0x01, 0x4f, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x89, 0x03, 0x9f, 0x01, 0x50, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8a, 0x03, 0xa0, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x8b, 0x03, 0xa1, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8c, 0x03, 0xa2, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x8d, 0x03, 0xa3, 0x01, 0x51, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x8e, 0x03, 0xa4, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x8f, 0x03, 0xa5, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x90, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x91, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x92, 0x03, 0xa7, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x93, 0x03, 0xa8, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x94, 0x03, 0xa9, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x95, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x96, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00
.byte 0x03, 0x00, 0x00, 0x00
.byte 0x84, 0x03, 0x9c, 0x01, 0x4b, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x85, 0x03, 0x9c, 0x01, 0x4c, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x86, 0x03, 0x9c, 0x01, 0x4d, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x87, 0x03, 0x9d, 0x01, 0x4e, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x88, 0x03, 0x9e, 0x01, 0x4f, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x89, 0x03, 0x9f, 0x01, 0x50, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8a, 0x03, 0xa0, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8b, 0x03, 0xa1, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8c, 0x03, 0xa2, 0x01, 0x51, 0x00, 0x66, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8d, 0x03, 0xa3, 0x01, 0x51, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8e, 0x03, 0xa4, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x8f, 0x03, 0xa5, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x90, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x91, 0x03, 0xa6, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x92, 0x03, 0xa7, 0x01, 0x52, 0x00, 0x67, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x93, 0x03, 0xa8, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x94, 0x03, 0xa9, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x95, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x96, 0x03, 0xaa, 0x01, 0x53, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x97, 0x03, 0xaa, 0x01, 0x54, 0x00, 0x68, 0x00, 0x01, 0x00, 0x2e, 0x00, 0x03, 0x00, 0x00, 0x00
data/dungeon/SouthernCavern/floor_id.inc
+49 -27
View File
@@ -1,32 +1,54 @@
.global SouthernCavernFloorID
SouthernCavernFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf8, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00
.byte 0xf9, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfa, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0xfb, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfc, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0xfd, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x5b, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0xff, 0x02, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 0x03, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x01, 0x03, 0x5d, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x02, 0x03, 0x5e, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x03, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x04, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x05, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x06, 0x03, 0x60, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x07, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x08, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x09, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0a, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x0b, 0x03, 0x62, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0c, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x0d, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x0e, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x0f, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x10, 0x03, 0x65, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x11, 0x03, 0x66, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x12, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x13, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x14, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x15, 0x03, 0x67, 0x01, 0x43, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x16, 0x03, 0x68, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x17, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x18, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x19, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1a, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x1b, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1c, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x1d, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x1e, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x1f, 0x03, 0x6b, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x20, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x21, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x22, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x23, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x24, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x25, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x26, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00, 0x27, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00, 0x28, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x39, 0x00, 0x00, 0x00
.byte 0xf8, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xf9, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xfa, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xfb, 0x02, 0x59, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xfc, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xfd, 0x02, 0x5a, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xfe, 0x02, 0x5b, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0xff, 0x02, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x00, 0x03, 0x5c, 0x01, 0x41, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x01, 0x03, 0x5d, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x02, 0x03, 0x5e, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x03, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x04, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x05, 0x03, 0x5f, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x06, 0x03, 0x60, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x07, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x08, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x09, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0a, 0x03, 0x61, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0b, 0x03, 0x62, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0c, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0d, 0x03, 0x63, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0e, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x0f, 0x03, 0x64, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x10, 0x03, 0x65, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x11, 0x03, 0x66, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x12, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x13, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x14, 0x03, 0x67, 0x01, 0x42, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x15, 0x03, 0x67, 0x01, 0x43, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x16, 0x03, 0x68, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x17, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x18, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x19, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1a, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1b, 0x03, 0x69, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1c, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1d, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1e, 0x03, 0x6a, 0x01, 0x44, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x1f, 0x03, 0x6b, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x20, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x21, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x22, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x23, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x24, 0x03, 0x6c, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x25, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x26, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x27, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5d, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x28, 0x03, 0x6d, 0x01, 0x45, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
.byte 0x29, 0x03, 0x6d, 0x01, 0x46, 0x00, 0x5f, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x39, 0x00, 0x00, 0x00
data/dungeon/ThunderwaveCave/pokemon_found.inc
+28
View File
@@ -0,0 +1,28 @@
.global ThunderwaveCave_1F_2F_Pokemon
ThunderwaveCave_1F_2F_Pokemon:
.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ThunderwaveCave_3F_Pokemon
ThunderwaveCave_3F_Pokemon:
.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00
.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00
.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ThunderwaveCave_4F_5F_Pokemon
ThunderwaveCave_4F_5F_Pokemon:
.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00
.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00
.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/TinyWoods/pokemon_found.inc
+18
View File
@@ -0,0 +1,18 @@
.global TinyWoods1F_2FPokemon
TinyWoods1F_2F_Pokemon:
.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global TinyWoods3FPokemon
TinyWoods3F_Pokemon:
.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
data/dungeon/WyvernHill/floor_id.inc
+29 -15
View File
@@ -1,20 +1,34 @@
.global WyvernHillFloorID
WyvernHillFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2a, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2b, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x2c, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2d, 0x03, 0x6f, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x2e, 0x03, 0x70, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x2f, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x30, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x31, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x32, 0x03, 0x72, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x33, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x34, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x35, 0x03, 0x74, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x36, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x37, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x38, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x39, 0x03, 0x76, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x3a, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3b, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x3c, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3d, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x3e, 0x03, 0x78, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x3f, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x40, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x41, 0x03, 0x7a, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x42, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x43, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x44, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00, 0x45, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00
.byte 0x42, 0x00, 0x00, 0x00, 0x46, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2a, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2b, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2c, 0x03, 0x6e, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2d, 0x03, 0x6f, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2e, 0x03, 0x70, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x2f, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x30, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x31, 0x03, 0x71, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x32, 0x03, 0x72, 0x01, 0x07, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x33, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x34, 0x03, 0x73, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x35, 0x03, 0x74, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x36, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x37, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x38, 0x03, 0x75, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x39, 0x03, 0x76, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3a, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3b, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3c, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3d, 0x03, 0x77, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3e, 0x03, 0x78, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x3f, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x40, 0x03, 0x79, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x41, 0x03, 0x7a, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x42, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x43, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x44, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x45, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x60, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x46, 0x03, 0x7b, 0x01, 0x09, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
.byte 0x47, 0x03, 0x7c, 0x01, 0x47, 0x00, 0x61, 0x00, 0x5e, 0x00, 0x2e, 0x00, 0x42, 0x00, 0x00, 0x00
data/dungeon/banfont.inc
+12 -3
View File
@@ -1,7 +1,11 @@
.global banfont_SIRO
banfont_SIRO:
.byte 0x53, 0x49, 0x52, 0x4f, 0x98, 0xbb, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0
.string "SIRO"
.4byte banfont_table
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0
.byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0
.byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xa0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0
.byte 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xd0, 0x45, 0xfa, 0x0f, 0x0f, 0x0e, 0x02
@@ -282,4 +286,9 @@ banfont_SIRO:
.byte 0x4a, 0xb2, 0x49, 0x08, 0x6b, 0x00, 0x0a, 0x00, 0xce, 0xb2, 0x49, 0x08, 0x6c, 0x00, 0x04, 0x00, 0x37, 0xb3, 0x49, 0x08, 0x6d, 0x00, 0x0f, 0x00, 0xbc, 0xb3, 0x49, 0x08, 0x6e, 0x00, 0x09, 0x00
.byte 0x35, 0xb4, 0x49, 0x08, 0x6f, 0x00, 0x0a, 0x00, 0xb0, 0xb4, 0x49, 0x08, 0x70, 0x00, 0x0a, 0x00, 0x36, 0xb5, 0x49, 0x08, 0x72, 0x00, 0x09, 0x00, 0x9f, 0xb5, 0x49, 0x08, 0x73, 0x00, 0x0a, 0x00
.byte 0x1b, 0xb6, 0x49, 0x08, 0x74, 0x00, 0x0b, 0x00, 0x91, 0xb6, 0x49, 0x08, 0x75, 0x00, 0x0a, 0x00, 0x08, 0xb7, 0x49, 0x08, 0x76, 0x00, 0x0a, 0x00, 0x82, 0xb7, 0x49, 0x08, 0x77, 0x00, 0x0d, 0x00
.byte 0x09, 0xb8, 0x49, 0x08, 0x78, 0x00, 0x0a, 0x00, 0x87, 0xb8, 0x49, 0x08, 0x79, 0x00, 0x0a, 0x00, 0x0b, 0xb9, 0x49, 0x08, 0x7a, 0x00, 0x0a, 0x00, 0x80, 0xb9, 0x49, 0x08, 0x43, 0x00, 0x00, 0x00
.byte 0x09, 0xb8, 0x49, 0x08, 0x78, 0x00, 0x0a, 0x00, 0x87, 0xb8, 0x49, 0x08, 0x79, 0x00, 0x0a, 0x00, 0x0b, 0xb9, 0x49, 0x08, 0x7a, 0x00, 0x0a, 0x00
.global banfont_table
banfont_table:
.byte 0x80, 0xb9, 0x49, 0x08
.byte 0x43, 0x00, 0x00, 0x00
data/dungeon/colvec.inc
+8 -1
View File
@@ -1,6 +1,13 @@
.global colvec_SIRO
colvec_SIRO:
.byte 0x53, 0x49, 0x52, 0x4f, 0xf0, 0xbb, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff
.string "SIRO"
.4byte colvec
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global colvec
colvec:
.byte 0x00, 0x00, 0x00, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff
.byte 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x07, 0x07, 0x07, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff
.byte 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x0f, 0x0f, 0x0f, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff
.byte 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x17, 0x17, 0x17, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x1f, 0x1f, 0x1f, 0xff
data/dungeon/etcfonta.inc
+8 -2
View File
@@ -1,7 +1,13 @@
.global etcfonta_SIRO
etcfonta_SIRO:
.byte 0x53, 0x49, 0x52, 0x4f, 0x44, 0xe2, 0x49, 0x08, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x09, 0x00, 0x90, 0xa9, 0x99, 0x09, 0x90, 0xa9, 0x99, 0x09, 0x00, 0x90, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00
.string "SIRO"
.4byte etcfonta
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global etcfonta
etcfonta:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x09, 0x00, 0x90, 0xa9, 0x99, 0x09, 0x90, 0xa9, 0x99, 0x09, 0x00, 0x90, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x90, 0xaa, 0x99, 0x90, 0x99, 0xaa, 0x99, 0x90, 0x99, 0xaa, 0x99, 0x00, 0x90, 0xaa, 0x99, 0x00, 0x00, 0x00, 0x90
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x99, 0x99, 0x09, 0x00, 0x99, 0x99, 0x99, 0x09, 0x99, 0x99, 0x99, 0x09, 0x99, 0x99, 0x09, 0x00, 0x09, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x0a, 0x00
data/dungeon/itempat.inc
+12 -2
View File
@@ -1,7 +1,12 @@
.global itempat_SIRO
itempat_SIRO:
.string "SIRO"
.byte 0x04, 0x14, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte itempat_table
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global itempat
itempat:
.byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x91, 0x01, 0x00, 0x00, 0x10, 0x19, 0x00, 0x00, 0x10, 0x89, 0x01, 0x00, 0x00, 0xa1, 0x18
.byte 0x00, 0x00, 0x81, 0x9a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa9, 0x00, 0x00, 0x10, 0xa8, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00
@@ -98,4 +103,9 @@ itempat_SIRO:
.byte 0x10, 0x34, 0x43, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x11, 0xf3, 0x01, 0x00, 0x1f, 0x43, 0x1f, 0x00, 0x43, 0x38, 0x14, 0x00, 0xff, 0x98, 0x43, 0x01, 0xff, 0x81, 0x14, 0x00
.byte 0x43, 0x11, 0x01, 0x00, 0x00, 0xf1, 0xf3, 0x3f, 0x00, 0x10, 0xf4, 0x4f, 0x00, 0xd1, 0x18, 0x11, 0x00, 0x10, 0xda, 0x18, 0x00, 0x00, 0x11, 0x8a, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x1f, 0x98, 0x19, 0x00, 0x81, 0x8a, 0x01, 0x00, 0x91, 0x11, 0x01, 0x00, 0x1d, 0x98, 0x1a, 0x00, 0x89, 0x19, 0x01, 0x00, 0x18, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global itempat_table
itempat_table:
.4byte itempat
.byte 0x00, 0x00, 0x00, 0x00
data/dungeon/jyochu.inc
+10 -2
View File
@@ -1,7 +1,11 @@
.global jyochu_SIRO
jyochu_SIRO:
.string "SIRO"
.byte 0x44, 0x1f, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00
.4byte jyochu_table
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0x00, 0x00
.byte 0xf0, 0x01, 0xf0, 0x80, 0x00, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x10, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x20, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80
.byte 0x30, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xf0, 0x01, 0xf0, 0x80, 0x40, 0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@ -91,6 +95,10 @@ jyochu_SIRO:
.byte 0xa7, 0x6f, 0x00, 0x80, 0xdf, 0xb7, 0x00, 0x80, 0xff, 0xf7, 0x00, 0x80, 0x00, 0x67, 0xb7, 0x80, 0x1f, 0x9f, 0xe7, 0x80, 0x9f, 0xe7, 0xff, 0x80, 0x9f, 0x00, 0x00, 0x80, 0xd7, 0x3f, 0x00, 0x80
.byte 0xff, 0x87, 0x5f, 0x80, 0xff, 0x87, 0xbf, 0x80, 0xff, 0xff, 0xff, 0x80, 0x1c, 0x14, 0x4a, 0x08, 0x30, 0x14, 0x4a, 0x08, 0x44, 0x14, 0x4a, 0x08, 0x58, 0x14, 0x4a, 0x08, 0x6c, 0x14, 0x4a, 0x08
.byte 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08, 0x84, 0x14, 0x4a, 0x08
.byte 0x20, 0x1f, 0x4a, 0x08, 0x0c, 0x1f, 0x4a, 0x08, 0x40, 0x1f, 0x4a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x14, 0x4a, 0x08, 0xcc, 0x1e, 0x4a, 0x08
.byte 0x20, 0x1f, 0x4a, 0x08
.global jyochu_table
jyochu_table:
.byte 0x0c, 0x1f, 0x4a, 0x08, 0x40, 0x1f, 0x4a, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x14, 0x4a, 0x08, 0xcc, 0x1e, 0x4a, 0x08
.byte 0x50, 0x00, 0x00, 0x00
data/dungeon/levfont.inc
+7 -1
View File
@@ -1,7 +1,13 @@
.global levfont_SIRO
levfont_SIRO:
.string "SIRO"
.byte 0x74, 0x1f, 0x4a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte levfont
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global levfont
levfont:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x01, 0x11, 0x11, 0x11, 0x11, 0x11, 0x61, 0x16, 0x11
.byte 0x11, 0x46, 0x64, 0x11, 0x11, 0x46, 0x64, 0x11, 0x11, 0x61, 0x16, 0x11, 0x11, 0x11, 0x11, 0x11, 0x10, 0x11, 0x11, 0x01, 0x10, 0xfc, 0xcf, 0x01, 0x11, 0x1f, 0xf1, 0x11, 0x11, 0x11, 0xf1, 0x11
.byte 0x11, 0x11, 0xcf, 0x11, 0x11, 0xf1, 0x1c, 0x11, 0x11, 0xcf, 0x11, 0x11, 0x11, 0xff, 0xff, 0x11, 0x50, 0x55, 0x55, 0x05, 0x10, 0xfc, 0xcf, 0x01, 0x11, 0x1f, 0xf1, 0x11, 0x11, 0x11, 0xf1, 0x11
data/dungeon/pokemon_found.inc
+122 -395
View File
@@ -1,398 +1,40 @@
@ Start of Pokemon Found (0x84b6064)
.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.include "data/dungeon/TinyWoods/pokemon_found.inc"
.include "data/dungeon/ThunderwaveCave/pokemon_found.inc"
.include "data/dungeon/MtSteel/pokemon_found.inc"
.include "data/dungeon/SinisterWoods/pokemon_found.inc"
.include "data/dungeon/SilentChasm/pokemon_found.inc"
.include "data/dungeon/MtThunder/pokemon_found.inc"
.include "data/dungeon/MtThunderPeak/pokemon_found.inc"
.include "data/dungeon/GreatCanyon/pokemon_found.inc"
.include "data/dungeon/LapisCave/pokemon_found.inc"
.byte 0x12, 0x20, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
.byte 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x09, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00
.byte 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00
.byte 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00
.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00
.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00
.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00
.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00
.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00
.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00
.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00
.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00
.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00
.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00
.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00
.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00
.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00
.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00
.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00
.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00
.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00
.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00
.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00
.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00
.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00
.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00
.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00
.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00
.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00
.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00
.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00
.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00
.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00
.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00
.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00
.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00
.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00
.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00
.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00
.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00
.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00
.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00
.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00
.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00
.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00
.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00
.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00
.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00
.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00
.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00
.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00
.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00
.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00
.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00
.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00
.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00
.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00
.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x65, 0x1d, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x1c, 0xc4, 0x09
.byte 0xc4, 0x09, 0x00, 0x00, 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xef, 0x1c, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1e, 0x05, 0x0c
.byte 0x05, 0x0c, 0x00, 0x00, 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00, 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00, 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x3b, 0x1d, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x05, 0x0d
.byte 0x05, 0x0d, 0x00, 0x00, 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x53, 0x1f, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x1c, 0x88, 0x13
.byte 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x14, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x20, 0x29, 0x0b
.byte 0x29, 0x0b, 0x00, 0x00, 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00, 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x09, 0x23, 0x70, 0x17
.byte 0x70, 0x17, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00, 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00, 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07
.byte 0xee, 0x1e, 0xd0, 0x07
.byte 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0x96, 0x0d
@@ -1919,19 +1561,104 @@
.global DungeonPokemonFoundTable
DungeonPokemonFoundTable:
.byte 0x64, 0x60, 0x4b, 0x08
.byte 0x94, 0x60, 0x4b, 0x08, 0xcc, 0x60, 0x4b, 0x08, 0xfc, 0x60, 0x4b, 0x08, 0x34, 0x61, 0x4b, 0x08, 0x6c, 0x61, 0x4b, 0x08, 0xa4, 0x61, 0x4b, 0x08, 0xe4, 0x61, 0x4b, 0x08, 0x24, 0x62, 0x4b, 0x08
.byte 0x6c, 0x62, 0x4b, 0x08, 0xa4, 0x62, 0x4b, 0x08, 0xd4, 0x62, 0x4b, 0x08, 0x0c, 0x63, 0x4b, 0x08, 0x4c, 0x63, 0x4b, 0x08, 0x94, 0x63, 0x4b, 0x08, 0xcc, 0x63, 0x4b, 0x08, 0x0c, 0x64, 0x4b, 0x08
.byte 0x44, 0x64, 0x4b, 0x08, 0x84, 0x64, 0x4b, 0x08, 0xd4, 0x64, 0x4b, 0x08, 0x14, 0x65, 0x4b, 0x08, 0x4c, 0x65, 0x4b, 0x08, 0x7c, 0x65, 0x4b, 0x08, 0xbc, 0x65, 0x4b, 0x08, 0xf4, 0x65, 0x4b, 0x08
.byte 0x3c, 0x66, 0x4b, 0x08, 0x94, 0x66, 0x4b, 0x08, 0xec, 0x66, 0x4b, 0x08, 0x34, 0x67, 0x4b, 0x08, 0x7c, 0x67, 0x4b, 0x08, 0xb4, 0x67, 0x4b, 0x08, 0xf4, 0x67, 0x4b, 0x08, 0x2c, 0x68, 0x4b, 0x08
.byte 0x64, 0x68, 0x4b, 0x08, 0xa4, 0x68, 0x4b, 0x08, 0xec, 0x68, 0x4b, 0x08, 0x2c, 0x69, 0x4b, 0x08, 0x64, 0x69, 0x4b, 0x08, 0xa4, 0x69, 0x4b, 0x08, 0xc4, 0x69, 0x4b, 0x08, 0xfc, 0x69, 0x4b, 0x08
.byte 0x2c, 0x6a, 0x4b, 0x08, 0x64, 0x6a, 0x4b, 0x08, 0xa4, 0x6a, 0x4b, 0x08, 0xdc, 0x6a, 0x4b, 0x08, 0x14, 0x6b, 0x4b, 0x08, 0x3c, 0x6b, 0x4b, 0x08, 0x6c, 0x6b, 0x4b, 0x08, 0x94, 0x6b, 0x4b, 0x08
.byte 0xbc, 0x6b, 0x4b, 0x08, 0xec, 0x6b, 0x4b, 0x08, 0x1c, 0x6c, 0x4b, 0x08, 0x44, 0x6c, 0x4b, 0x08, 0x74, 0x6c, 0x4b, 0x08, 0x9c, 0x6c, 0x4b, 0x08, 0xbc, 0x6c, 0x4b, 0x08, 0xf4, 0x6c, 0x4b, 0x08
.byte 0x24, 0x6d, 0x4b, 0x08, 0x5c, 0x6d, 0x4b, 0x08, 0x8c, 0x6d, 0x4b, 0x08, 0xbc, 0x6d, 0x4b, 0x08, 0xf4, 0x6d, 0x4b, 0x08, 0x24, 0x6e, 0x4b, 0x08, 0x4c, 0x6e, 0x4b, 0x08, 0x6c, 0x6e, 0x4b, 0x08
.byte 0x94, 0x6e, 0x4b, 0x08, 0xc4, 0x6e, 0x4b, 0x08, 0xfc, 0x6e, 0x4b, 0x08, 0x2c, 0x6f, 0x4b, 0x08, 0x5c, 0x6f, 0x4b, 0x08, 0x94, 0x6f, 0x4b, 0x08, 0xbc, 0x6f, 0x4b, 0x08, 0xdc, 0x6f, 0x4b, 0x08
.byte 0x0c, 0x70, 0x4b, 0x08, 0x4c, 0x70, 0x4b, 0x08, 0x7c, 0x70, 0x4b, 0x08, 0xb4, 0x70, 0x4b, 0x08, 0xe4, 0x70, 0x4b, 0x08, 0x14, 0x71, 0x4b, 0x08, 0x3c, 0x71, 0x4b, 0x08, 0x5c, 0x71, 0x4b, 0x08
.byte 0x94, 0x71, 0x4b, 0x08, 0xcc, 0x71, 0x4b, 0x08, 0xfc, 0x71, 0x4b, 0x08, 0x34, 0x72, 0x4b, 0x08, 0x5c, 0x72, 0x4b, 0x08, 0x94, 0x72, 0x4b, 0x08, 0xd4, 0x72, 0x4b, 0x08, 0x0c, 0x73, 0x4b, 0x08
.byte 0x3c, 0x73, 0x4b, 0x08, 0x64, 0x73, 0x4b, 0x08, 0x94, 0x73, 0x4b, 0x08, 0xcc, 0x73, 0x4b, 0x08, 0xf4, 0x73, 0x4b, 0x08, 0x14, 0x74, 0x4b, 0x08, 0x3c, 0x74, 0x4b, 0x08, 0x64, 0x74, 0x4b, 0x08
.4byte TinyWoods1F_2F_Pokemon
.4byte TinyWoods3F_Pokemon
.4byte ThunderwaveCave_1F_2F_Pokemon
.4byte ThunderwaveCave_3F_Pokemon
.4byte ThunderwaveCave_4F_5F_Pokemon
.4byte MtSteel_1F_4F_Pokemon
.4byte MtSteel_5F_Pokemon
.4byte MtSteel_6F_Pokemon
.4byte MtSteel_7F_8F_Pokemon
.4byte MtSteel_9F_Pokemon
.4byte SinisterWoods_1F_Pokemon
.4byte SinisterWoods_2F_Pokemon
.4byte SinisterWoods_3F_Pokemon
.4byte SinisterWoods_4F_Pokemon
.4byte SinisterWoods_5F_Pokemon
.4byte SinisterWoods_6F_Pokemon
.4byte SinisterWoods_7F_Pokemon
.4byte SinisterWoods_8F_9F_Pokemon
.4byte SinisterWoods_10F_Pokemon
.4byte SinisterWoods_11F_Pokemon
.4byte SinisterWoods_12F_Pokemon
.4byte SinisterWoods_13F_Pokemon
.4byte SilentChasm_1F_3F_Pokemon
.4byte SilentChasm_4F_Pokemon
.4byte SilentChasm_5F_Pokemon
.4byte SilentChasm_6F_Pokemon
.4byte SilentChasm_7F_Pokemon
.4byte SilentChasm_8F_Pokemon
.4byte SilentChasm_9F_Pokemon
.4byte MtThunder_1F_Pokemon
.4byte MtThunder_2F_4F_Pokemon
.4byte MtThunder_5F_Pokemon
.4byte MtThunder_6F_Pokemon
.4byte MtThunder_7F_Pokemon
.4byte MtThunder_8F_Pokemon
.4byte MtThunder_9F_Pokemon
.4byte MtThunder_10F_Pokemon
.4byte MtThunderPeak_1F_2F_Pokemon
.4byte MtThunderPeak_3F_Pokemon
.4byte GreatCanyon_1F_3F_Pokemon
.4byte GreatCanyon_4F_Pokemon
.4byte GreatCanyon_5F_Pokemon
.4byte GreatCanyon_6F_Pokemon
.4byte GreatCanyon_7F_Pokemon
.4byte GreatCanyon_8F_Pokemon
.4byte GreatCanyon_9F_Pokemon
.4byte GreatCanyon_10F_11F_Pokemon
.4byte GreatCanyon_12F_Pokemon
.4byte LapisCave_1F_3F_Pokemon
.4byte LapisCave_4F_Pokemon
.4byte LapisCave_5F_8F_Pokemon
.4byte LapisCave_9F_10F_Pokemon
.4byte LapisCave_11F_12F_Pokemon
.4byte LapisCave_13F_Pokemon
.4byte LapisCave_14F_Pokemon
.byte 0xbc, 0x6c, 0x4b, 0x08
.byte 0xf4, 0x6c, 0x4b, 0x08
.byte 0x24, 0x6d, 0x4b, 0x08
.byte 0x5c, 0x6d, 0x4b, 0x08
.byte 0x8c, 0x6d, 0x4b, 0x08
.byte 0xbc, 0x6d, 0x4b, 0x08
.byte 0xf4, 0x6d, 0x4b, 0x08
.byte 0x24, 0x6e, 0x4b, 0x08
.byte 0x4c, 0x6e, 0x4b, 0x08
.byte 0x6c, 0x6e, 0x4b, 0x08
.byte 0x94, 0x6e, 0x4b, 0x08
.byte 0xc4, 0x6e, 0x4b, 0x08
.byte 0xfc, 0x6e, 0x4b, 0x08
.byte 0x2c, 0x6f, 0x4b, 0x08
.byte 0x5c, 0x6f, 0x4b, 0x08
.byte 0x94, 0x6f, 0x4b, 0x08
.byte 0xbc, 0x6f, 0x4b, 0x08
.byte 0xdc, 0x6f, 0x4b, 0x08
.byte 0x0c, 0x70, 0x4b, 0x08
.byte 0x4c, 0x70, 0x4b, 0x08
.byte 0x7c, 0x70, 0x4b, 0x08
.byte 0xb4, 0x70, 0x4b, 0x08
.byte 0xe4, 0x70, 0x4b, 0x08
.byte 0x14, 0x71, 0x4b, 0x08
.byte 0x3c, 0x71, 0x4b, 0x08
.byte 0x5c, 0x71, 0x4b, 0x08
.byte 0x94, 0x71, 0x4b, 0x08
.byte 0xcc, 0x71, 0x4b, 0x08
.byte 0xfc, 0x71, 0x4b, 0x08
.byte 0x34, 0x72, 0x4b, 0x08
.byte 0x5c, 0x72, 0x4b, 0x08
.byte 0x94, 0x72, 0x4b, 0x08
.byte 0xd4, 0x72, 0x4b, 0x08
.byte 0x0c, 0x73, 0x4b, 0x08
.byte 0x3c, 0x73, 0x4b, 0x08
.byte 0x64, 0x73, 0x4b, 0x08
.byte 0x94, 0x73, 0x4b, 0x08
.byte 0xcc, 0x73, 0x4b, 0x08
.byte 0xf4, 0x73, 0x4b, 0x08
.byte 0x14, 0x74, 0x4b, 0x08
.byte 0x3c, 0x74, 0x4b, 0x08
.byte 0x64, 0x74, 0x4b, 0x08
.byte 0x8c, 0x74, 0x4b, 0x08, 0xcc, 0x74, 0x4b, 0x08, 0x04, 0x75, 0x4b, 0x08, 0x34, 0x75, 0x4b, 0x08, 0x64, 0x75, 0x4b, 0x08, 0x9c, 0x75, 0x4b, 0x08, 0xdc, 0x75, 0x4b, 0x08, 0x1c, 0x76, 0x4b, 0x08
.byte 0x5c, 0x76, 0x4b, 0x08, 0x94, 0x76, 0x4b, 0x08, 0xcc, 0x76, 0x4b, 0x08, 0x0c, 0x77, 0x4b, 0x08, 0x4c, 0x77, 0x4b, 0x08, 0x84, 0x77, 0x4b, 0x08, 0xcc, 0x77, 0x4b, 0x08, 0xec, 0x77, 0x4b, 0x08
.byte 0x3c, 0x78, 0x4b, 0x08, 0x7c, 0x78, 0x4b, 0x08, 0xc4, 0x78, 0x4b, 0x08, 0xfc, 0x78, 0x4b, 0x08, 0x44, 0x79, 0x4b, 0x08, 0x8c, 0x79, 0x4b, 0x08, 0xcc, 0x79, 0x4b, 0x08, 0x0c, 0x7a, 0x4b, 0x08
data/dungeon/trappat.inc
+12 -2
View File
@@ -1,7 +1,13 @@
.global Trappat_SIRO
Trappat_SIRO:
.string "SIRO"
.byte 0xa0, 0x45, 0x4f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00
.4byte trappat_table
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.global trappat
trappat:
.byte 0x05, 0x01, 0x00, 0x00
.byte 0x34, 0x33, 0x33, 0x33, 0x45, 0x44, 0x44, 0x44, 0x45, 0x56, 0x44, 0x44, 0x45, 0x45, 0x44, 0x44, 0x45, 0x44, 0x44, 0x44, 0x45, 0x44, 0x44, 0x64, 0x45, 0x44, 0x44, 0x76, 0x45, 0x44, 0x54, 0x76
.byte 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x65, 0x77, 0x67, 0x56, 0x76, 0x77, 0x77, 0x67, 0x77, 0x77, 0x77, 0x67, 0xf7, 0xff, 0x67, 0x56
.byte 0x33, 0x33, 0x33, 0x33, 0x44, 0x44, 0x44, 0x34, 0x44, 0x44, 0x65, 0x34, 0x44, 0x44, 0x54, 0x34, 0x44, 0x44, 0x44, 0x34, 0x56, 0x44, 0x44, 0x34, 0x55, 0x45, 0x44, 0x34, 0x66, 0x35, 0x43, 0x34
@@ -267,4 +273,8 @@ Trappat_SIRO:
.byte 0x57, 0x2f, 0x7f, 0xff, 0x87, 0x6f, 0x97, 0xff, 0x9f, 0x4f, 0x4f, 0xff, 0xd7, 0x5f, 0x5f, 0xff, 0xff, 0x8f, 0x87, 0xff, 0xdf, 0xb7, 0x00, 0xff, 0xff, 0xdf, 0x6f, 0xff, 0xef, 0xf7, 0xe7, 0xff
.byte 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x1f, 0x1f, 0xff, 0x3f, 0x37, 0x47, 0xff, 0x67, 0x5f, 0x67, 0xff, 0x87, 0x87, 0x87, 0xff, 0xaf, 0xaf, 0xa7, 0xff, 0xcf, 0xd7, 0xc7, 0xff
.byte 0x4f, 0x97, 0x4f, 0xff, 0x47, 0xb7, 0x47, 0xff, 0x9f, 0x57, 0x0f, 0xff, 0xbf, 0x67, 0x17, 0xff, 0xdf, 0x77, 0x1f, 0xff, 0x7f, 0xff, 0x8f, 0xff, 0xb7, 0xe7, 0xf7, 0xff, 0xef, 0xf7, 0xe7, 0xff
.byte 0x7c, 0x24, 0x4f, 0x08, 0x20, 0x45, 0x4f, 0x08
.global trappat_table
trappat_table:
.4byte trappat
.byte 0x20, 0x45, 0x4f, 0x08
data/dungeon/zmappat.inc
+4 -1
View File
@@ -1,7 +1,7 @@
.global Zmappat_SIRO
Zmappat_SIRO:
.string "SIRO"
.byte 0xf8, 0x11, 0x50, 0x08
.4byte zmappat_table
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
@@ -1680,5 +1680,8 @@ Zmappat_SIRO:
.byte 0x37, 0xa7, 0x2f, 0xff, 0x00, 0x00, 0x00, 0x00
.byte 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x07, 0x00, 0x00, 0xe7, 0xe7, 0x00, 0xe7, 0xe7, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xaf, 0xaf, 0xaf, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00
.global zmapat_table
zmappat_table:
.byte 0xb8, 0x05, 0x50, 0x08
.byte 0xb8, 0x11, 0x50, 0x08
data/dungeon_sbin.s
+102 -37
View File
@@ -571,57 +571,57 @@ StartOfDungeonTable:
.4byte PartnerConversion18SIRO
.byte 0x58, 0x0f, 0x3b, 0x08
.4byte PartnerConversion19SIRO
.byte 0x50, 0x0f, 0x3b, 0x08
.4byte talkp2_string
.4byte PartnerConversion2SIRO
.byte 0x48, 0x0f, 0x3b, 0x08
.4byte talkp20_string
.4byte PartnerConversion20SIRO
.byte 0x40, 0x0f, 0x3b, 0x08
.4byte talkp21_string
.4byte PartnerConversion21SIRO
.byte 0x38, 0x0f, 0x3b, 0x08
.4byte talkp22_string
.4byte PartnerConversion22SIRO
.byte 0x30, 0x0f, 0x3b, 0x08
.4byte talkp23_string
.4byte PartnerConversion23SIRO
.byte 0x28, 0x0f, 0x3b, 0x08
.4byte talkp24_string
.4byte PartnerConversion24SIRO
.byte 0x20, 0x0f, 0x3b, 0x08
.4byte talkp25_string
.4byte PartnerConversion25SIRO
.byte 0x18, 0x0f, 0x3b, 0x08
.4byte talkp26_string
.4byte PartnerConversion26SIRO
.byte 0x10, 0x0f, 0x3b, 0x08
.4byte talkp27_string
.4byte PartnerConversion27SIRO
.byte 0x08, 0x0f, 0x3b, 0x08
.4byte talkp28_string
.4byte PartnerConversion28SIRO
.byte 0x00, 0x0f, 0x3b, 0x08
.4byte talkp29_string
.4byte PartnerConversion29SIRO
.byte 0xf8, 0x0e, 0x3b, 0x08
.4byte talkp3_string
.4byte PartnerConversion3SIRO
.byte 0xf0, 0x0e, 0x3b, 0x08
.4byte talkp30_string
.4byte PartnerConversion30SIRO
.byte 0xe8, 0x0e, 0x3b, 0x08
.4byte talkp31_string
.4byte PartnerConversion31SIRO
.byte 0xe0, 0x0e, 0x3b, 0x08
.4byte talkp32_string
.4byte PartnerConversion32SIRO
.byte 0xd8, 0x0e, 0x3b, 0x08
.4byte talkp33_string
.4byte PartnerConversion33SIRO
.byte 0xd0, 0x0e, 0x3b, 0x08
.4byte talkp34_string
.4byte PartnerConversion34SIRO
.byte 0xc8, 0x0e, 0x3b, 0x08
.4byte talkp35_string
.4byte PartnerConversion35SIRO
.byte 0xc0, 0x0e, 0x3b, 0x08
.4byte talkp36_string
.4byte PartnerConversion36SIRO
.byte 0xb8, 0x0e, 0x3b, 0x08
.4byte talkp37_string
.4byte PartnerConversion37SIRO
.byte 0xb0, 0x0e, 0x3b, 0x08
.4byte talkp38_string
.4byte PartnerConversion38SIRO
.byte 0xa8, 0x0e, 0x3b, 0x08
.4byte talkp39_string
.4byte PartnerConversion39SIRO
.byte 0xa0, 0x0e, 0x3b, 0x08
.4byte talkp4_string
.4byte PartnerConversion4SIRO
.byte 0x98, 0x0e, 0x3b, 0x08
.4byte talkp40_string
.4byte PartnerConversion40SIRO
.byte 0x90, 0x0e, 0x3b, 0x08
.4byte talkp41_string
.4byte PartnerConversion41SIRO
.byte 0x88, 0x0e, 0x3b, 0x08
.4byte talkp42_string
.4byte PartnerConversion42SIRO
.4byte talkp5_string
.4byte PartnerConversion5SIRO
@@ -671,35 +671,87 @@ talkp5_string:
.string "talkp5\0"
.align 2,0
.global talkp42_string
talkp42_string:
.string "talkp42\0"
.global talkp41_string
talkp41_string:
.string "talkp41\0"
.global talkp40_string
talkp40_string:
.string "talkp40\0"
.global talkp4_string
talkp4_string:
.string "talkp4\0"
.align 2,0
.global talkp39_string
talkp39_string:
.string "talkp39\0"
.global talkp38_string
talkp38_string:
.string "talkp38\0"
.global talkp37_string
talkp37_string:
.string "talkp37\0"
.global talkp36_string
talkp36_string:
.string "talkp36\0"
.global talkp35_string
talkp35_string:
.string "talkp35\0"
.global talkp34_string
talkp34_string:
.string "talkp34\0"
.global talkp33_string
talkp33_string:
.string "talkp33\0"
.global talkp32_string
talkp32_string:
.string "talkp32\0"
.global talkp31_string
talkp31_string:
.string "talkp31\0"
.global talkp30_string
talkp30_string:
.string "talkp30\0"
.global talkp3_string
talkp3_string:
.string "talkp3\0"
.align 2,0
.global talkp29_string
talkp29_string:
.string "talkp29\0"
.global talkp28_string
talkp28_string:
.string "talkp28\0"
.global talkp27_string
talkp27_string:
.string "talkp27\0"
.global talkp26_string
talkp26_string:
.string "talkp26\0"
.global talkp25_string
talkp25_string:
.string "talkp25\0"
.global talkp24_string
talkp24_string:
.string "talkp24\0"
.global talkp23_string
talkp23_string:
.string "talkp23\0"
.global talkp22_string
talkp22_string:
.string "talkp22\0"
.global talkp21_string
talkp21_string:
.string "talkp21\0"
.global talkp20_string
talkp20_string:
.string "talkp20\0"
.global talkp2_string
talkp2_string:
.string "talkp2\0"
.align 2,0
@@ -812,17 +864,30 @@ talkp5_string:
.string "talk0\0"
.align 2,0
.byte 0x6d, 0x61, 0x70, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x00, 0x00, 0x00, 0x00
.byte 0x6c, 0x65, 0x76, 0x66, 0x6f, 0x6e, 0x74, 0x00
.byte 0x6a, 0x79, 0x6f, 0x63, 0x68, 0x75, 0x00, 0x00
.byte 0x69, 0x74, 0x65, 0x6d, 0x70, 0x61, 0x74, 0x00
.byte 0x68, 0x70, 0x35, 0x66, 0x6f, 0x6e, 0x74, 0x00
.byte 0x66, 0x69, 0x78, 0x65, 0x64, 0x6d, 0x61, 0x70, 0x00, 0x00, 0x00, 0x00
.byte 0x65, 0x74, 0x63, 0x66, 0x6f, 0x6e, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00
.byte 0x65, 0x74, 0x63, 0x66, 0x6f, 0x6e, 0x74, 0x00
.byte 0x63, 0x6f, 0x6c, 0x76, 0x65, 0x63, 0x00, 0x00
.byte 0x62, 0x61, 0x6e, 0x72, 0x70, 0x61, 0x6c, 0x00
.byte 0x62, 0x61, 0x6e, 0x66, 0x6f, 0x6e, 0x74, 0x00
.string "mapparam\0"
.align 2,0
.string "levfont\0"
.align 2,0
.string "jyochu\0"
.align 2,0
.string "itempat\0"
.align 2,0
.string "hp5font\0"
.align 2,0
.string "fixedmap\0"
.align 2,0
.string "etcfonta\0"
.align 2,0
.string "etcfont\0"
.align 2,0
.string "colvec\0"
.align 2,0
.string "banrpal\0"
.align 2,0
.string "banfont\0"
.align 2,0
@ B__ Groups
.byte 0x62, 0x37, 0x35, 0x70, 0x61, 0x6c, 0x00, 0x00
.byte 0x62, 0x37, 0x35, 0x66, 0x6f, 0x6e, 0x00, 0x00
.byte 0x62, 0x37, 0x35, 0x65, 0x6d, 0x61, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00
data/text/wonder_mail_4.inc
-207
View File
@@ -1,207 +0,0 @@
gUnknown_80E0C4C:: @ 80E0C4C
.string " So~2c what~27d you want to\n"
.string "know?\0"
.align 2, 0
gUnknown_80E0C70:: @ 80E0C70
.string " If you need to call for\n"
.string "help~2c first send your friend\n"
.string "an #CGSOS Mail#R.#P"
.string " Once you send that mail~2c\n"
.string "wait until your friend sends you back\n"
.string "an #CGA-OK Mail#R.#P"
.string " When you get that\n"
.string "#CGA-OK Mail#R back~2c your team\n"
.string "can continue from where it went down.#P"
.string " Make sure you send your\n"
.string "friend a #CGThank-You Mail#R.\n"
.string "That~27s if you get revived~2c of course.\0"
.align 2, 0
gUnknown_80E0DD0:: @ 80E0DD0
.string " If your team gets defeated\n"
.string "in a dungeon~2c you can send an #CGSOS Mail#R\n"
.string "to a friend willing to help.#P"
.string " But I have to warn you.\n"
.string "You can~27t get anyone to rescue you\n"
.string "in certain places.#P"
.string " If you need to send\n"
.string "an #CGSOS Mail#R~2c you send it from the\n"
.string "#CGmain menu#R.\0"
.align 2, 0
gUnknown_80E0ED8:: @ 80E0ED8
.string " If your friend manages to\n"
.string "rescue your team~2c you need to receive\n"
.string "an #CGA-OK Mail#R from your friend.#P"
.string " See~2c once you get that\n"
.string "#CGA-OK Mail#R~2c your team can continue from\n"
.string "where it went down in the dungeon.#P"
.string " And~2c if you use\n"
.string "a #CGGame Link cable#R~2c your friend can\n"
.string "even send you a #CGhelper Pokémon#R.#P"
.string " There~27s just one thing.\n"
.string "A #CGhelper Pokémon#R can~27t bring\n"
.string "any item it happens to be holding.#P"
.string " You can receive that\n"
.string "team-saving #CGA-OK Mail#R on the #CGmain menu#R~2c\n"
.string "all right?\0"
.align 2, 0
gUnknown_80E10C8:: @ 80E10C8
.string " If your team gets rescued~2c\n"
.string "be sure to send your friend\n"
.string "a #CGThank-You Mail#R.#P"
.string " You do that by going to\n"
.string "the #CGright counter#R~2c or\n"
.string "by selecting it from the #CGmain menu#R.#P"
.string " You can attach an item in\n"
.string "storage to your #CGThank-You Mail#R\n"
.string "as a #CGreward item#R.#P"
.string " You don~27t want to ever\n"
.string "forget to express your thanks.\0"
.align 2, 0
gUnknown_80E120C:: @ 80E120C
.string " If you want to go and\n"
.string "rescue your friend~27s KO~27d team~2c\n"
.string "you need to receive an #CGSOS Mail#R.#P"
.string " When you get that mail~2c\n"
.string "you can rescue your friend at\n"
.string "the #CGleft counter#R over there.#P"
.string " If you do manage to rescue\n"
.string "the team~2c you send your friend\n"
.string "an #CGA-OK Mail#R.#P"
.string " After you do that~2c your\n"
.string "friend can send back to you\n"
.string "a #CGThank-You Mail#R.\0"
.align 2, 0
gUnknown_80E136C:: @ 80E136C
.string " To go off on a rescue~2c\n"
.string "you first need to receive your friend~27s\n"
.string "#CGSOS Mail#R.#P"
.string " You do that at\n"
.string "the #CGleft counter#R over there~2c\n"
.string "or by selecting it from the #CGmain menu#R.\0"
.align 2, 0
gUnknown_80E1420:: @ 80E1420
.string " If you succeed in rescuing\n"
.string "that team~2c you send your friend an\n"
.string "#CGA-OK Mail#R.#P"
.string " You do that by going to\n"
.string "the #CGleft counter#R~2c\n"
.string "or from the #CGmain menu#R.#P"
.string " You can send your friend\n"
.string "a Pokémon as a helper from your Friend\n"
.string "Areas using a #CGGame Link cable#R.#P"
.string " This Pokémon won~27t\n"
.string "disappear from its Friend Area~2c so\n"
.string "don~27t you worry any.\0"
.align 2, 0
gUnknown_80E157C:: @ 80E157C
.string " If you get an #CGSOS Mail#R~2c\n"
.string "you head off on the rescue from\n"
.string "the #CGleft counter#R.#P"
.string " But~2c I have to warn you.\n"
.string "You can~27t go off to rescue in a dungeon\n"
.string "if you can~27t get into it.#P"
.string " You~27ll be able to get\n"
.string "there when you go farther in your\n"
.string "adventure~2c so it won~27t do to fret.\0"
.align 2, 0
gUnknown_80E169C:: @ 80E169C
.string " If you send your friend\n"
.string "an #CGA-OK Mail#R~2c you can look forward\n"
.string "to getting a #CGThank-You Mail#R back.#P"
.string " You can receive it at\n"
.string "the #CGright counter#R\n"
.string "or on the #CGmain menu#R.#P"
.string " But you need to #C2be careful#R.\n"
.string "You #C2must not delete the A-OK Mail#R\n"
.string "before you get the #CGThank-You Mail#R back.\0"
.align 2, 0
gUnknown_80E17C8:: @ 80E17C8
.string " I~27m your guide to what you\n"
.string "can expect at the Pelipper Post Office.\n"
.string "If you have any questions~2c just ask away!\0"
.align 2, 0
gUnknown_80E183C:: @ 80E183C
.string " Did you want to ask about\n"
.string "anything else?\0"
.align 2, 0
gUnknown_80E1868:: @ 80E1868
.string " #CGThe Pelipper Post Office#R\n"
.string "keeps track of information from\n"
.string "around the world.#P"
.string " We inform folks\n"
.string "about everything from gossip to calls\n"
.string "for help from fellow Pokémon.#P"
.string " For the latest news~2c check\n"
.string "#CGyour Mailbox#R or the #CGBulletin Board#R\n"
.string "outside~2c all right?#P"
.string " Oh~2c that~27s not all.\n"
.string "You can arrange for #CGFriend Rescue#R\n"
.string "missions at that counter there.#P"
.string " The #CGleft counter#R is\n"
.string "for rescues~2c and the #CGright counter#R\n"
.string "is for Thank-You Mail.\0"
.align 2, 0
gUnknown_80E1A30:: @ 80E1A30
.string " The #CGBulletin Board#R outside\n"
.string "here lists rescue requests.#P"
.string " Take on rescue jobs from\n"
.string "the Bulletin Board. Be a hero and handle\n"
.string "the jobs for fellow Pokémon in need!\0"
.align 2, 0
gUnknown_80E1AD8:: @ 80E1AD8
.string " If your rescue team\n"
.string "becomes famous for doing lots of rescues~2c\n"
.string "expect to get rescue requests directly.#P"
.string " Our delivery $m0\n"
.string "will take those jobs straight to your\n"
.string "#CGMailbox#R.\0"
.align 2, 0
gUnknown_80E1B88:: @ 80E1B88
.string " Friend Rescue is what we\n"
.string "call rescue missions between friends using\n"
.string "a #CGGame Link cable#R~2c #CGpasswords#R~2c etc.#P"
.string " For instance~2c you can send\n"
.string "out for help saying your team wiped out\n"
.string "in a dungeon at such and such a place.#P"
.string " Your friend could play\n"
.string "the hero and come to your team~27s rescue.\n"
.string "Or it can be the other way around~2c too.#P"
.string " If you use #CGpasswords#R~2c\n"
.string "you can do rescues with friends in\n"
.string "far-away places.#P"
.string " You can apply for Friend\n"
.string "Rescue jobs at the #CGleft counter#R of\n"
.string "that counter there.\0"
.align 2, 0
gUnknown_80E1D84:: @ 80E1D84
.string " Deleting mail just means\n"
.string "getting rid of old mail that you don~27t\n"
.string "need anymore.#P"
.string " If you do lots of Friend\n"
.string "Rescues~2c you~27ll find #CGSOS Mail#R and\n"
.string "#CGA-OK Mail#R piling up.#P"
.string " Once you get #CG30 pieces#R~2c\n"
.string "you won~27t be able to receive more mail.\n"
.string "That~27s why you~27ll need to delete old mail.#P"
.string " You can look through old\n"
.string "mail at the #CGleft counter#R over there.\0"
.align 2, 0
.string "pksdir0\0"
.align 2, 0
data/unk_data.s
+6 -6
View File
@@ -2,13 +2,13 @@
.string "pksdir0\0"
.4byte 1
.4byte unk_data_table
.4byte monpal_table
.string "pksdir0\0"
.global unk_data_table
unk_data_table:
.global monpal_table
monpal_table:
.4byte monpal_string
.4byte unkPalette
.4byte monPal
.global monpal_string
monpal_string:
@@ -17,8 +17,8 @@
.string "pksdir0\0"
@ Unknown Palette
.global unkPalette
unkPalette:
.global monPal
monPal:
.byte 0x00, 0x00, 0x00, 0x80
.byte 0x17, 0x17, 0x0f, 0x80
.byte 0x47, 0x37, 0x37, 0x80
include/constants/bg_music.h
+5
View File
@@ -1,6 +1,7 @@
#ifndef GUARD_BG_MUSIC_H
#define GUARD_BG_MUSIC_H
#define MUS_TEAM_BASE 1
#define MUS_POKEMON_SQUARE 7
#define MUS_LOADING_SCREEN 8
#define MUS_THERES_TROUBLE 10
@@ -9,6 +10,10 @@
#define MUS_WORLD_CALAMITY 19
#define MUS_INTRO 40
#define MUS_TITLE_SCREEN 43
#define MUS_CREDITS 44
#define MUS_EPILOGUE 45
#define MUS_DUNGEON_FAIL 51
#define MUS_DUNGEON_COMPLETE 52
#define NUM_BG_SONGS 128
include/debug_menu.h
+15
View File
@@ -13,6 +13,21 @@ enum DebugMenuOptions
MENU_DEBUG_MENU_H_OPEN = 9,
};
struct unkData
{
u8 unk0[24];
};
struct DebugMenu
{
// size: 0x1A4
u8 fill0[0x140];
/* 0x140 */ struct unkData unk140[4];
u32 fill1A0;
};
void CreateDebugMenu(void);
void DeleteDebugMenu(void);
u32 UpdateDebugMenu(void);
include/felicity_bank.h
+37
View File
@@ -0,0 +1,37 @@
#ifndef FELICITY_BANK_H
#define FELICITY_BANK_H
#include "file_system.h"
struct unkData
{
u8 unk0[24];
};
struct unkStruct_203B204
{
// size: 0x108
u32 unk0;
s32 currState;
u32 unk8;
u32 chosenAmount;
u32 unk10;
u8 fill14[0x64 - 0x14];
u32 unk64;
u8 fill68[0x78 - 0x68];
u32 unk78;
u8 fill7C[0x94 - 0x7C];
/* 0x94 */ struct OpenedFile *faceFile;
/* 0x98 */ u8 *faceData;
u16 unk9C;
u16 unk9E;
u8 unkA0;
u8 unkA1;
u8 unkA2;
u8 unkA3;
struct OpenedFile **unkA4;
struct unkData unkA8[4];
};
#endif
include/gUnknown_203B460.h
+28
View File
@@ -0,0 +1,28 @@
#ifndef GUNKNOWN_203B460_H
#define GUNKNOWN_203B460_H
struct ItemStruct_203B460
{
u8 unk0;
u8 numItems;
u8 itemIndex;
};
struct subStruct_203B460
{
u8 unk0;
u8 unk1;
};
struct unkStruct_203B460
{
struct ItemStruct_203B460 fill0[20];
u16 unk50[0x10];
u8 fill70[0x230 - 0x70];
struct subStruct_203B460 unk230[8];
struct subStruct_203B460 unk250[4]; // TODO: idk if this is identical struct or not.. Ghidra says sizes are same
/* 0x260 */ s32 teamMoney;
/* 0x264 */ u32 teamSavings;
};
#endif
include/gba/defines.h
+5 -3
View File
@@ -31,8 +31,10 @@
#define BG_VRAM VRAM
#define BG_VRAM_SIZE 0x10000
#define BG_CHAR_ADDR(n) (void *)(BG_VRAM + (0x4000 * (n)))
#define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (0x800 * (n)))
#define BG_CHAR_SIZE 0x4000
#define BG_SCREEN_SIZE 0x800
#define BG_CHAR_ADDR(n) (void *)(BG_VRAM + (BG_CHAR_SIZE * (n)))
#define BG_SCREEN_ADDR(n) (void *)(BG_VRAM + (BG_SCREEN_SIZE * (n)))
#define BG_TILE_ADDR(n) (void *)(BG_VRAM + (0x80 * (n)))
// text-mode BG
@@ -61,4 +63,4 @@
#define WIN_RANGE(a, b) (((a) << 8) | (b))
#endif // GUARD_GBA_DEFINES
#endif // GUARD_GBA_DEFINES
include/gba/io_reg.h
+1 -1
View File
@@ -698,7 +698,7 @@
#define KEY_INTR_ENABLE 0x0400
#define KEY_OR_INTR 0x0000
#define KEY_AND_INTR 0x8000
#define DPAD_ANY 0x00F0
#define DPAD_ANY ((DPAD_RIGHT | DPAD_LEFT | DPAD_UP | DPAD_DOWN)) // 0xF0
#define JOY_EXCL_DPAD 0x030F
// interrupt flags
include/gba/m4a_internal.h
+90 -80
View File
@@ -69,50 +69,7 @@ struct ToneData
struct CgbChannel
{
u8 sf;
u8 ty;
u8 rightVolume;
u8 leftVolume;
u8 at;
u8 de;
u8 su;
u8 re;
u8 ky;
u8 ev;
u8 eg;
u8 ec;
u8 echoVolume;
u8 echoLength;
u8 d1;
u8 d2;
u8 gt;
u8 mk;
u8 ve;
u8 pr;
u8 rp;
u8 d3[3];
u8 d5;
u8 sg;
u8 n4;
u8 pan;
u8 panMask;
u8 mo;
u8 le;
u8 sw;
u32 fr;
u32* wp;
u32 cp;
u32 tp;
u32 pp;
u32 np;
u8 d4[8];
};
struct MusicPlayerTrack;
struct SoundChannel
{
u8 status;
u8 statusFlags;
u8 type;
u8 rightVolume;
u8 leftVolume;
@@ -120,28 +77,71 @@ struct SoundChannel
u8 decay;
u8 sustain;
u8 release;
u8 ky;
u8 ev;
u8 er;
u8 el;
u8 key;
u8 envelopeVolume;
u8 envelopeGoal;
u8 envelopeCounter;
u8 echoVolume;
u8 echoLength;
u8 d1;
u8 d2;
u8 gt;
u8 mk;
u8 ve;
u8 pr;
u8 rp;
u8 d3[3];
u32 ct;
u32 fw;
u32 freq;
struct WaveData *wav;
u32 cp;
u8 dummy1;
u8 dummy2;
u8 gateTime;
u8 midiKey;
u8 velocity;
u8 priority;
u8 rhythmPan;
u8 dummy3[3];
u8 dummy5;
u8 sustainGoal;
u8 n4; // NR[1-4]4 register (initial, length bit)
u8 pan;
u8 panMask;
u8 modify;
u8 length;
u8 sweep;
u32 frequency;
u32 *wavePointer; // instructs CgbMain to load targeted wave
u32 *currentPointer; // stores the currently loaded wave
struct MusicPlayerTrack *track;
u32 pp;
u32 np;
void *prevChannelPointer;
void *nextChannelPointer;
u8 dummy4[8];
};
struct MusicPlayerTrack;
struct SoundChannel
{
u8 statusFlags;
u8 type;
u8 rightVolume;
u8 leftVolume;
u8 attack;
u8 decay;
u8 sustain;
u8 release;
u8 key; // midi key as it was translated into final pitch
u8 envelopeVolume;
u8 envelopeVolumeRight;
u8 envelopeVolumeLeft;
u8 echoVolume;
u8 echoLength;
u8 dummy1;
u8 dummy2;
u8 gateTime;
u8 midiKey; // midi key as it was used in the track data
u8 velocity;
u8 priority;
u8 rhythmPan;
u8 d3[3];
u32 count;
u32 fw;
u32 frequency;
struct WaveData *wav;
s8 *currentPointer;
struct MusicPlayerTrack *track;
void *prevChannelPointer;
void *nextChannelPointer;
u32 d4;
u16 xpi;
u16 xpc;
@@ -151,6 +151,16 @@ struct SoundChannel
#define PCM_DMA_BUF_SIZE 1584 // size of Direct Sound buffer
struct MusicPlayerInfo;
typedef void (*MPlayFunc)();
typedef void (*PlyNoteFunc)(u32, struct MusicPlayerInfo *, struct MusicPlayerTrack *);
typedef void (*CgbSoundFunc)(void);
typedef void (*CgbOscOffFunc)(u8);
typedef u32 (*MidiKeyToCgbFreqFunc)(u8, u8, u8);
typedef void (*ExtVolPitFunc)(void);
typedef void (*MPlayMainFunc)(struct MusicPlayerInfo *);
struct SoundInfo
{
// This field is normally equal to ID_NUMBER but it is set to other
@@ -168,7 +178,7 @@ struct SoundInfo
u8 freq;
u8 mode;
u8 c15;
u8 c15; // periodically counts from 14 down to 0 (15 states)
u8 pcmDmaPeriod; // number of V-blanks per PCM DMA
u8 maxLines;
u8 gap[3];
@@ -176,14 +186,14 @@ struct SoundInfo
s32 pcmFreq;
s32 divFreq;
struct CgbChannel *cgbChans;
u32 func;
u32 intp;
void (*CgbSound)(void);
void (*CgbOscOff)(u8);
u32 (*MidiKeyToCgbFreq)(u8, u8, u8);
u32 MPlayJumpTable;
u32 plynote;
u32 ExtVolPit;
MPlayMainFunc MPlayMainHead;
struct MusicPlayerInfo *musicPlayerHead;
CgbSoundFunc CgbSound;
CgbOscOffFunc CgbOscOff;
MidiKeyToCgbFreqFunc MidiKeyToCgbFreq;
MPlayFunc *MPlayJumpTable;
PlyNoteFunc plynote;
ExtVolPitFunc ExtVolPit;
u8 gap2[16];
struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS];
s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2];
@@ -270,8 +280,8 @@ struct MusicPlayerTrack
u8 lfoDelay;
u8 lfoDelayC;
u8 priority;
u8 echoVolume;
u8 echoLength;
u8 pseudoEchoVolume;
u8 pseudoEchoLength;
struct SoundChannel *chan;
struct ToneData tone;
u8 gap[10];
@@ -312,8 +322,8 @@ struct MusicPlayerInfo
struct MusicPlayerTrack *tracks;
struct ToneData *tone;
u32 ident;
u32 func;
u32 intp;
MPlayMainFunc MPlayMainNext;
struct MusicPlayerInfo *musicPlayerNext;
};
struct MusicPlayer
@@ -351,7 +361,7 @@ extern struct MusicPlayerTrack gPokemonCryTracks[];
extern char SoundMainRAM[];
extern void *gMPlayJumpTable[];
extern MPlayFunc gMPlayJumpTable[];
typedef void (*XcmdFunc)(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
extern const XcmdFunc gXcmdTable[];
@@ -380,7 +390,7 @@ u32 umul3232H32(u32 multiplier, u32 multiplicand);
void SoundMain(void);
void SoundMainBTM(void);
void TrackStop(struct MusicPlayerInfo *mplayInfo, struct MusicPlayerTrack *track);
void MPlayMain(void);
void MPlayMain(struct MusicPlayerInfo *);
void RealClearChain(void *x);
void MPlayContinue(struct MusicPlayerInfo *mplayInfo);
@@ -399,7 +409,7 @@ void CgbSound(void);
void CgbOscOff(u8);
u32 MidiKeyToCgbFreq(u8, u8, u8);
void DummyFunc(void);
void MPlayJumpTableCopy(void **mplayJumpTable);
void MPlayJumpTableCopy(MPlayFunc *mplayJumpTable);
void SampleFreqSet(u32 freq);
void m4aSoundVSyncOn(void);
void m4aSoundVSyncOff(void);
@@ -443,7 +453,7 @@ void ply_tune(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
void ply_port(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
void ply_xcmd(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
void ply_endtie(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
void ply_note(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
void ply_note(u32 note_cmd, struct MusicPlayerInfo *, struct MusicPlayerTrack *);
// extended sound command handler functions
void ply_xxx(struct MusicPlayerInfo *, struct MusicPlayerTrack *);
include/input.h
+23
View File
@@ -46,6 +46,29 @@ struct UnusedInputStruct
/* 0x2A..0x2B - padding */
};
struct UnkInputStruct
{
/* 0x0 */ u8 unk0;
/* 0x1 */ u8 unk1;
/* 0x2 */ u8 unk2;
/* 0x3 */ u8 unk3;
/* 0x4 */ u8 unk4;
/* 0x5 */ u32 unk5;
/* 0x9 */ u32 unk9;
/* 0xD */ u32 unkD;
/* 0x12 */ u32 unk11;
/* 0x16 */ u32 unk15;
/* 0x1A */ u32 unk19;
/* 0x1E */ u32 unk1D;
/* 0x24 */ u32 unk24;
/* 0x28 */ u8 unk28;
/* 0x29 */ u8 a_button;
/* 0x2A */ u8 b_button;
/* 0x2B */ u8 dpad_right;
/* 0x2C */ u8 dpad_left;
};
void InitInput(void);
void LoadBufferedInputs(void);
u8 sub_80048B8(void);
include/item.h
+58
View File
@@ -0,0 +1,58 @@
#ifndef ITEMS_H
#define ITEMS_H
struct Item
{
/* 0x0 */ u8 *namePointer;
/* 0x4 */ u32 buyPrice;
/* 0x8 */ u32 sellPrice;
/* 0xC */ u8 type;
/* 0xD */ u8 icon;
/* 0xE */ u16 fill;
/* 0x10 */ u8 *descriptionPointer;
/* 0x14 */ bool8 unkFood1[2];
/* 0x16 */ u8 throwDmg;
/* 0x17 */ u8 fill2;
/* 0x18 */ s16 move;
/* 0x1A */ u8 order; // Numbered order they are in storage
/* 0x1B */ u8 unkThrow1B[2];
/* 0x1D */ u8 palette;
/* 0x1E */ u8 category;
/* 0x1F */ u8 fill3;
};
enum ItemType
{
ITEM_TYPE_THROWABLE,
ITEM_TYPE_ROCK,
ITEM_TYPE_BERRY_SEED,
ITEM_TYPE_APPLE_GUMMI,
ITEM_TYPE_HOLD_ITEM,
ITEM_TYPE_TM,
ITEM_TYPE_MONEY,
ITEM_TYPE_UNUSED,
ITEM_TYPE_MISC,
ITEM_TYPE_ORB,
ITEM_TYPE_LINK_BOX,
ITEM_TYPE_USED_TM
};
enum ItemCategory
{
ITEM_CATEGORY_NOTHING,
ITEM_CATEGORY_THROWABLE,
ITEM_CATEGORY_ROCKS,
ITEM_CATEGORY_RIBBONS,
ITEM_CATEGORY_FOOD,
ITEM_CATEGORY_HEALING,
ITEM_CATEGORY_CHESTNUT,
ITEM_CATEGORY_MONEY_WISH_STONE,
ITEM_CATEGORY_MISC,
ITEM_CATEGORY_TM,
ITEM_CATEGORY_LINK_BOX,
ITEM_CATEGORY_SPECS,
ITEM_CATEGORY_SCARFS,
ITEM_CATEGORY_ORBS
};
#endif
include/kangaskhan_storage.h
+41
View File
@@ -0,0 +1,41 @@
#ifndef KANGASKHAN_STORAGE_H
#define KANGASKHAN_STORAGE_H
struct unkData
{
u8 unk0[20];
u8 *array;
};
struct unkStruct_203B208
{
// size: 0x14C
u32 unk0;
u32 currState;
u32 unk8;
u32 unkC;
u32 unk10;
u32 unk14;
u32 unk18;
u32 unk1C;
u32 unk20;
u8 fill24[0x58 - 0x24];
u32 unk58;
u8 unk5C[0xA8 - 0x5C];
u32 unkA8;
u8 unkAC[0xBC - 0xAC];
u32 unkBC;
u8 unkC0[0xD8 - 0xC0];
struct OpenedFile *faceFile;
u8 *faceData;
u16 unkE0;
u16 unkE2;
u8 unkE4;
u8 unkE5;
u8 unkE6;
u8 unkE7;
struct OpenedFile **unkE8;
struct unkData unkEC[4];
};
#endif
include/kecleon_items.h
+43
View File
@@ -0,0 +1,43 @@
#ifndef KECLEON_ITEMS_H
#define KECLEON_ITEMS_H
#include "gUnknown_203B460.h"
struct unkData
{
u8 unk0[24];
};
struct unkStruct_203B210
{
// size: 0x148
u32 unk0;
u8 unk4;
u8 fill5[3];
u32 currState;
u32 unkC;
s32 unk10;
u32 unk14;
u32 unk18;
struct ItemStruct_203B460 unk1C;
u32 unk20;
u32 unk24;
u32 unk28;
u32 unk2C;
u32 unk30;
u8 fill34[0x84 - 0x34];
u32 unk84;
u8 fill88[0xD4 - 0x88];
struct OpenedFile *unkD4;
u8 *unkD8;
u16 unkDC;
u16 unkDE;
u8 unkE0;
u8 unkE1;
u8 unkE2;
u8 unkE3;
struct OpenedFile **unkE4;
struct unkData unkE8[4];
};
#endif
include/main_menu.h
+1
View File
@@ -8,6 +8,7 @@ enum MainMenuScreens
MENU_AWAITING_RESCUE = 6,
MENU_CONTINUE = 7,
MENU_DELETE_SAVE_PROMPT,
MENU_DELETE_SAVE_CONFIRM,
MENU_ADVENTURE_LOG = 10,
MENU_FRIEND_RESCUE,
MENU_TRADE_ITEMS,
include/menu.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef MENU_H
#define MENU_H
struct MenuItem
{
const char *text;
u32 menuAction; // action??
};
#endif

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