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

Synced some symbol names with EoS hacking

Browse Source
This commit is contained in:
AnonymousRandomPerson
2023-01-08 04:23:00 -05:00
parent b4fe2857e9
commit be20f60ee0
320 changed files with 44546 additions and 45620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -157,7 +157,7 @@ tools: $(TOOLDIRS)
include dungeon_pokemon.mk
include dungeon_floor.mk
include dungeon_trap.mk
include data_pokemon.mk
include data_monster.mk
include data_item.mk
include data_move.mk
include graphics.mk
@@ -179,7 +179,7 @@ tidy:
$(RM) -r $(BUILD_DIR)
$(RM) -f $(ITEM_DATA)
$(RM) -f $(MOVE_DATA)
$(RM) -f $(POKEMON_SPECIES)
$(RM) -f $(MONSTER_DATA)
$(RM) -f $(DUNGEON_FLOOR)
$(RM) -f $(DUNGEON_POKEMON)
$(RM) -f $(DUNGEON_TRAP)
@@ -203,7 +203,7 @@ $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c
$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c
@$(call scaninc,$(INCLUDE_PATHS))
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s dungeon_pokemon dungeon_floor dungeon_trap data_pokemon data_item data_move
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s dungeon_pokemon dungeon_floor dungeon_trap data_monster data_item data_move
@$(CPP) -x assembler-with-cpp $(CPPFLAGS) $< -o $(DATA_ASM_BUILDDIR)/$*.i.s
@$(PREPROC) $(DATA_ASM_BUILDDIR)/$*.i.s charmap.txt > $(DATA_ASM_BUILDDIR)/$*.s
$(AS) $(ASFLAGS) -o $@ $(DATA_ASM_BUILDDIR)/$*.s

8
asm/code_2.s
View File

@@ -26,7 +26,7 @@ LoadTitleScreen:
bl MemoryAlloc
adds r7, r0, 0
movs r0, 0x3
bl RandomCapped
bl RandInt
adds r4, r0, 0
lsls r4, 2
adds r5, r4
@@ -1262,7 +1262,7 @@ sub_8001064:
movs r0, 0x4
ldrsh r1, [r5, r0]
adds r0, r4, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
mov r0, sp
adds r1, r4, 0
bl CopyStringtoBuffer
@@ -1293,7 +1293,7 @@ _080010AE:
movs r0, 0x6
ldrsh r1, [r5, r0]
adds r0, r4, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
mov r0, sp
adds r1, r4, 0
bl CopyStringtoBuffer
@@ -1495,7 +1495,7 @@ sub_8001248:
movs r5, 0
_0800124E:
movs r0, 0x64
bl RandomCapped
bl RandInt
cmp r0, 0x31
bgt _08001266
lsls r0, r4, 2

10
asm/code_8002774.s
View File

@@ -354,7 +354,7 @@ _080029F4:
cmp r0, 0
beq _08002A18
movs r0, 0x2
bl OtherRandomCapped
bl OtherRandInt
adds r1, r4, 0x7
lsls r0, 1
adds r1, r0
@@ -369,7 +369,7 @@ _08002A10:
b _08002A64
_08002A18:
movs r0, 0x3
bl OtherRandomCapped
bl OtherRandInt
adds r1, r4, 0x6
lsls r0, 1
adds r1, r0
@@ -384,7 +384,7 @@ _08002A2C:
b _08002A64
_08002A34:
movs r0, 0x3
bl OtherRandomCapped
bl OtherRandInt
adds r1, r4, 0x7
adds r1, r0
adds r0, r1, 0
@@ -398,7 +398,7 @@ _08002A46:
b _08002A64
_08002A4E:
movs r0, 0x8
bl OtherRandomCapped
bl OtherRandInt
movs r2, 0x2
negs r2, r2
adds r1, r2, 0
@@ -406,7 +406,7 @@ _08002A4E:
b _08002A64
_08002A5E:
movs r0, 0x8
bl OtherRandomCapped
bl OtherRandInt
_08002A64:
lsls r0, 24
asrs r4, r0, 24

2
asm/code_800D090.s
View File

@@ -8704,7 +8704,7 @@ _08011406:
ldr r1, _0801147C
ldr r2, [r6]
add r0, sp, 0x4
bl sprintf_2
bl sprintfStatic
movs r0, 0
str r0, [sp]
movs r0, 0xC

16
asm/code_8012A18.s
View File

@@ -510,7 +510,7 @@ _08012F62:
_08012F64:
mov r0, r8
ldr r1, _08012FBC
bl sprintf_2
bl sprintfStatic
adds r0, r5, 0
adds r0, 0x14
mov r1, r9
@@ -4504,7 +4504,7 @@ _08014E60:
adds r5, 0x1
ldr r2, [r0]
mov r0, sp
bl sprintf_2
bl sprintfStatic
_08014E78:
mov r4, sp
b _08014F0E
@@ -4525,7 +4525,7 @@ _08014E84:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl sprintf_2
bl sprintfStatic
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@@ -4558,7 +4558,7 @@ _08014EC4:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl sprintf_2
bl sprintfStatic
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@@ -6139,7 +6139,7 @@ _08015B04:
add r0, sp, 0x4
ldr r1, _08015B30
adds r2, r5, 0
bl sprintf_2
bl sprintfStatic
mov r1, r8
ldr r0, [r1]
ldrb r0, [r0, 0x19]
@@ -6169,7 +6169,7 @@ _08015B34:
mov r0, r10
ldr r1, _08015B78
adds r2, r5, 0
bl sprintf_2
bl sprintfStatic
mov r3, r8
ldr r0, [r3]
ldrb r0, [r0, 0x19]
@@ -6477,7 +6477,7 @@ _08015DD0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
bl sprintf_2
bl sprintfStatic
b _08015DEE
.align 2, 0
_08015DDC: .4byte gUnknown_80DB65C
@@ -6487,7 +6487,7 @@ _08015DE0:
adds r0, 0xF8
ldr r2, [r0]
add r0, sp, 0x4
bl sprintf_2
bl sprintfStatic
_08015DEE:
movs r0, 0
str r0, [sp]

22
asm/code_801EE10.s
View File

@@ -1160,7 +1160,7 @@ sub_801F700:
movs r7, 0
ldrsh r3, [r0, r7]
adds r0, r5, 0
bl sprintf_2
bl sprintfStatic
ldr r0, [r6]
adds r0, r4
ldr r3, [r0]
@@ -1715,11 +1715,11 @@ sub_801FB50:
ldr r0, _0801FBC4
ldr r4, _0801FBC8
adds r1, r4, 0
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
ldr r5, _0801FBCC
adds r0, r5, 0
adds r1, r4, 0
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
adds r0, r4, 0
bl GetMonSpecies
adds r1, r0, 0
@@ -4920,7 +4920,7 @@ _08021574:
mov r0, r10
ldr r1, _08021598
add r2, sp, 0x8
bl sprintf_2
bl sprintfStatic
mov r3, r8
ldr r0, [r3]
adds r0, 0x40
@@ -4968,7 +4968,7 @@ _080215D8:
adds r2, r0, 0
mov r0, r10
ldr r1, _08021608
bl sprintf_2
bl sprintfStatic
mov r2, r8
ldr r0, [r2]
adds r0, 0x40
@@ -5519,7 +5519,7 @@ _08021A16:
add r0, sp, 0x4
ldr r1, _08021A58
adds r2, r7, 0
bl sprintf_2
bl sprintfStatic
mov r1, r8
ldr r0, [r1]
ldr r3, [r0, 0x74]
@@ -5742,11 +5742,11 @@ CreateWigglytuffShop:
str r4, [r0]
ldr r0, _08021BFC
movs r1, 0x28
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
ldr r4, _08021C00
adds r0, r4, 0
movs r1, 0x28
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
movs r0, 0x28
bl GetMonSpecies
adds r1, r0, 0
@@ -7941,7 +7941,7 @@ _08022D80:
adds r0, r2, 0
adds r0, 0x52
ldrb r0, [r0]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -9021,7 +9021,7 @@ _08023628:
ldr r1, _080236A0
adds r2, r7, 0
adds r3, r4, 0
bl sprintf_2
bl sprintfStatic
ldr r6, _0802368C
ldr r0, [r6]
movs r1, 0xE4
@@ -10170,7 +10170,7 @@ _08023F02:
ldr r1, _08023F80
adds r2, r6, 0
mov r3, r9
bl sprintf_2
bl sprintfStatic
mov r1, r8
ldr r0, [r1]
movs r2, 0xD6

34
asm/code_803B050.s
View File

@@ -1059,7 +1059,7 @@ _0803B818:
add r0, sp, 0x4
adds r2, r6, 0
_0803B84C:
bl sprintf_2
bl sprintfStatic
_0803B850:
ldr r1, [r7, 0x48]
ldr r3, [r7]
@@ -1096,7 +1096,7 @@ _0803B86C:
ldr r1, [r0]
add r0, sp, 0x4
adds r2, r6, 0
bl sprintf_2
bl sprintfStatic
ldr r1, [r7, 0x48]
ldr r3, [r7]
movs r0, 0
@@ -1160,7 +1160,7 @@ _0803B916:
ldr r1, _0803B938
add r0, sp, 0x4
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
b _0803B944
.align 2, 0
_0803B938: .4byte gUnknown_80E8884
@@ -1299,7 +1299,7 @@ _0803BA4C:
ldr r1, _0803BA68
add r0, sp, 0x4
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
b _0803BACC
.align 2, 0
_0803BA64: .4byte gUnknown_202DE58
@@ -1313,7 +1313,7 @@ _0803BA6C:
ldr r1, _0803BA88
add r0, sp, 0x4
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
b _0803BACC
.align 2, 0
_0803BA84: .4byte gUnknown_202DE58
@@ -1347,7 +1347,7 @@ _0803BAA0:
add r0, sp, 0x4
adds r2, r4, 0
adds r3, r4, 0
bl sprintf_2
bl sprintfStatic
_0803BACC:
ldr r3, [r7]
movs r0, 0
@@ -1408,7 +1408,7 @@ _0803BB10:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1454,7 +1454,7 @@ _0803BB74:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r4, 0
str r4, [sp]
@@ -1472,7 +1472,7 @@ _0803BB74:
ldr r1, [r5]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
str r4, [sp]
b _0803BD32
@@ -1508,7 +1508,7 @@ _0803BBF0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1554,7 +1554,7 @@ _0803BC58:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1600,7 +1600,7 @@ _0803BCC0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r6, 0
str r6, [sp]
@@ -1621,7 +1621,7 @@ _0803BD1A:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
str r6, [sp]
_0803BD32:
@@ -1677,7 +1677,7 @@ _0803BD88:
adds r0, r5, 0
adds r2, r6, 0
adds r3, r4, 0
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
mov r1, r8
str r1, [sp]
@@ -1783,7 +1783,7 @@ _0803BE80:
_0803BE94:
add r0, sp, 0x4
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r0, 0
str r0, [sp]
@@ -1823,7 +1823,7 @@ _0803BEC8:
ldr r1, _0803BF00
add r0, sp, 0x4
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
b _0803BF0C
.align 2, 0
_0803BEF8: .4byte gSpecialMissionText
@@ -1940,7 +1940,7 @@ _0803BFD0:
add r0, sp, 0x4
adds r2, r4, 0
_0803BFEE:
bl sprintf_2
bl sprintfStatic
ldr r3, [r7]
movs r0, 0
str r0, [sp]

16
asm/code_803C1D0.s
View File

@@ -220,7 +220,7 @@ _0803C35A:
movs r0, 0xC
ldrsh r1, [r6, r0]
adds r0, r4, 0
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
ldrh r0, [r6, 0xC]
strh r0, [r4, 0x14]
ldrb r1, [r6, 0x1]
@@ -330,7 +330,7 @@ _0803C41A:
_0803C42C: .4byte gUnknown_80E9920
_0803C430:
adds r0, r6, 0
bl RandomCapped
bl RandInt
lsls r0, 2
add r0, sp
ldr r4, [r0]
@@ -391,7 +391,7 @@ _0803C496:
cmp r6, 0
beq _0803C4E0
adds r0, r6, 0
bl RandomCapped
bl RandInt
lsls r0, 2
add r0, sp
ldr r4, [r0]
@@ -399,7 +399,7 @@ _0803C496:
adds r0, r4
lsls r0, 2
adds r5, r0, r5
bl Random
bl Rand32Bit
movs r1, 0x10
ands r1, r0
cmp r1, 0
@@ -470,13 +470,13 @@ _0803C52A:
cmp r6, 0
beq _0803C570
adds r0, r6, 0
bl RandomCapped
bl RandInt
lsls r0, 2
add r0, sp
ldr r4, [r0]
lsls r0, r4, 2
adds r5, r0, r5
bl Random
bl Rand32Bit
movs r1, 0x10
ands r1, r0
cmp r1, 0
@@ -557,7 +557,7 @@ _0803C5D2:
_0803C5D8: .4byte gUnknown_80E8180
_0803C5DC:
adds r0, r7, 0
bl RandomCapped
bl RandInt
lsls r0, 2
add r0, sp
ldr r4, [r0]
@@ -631,7 +631,7 @@ _0803C664: .4byte gUnknown_80E81D4
_0803C668: .4byte 0x00000181
_0803C66C:
adds r0, r7, 0
bl RandomCapped
bl RandInt
lsls r0, 2
add r0, sp
ldr r5, [r0]

118
asm/code_803D110.s
View File

@@ -504,7 +504,7 @@ sub_803D4AC:
strb r1, [r0]
bx lr
.align 2, 0
_0803D4C4: .4byte gDungeonGlobalData
_0803D4C4: .4byte gDungeon
_0803D4C8: .4byte 0x0001c570
_0803D4CC: .4byte 0x0001c571
thumb_func_end sub_803D4AC
@@ -709,7 +709,7 @@ _0803D644:
bne _0803D644
b _0803D68A
.align 2, 0
_0803D654: .4byte gDungeonGlobalData
_0803D654: .4byte gDungeon
_0803D658: .4byte 0x00000644
_0803D65C: .4byte 0x0001c570
_0803D660: .4byte gUnknown_80F4D8C
@@ -780,7 +780,7 @@ _0803D6E0:
pop {r0}
bx r0
.align 2, 0
_0803D6F0: .4byte gDungeonGlobalData
_0803D6F0: .4byte gDungeon
_0803D6F4: .4byte 0x0001c590
_0803D6F8: .4byte 0x0001c5a8
thumb_func_end sub_803D4D0
@@ -789,7 +789,7 @@ _0803D6F8: .4byte 0x0001c5a8
sub_803D6FC:
push {r4,lr}
ldr r0, _0803D720
bl DungeonRandomCapped
bl DungeonRandInt
adds r3, r0, 0
movs r2, 0
ldr r0, _0803D724
@@ -807,7 +807,7 @@ _0803D710:
b _0803D736
.align 2, 0
_0803D720: .4byte 0x00002710
_0803D724: .4byte gDungeonGlobalData
_0803D724: .4byte gDungeon
_0803D728: .4byte 0x0001cd70
_0803D72C:
adds r1, 0x2
@@ -829,7 +829,7 @@ sub_803D73C:
sub sp, 0x8
adds r4, r0, 0
ldr r0, _0803D784
bl DungeonRandomCapped
bl DungeonRandInt
adds r7, r0, 0
movs r0, 0xC
mov r8, r0
@@ -862,7 +862,7 @@ _0803D77A:
b _0803D7EC
.align 2, 0
_0803D784: .4byte 0x00002710
_0803D788: .4byte gDungeonGlobalData
_0803D788: .4byte gDungeon
_0803D78C: .4byte 0x0001c590
_0803D790:
lsls r0, r6, 24
@@ -874,7 +874,7 @@ _0803D798:
b _0803D7EE
_0803D79C:
ldr r0, _0803D7FC
bl DungeonRandomCapped
bl DungeonRandInt
adds r7, r0, 0
movs r6, 0
ldr r2, _0803D800
@@ -894,7 +894,7 @@ _0803D7AE:
adds r0, r5, 0
str r1, [sp]
str r2, [sp, 0x4]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -924,7 +924,7 @@ _0803D7EE:
bx r1
.align 2, 0
_0803D7FC: .4byte 0x00002710
_0803D800: .4byte gDungeonGlobalData
_0803D800: .4byte gDungeon
_0803D804: .4byte 0x0001c5a8
thumb_func_end sub_803D73C
@@ -981,7 +981,7 @@ _0803D85A:
bx r1
.align 2, 0
_0803D868: .4byte 0x0001cd98
_0803D86C: .4byte gDungeonGlobalData
_0803D86C: .4byte gDungeon
thumb_func_end sub_803D808
thumb_func_start sub_803D870
@@ -997,7 +997,7 @@ sub_803D870:
mov r9, r1
b _0803D8B8
_0803D884:
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1048,7 +1048,7 @@ _0803D8D6:
bx r1
.align 2, 0
_0803D8E4: .4byte 0x0001cd9a
_0803D8E8: .4byte gDungeonGlobalData
_0803D8E8: .4byte gDungeon
_0803D8EC: .4byte 0x0001cd98
thumb_func_end sub_803D870
@@ -1078,7 +1078,7 @@ _0803D918:
pop {r0}
bx r0
.align 2, 0
_0803D920: .4byte gDungeonGlobalData
_0803D920: .4byte gDungeon
_0803D924: .4byte 0x000037ec
_0803D928: .4byte 0x0000343c
_0803D92C: .4byte 0x000037e4
@@ -1094,7 +1094,7 @@ sub_803D930:
ldr r4, _0803D944
b _0803D954
.align 2, 0
_0803D940: .4byte gDungeonGlobalData
_0803D940: .4byte gDungeon
_0803D944: .4byte 0x0001cd98
_0803D948:
cmp r0, r6
@@ -1127,7 +1127,7 @@ sub_803D970:
push {r4-r7,lr}
adds r5, r0, 0
ldr r0, _0803D9EC
bl DungeonRandomCapped
bl DungeonRandInt
adds r6, r0, 0
movs r3, 0
ldr r1, _0803D9F0
@@ -1191,7 +1191,7 @@ _0803D9E0:
b _0803DA14
.align 2, 0
_0803D9EC: .4byte 0x00002710
_0803D9F0: .4byte gDungeonGlobalData
_0803D9F0: .4byte gDungeon
_0803D9F4: .4byte 0x000037e4
_0803D9F8: .4byte 0x0000343c
_0803D9FC: .4byte 0x0000343e
@@ -1243,7 +1243,7 @@ _0803DA3A:
bl ExtractLevel
b _0803DA72
.align 2, 0
_0803DA54: .4byte gDungeonGlobalData
_0803DA54: .4byte gDungeon
_0803DA58: .4byte 0x000037e4
_0803DA5C: .4byte 0x0000343c
_0803DA60:
@@ -1388,7 +1388,7 @@ _0803DB54:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
bl sprintf_2
bl sprintfStatic
b _0803DBCA
.align 2, 0
_0803DB84: .4byte gUnknown_80F60F8
@@ -1398,7 +1398,7 @@ _0803DB90: .4byte gUnknown_80F6100
_0803DB94: .4byte gDungeonNameBannerFontFile
_0803DB98: .4byte gDungeonNameBannerFont
_0803DB9C: .4byte 0x06000140
_0803DBA0: .4byte gDungeonGlobalData
_0803DBA0: .4byte gDungeon
_0803DBA4: .4byte 0x00000645
_0803DBA8: .4byte 0x00000644
_0803DBAC: .4byte 0xffffe000
@@ -1411,7 +1411,7 @@ _0803DBBC:
adds r3, 0x30
add r0, sp, 0x4
adds r2, r6, 0
bl sprintf_2
bl sprintfStatic
_0803DBCA:
add r0, sp, 0x4
bl CalcStringWidth
@@ -2121,7 +2121,7 @@ _0803E118: .4byte gUnknown_80F61DC
_0803E11C: .4byte gDungeonFileArchive
_0803E120: .4byte 0x0600c000
_0803E124: .4byte gUnknown_202ECA4
_0803E128: .4byte gDungeonGlobalData
_0803E128: .4byte gDungeon
_0803E12C: .4byte gUnknown_80F5F70
_0803E130: .4byte 0x00012a18
_0803E134: .4byte 0x00013554
@@ -2187,7 +2187,7 @@ sub_803E178:
strh r0, [r1]
b _0803E204
.align 2, 0
_0803E1AC: .4byte gDungeonGlobalData
_0803E1AC: .4byte gDungeon
_0803E1B0: .4byte 0x00000644
_0803E1B4: .4byte 0x000037fe
_0803E1B8: .4byte 0x00003a12
@@ -2219,7 +2219,7 @@ _0803E1E0:
movs r1, 0x6
b _0803E202
.align 2, 0
_0803E1F0: .4byte gDungeonGlobalData
_0803E1F0: .4byte gDungeon
_0803E1F4: .4byte 0x00003a12
_0803E1F8:
ldr r0, _0803E20C
@@ -2234,7 +2234,7 @@ _0803E204:
pop {r0}
bx r0
.align 2, 0
_0803E20C: .4byte gDungeonGlobalData
_0803E20C: .4byte gDungeon
_0803E210: .4byte 0x00003a12
thumb_func_end sub_803E178
@@ -2507,7 +2507,7 @@ _0803E448: .4byte 0x000003ff
_0803E44C: .4byte 0x00000fff
_0803E450: .4byte 0x0000fffd
_0803E454: .4byte gUnknown_80F61EC
_0803E458: .4byte gDungeonGlobalData
_0803E458: .4byte gDungeon
_0803E45C: .4byte 0x00018217
_0803E460: .4byte 0x00018218
_0803E464: .4byte gUnknown_202EDC8
@@ -2571,7 +2571,7 @@ sub_803E490:
b _0803E4FC
.align 2, 0
_0803E4D8: .4byte gUnknown_202EDD4
_0803E4DC: .4byte gDungeonGlobalData
_0803E4DC: .4byte gDungeon
_0803E4E0: .4byte 0x0001821a
_0803E4E4: .4byte 0x00018208
_0803E4E8: .4byte 0x000181f0
@@ -2708,7 +2708,7 @@ _0803E5A2:
bx r0
.align 2, 0
_0803E628: .4byte 0x00018208
_0803E62C: .4byte gDungeonGlobalData
_0803E62C: .4byte gDungeon
_0803E630: .4byte 0x000181f0
_0803E634: .4byte 0x000181f2
_0803E638: .4byte 0x000181fc
@@ -2781,7 +2781,7 @@ _0803E6F0: .4byte gUnknown_202EDD4
_0803E6F4: .4byte gUnknown_203B46C
_0803E6F8: .4byte gUnknown_202EDCC
_0803E6FC: .4byte gPlayTimeRef
_0803E700: .4byte gDungeonGlobalData
_0803E700: .4byte gDungeon
_0803E704: .4byte 0x00018213
thumb_func_end sub_803E668
@@ -2884,7 +2884,7 @@ _0803E790:
.align 2, 0
_0803E7B8: .4byte gUnknown_203B40D
_0803E7BC: .4byte gUnknown_202EDC8
_0803E7C0: .4byte gDungeonGlobalData
_0803E7C0: .4byte gDungeon
_0803E7C4: .4byte 0x00018217
thumb_func_end sub_803E748
@@ -2934,7 +2934,7 @@ _0803E806:
.align 2, 0
_0803E820: .4byte gUnknown_203B40D
_0803E824: .4byte gUnknown_202EDC8
_0803E828: .4byte gDungeonGlobalData
_0803E828: .4byte gDungeon
_0803E82C: .4byte 0x00018217
thumb_func_end sub_803E7C8
@@ -3131,7 +3131,7 @@ _0803E96A:
_0803E9A4: .4byte gDungeonPaletteFile
_0803E9A8: .4byte gUnknown_80F62AC
_0803E9AC: .4byte gUnknown_202EDC8
_0803E9B0: .4byte gDungeonGlobalData
_0803E9B0: .4byte gDungeon
_0803E9B4: .4byte 0x00018215
_0803E9B8: .4byte 0x0001c06c
_0803E9BC: .4byte gUnknown_202EE8C
@@ -3169,7 +3169,7 @@ _0803E9E6:
pop {r0}
bx r0
.align 2, 0
_0803EA04: .4byte gDungeonGlobalData
_0803EA04: .4byte gDungeon
_0803EA08: .4byte 0x000181e4
_0803EA0C: .4byte gUnknown_202EDC8
thumb_func_end sub_803E9D0
@@ -3272,7 +3272,7 @@ _0803EA92:
_0803EACC: .4byte gDungeonPaletteFile
_0803EAD0: .4byte gUnknown_80F62AC
_0803EAD4: .4byte gUnknown_202EDC8
_0803EAD8: .4byte gDungeonGlobalData
_0803EAD8: .4byte gDungeon
_0803EADC: .4byte 0x00018215
_0803EAE0: .4byte 0x0001c06c
_0803EAE4: .4byte gUnknown_202EE8C
@@ -3639,7 +3639,7 @@ _0803ED78:
movs r0, 0x6
b _0803EDCA
.align 2, 0
_0803EDAC: .4byte gDungeonGlobalData
_0803EDAC: .4byte gDungeon
_0803EDB0: .4byte 0x0001820a
_0803EDB4: .4byte gUnknown_202EDE8
_0803EDB8: .4byte 0xfffffc19
@@ -3670,7 +3670,7 @@ _0803EDDA:
bx r0
.align 2, 0
_0803EDE8: .4byte 0x060142c0
_0803EDEC: .4byte gDungeonGlobalData
_0803EDEC: .4byte gDungeon
thumb_func_end sub_803ED30
thumb_func_start sub_803EDF0
@@ -3856,7 +3856,7 @@ _0803EF42:
pop {r0}
bx r0
.align 2, 0
_0803EF50: .4byte gDungeonGlobalData
_0803EF50: .4byte gDungeon
_0803EF54: .4byte 0x000181f0
_0803EF58: .4byte 0x000181f2
_0803EF5C: .4byte 0x00000fff
@@ -3983,7 +3983,7 @@ _0803F056:
ldr r2, [r4]
b _0803F07A
.align 2, 0
_0803F060: .4byte gDungeonGlobalData
_0803F060: .4byte gDungeon
_0803F064: .4byte gUnknown_202EC9C
_0803F068: .4byte 0x0000270f
_0803F06C: .4byte gUnknown_80F6478
@@ -4388,7 +4388,7 @@ _0803F354:
pop {r0}
bx r0
.align 2, 0
_0803F360: .4byte gDungeonGlobalData
_0803F360: .4byte gDungeon
_0803F364: .4byte 0x000181e8
_0803F368: .4byte 0x00018216
_0803F36C: .4byte 0x00018217
@@ -4463,7 +4463,7 @@ sub_803F38C:
pop {r0}
bx r0
.align 2, 0
_0803F410: .4byte gDungeonGlobalData
_0803F410: .4byte gDungeon
_0803F414: .4byte 0x000181e8
_0803F418: .4byte 0x0000ffff
_0803F41C: .4byte 0x00018228
@@ -4516,12 +4516,12 @@ _0803F45A:
beq _0803F494
adds r0, r2, 0
adds r1, r4, 0
bl InSameRoom_2
bl IsPositionActuallyInSight
lsls r0, 24
lsrs r0, 24
b _0803F49A
.align 2, 0
_0803F484: .4byte gDungeonGlobalData
_0803F484: .4byte gDungeon
_0803F488: .4byte 0x000181e8
_0803F48C: .4byte 0x0001820b
_0803F490: .4byte 0x0001820c
@@ -4550,7 +4550,7 @@ sub_803F4A0:
adds r3, 0x2E
b _0803F4CA
.align 2, 0
_0803F4B8: .4byte gDungeonGlobalData
_0803F4B8: .4byte gDungeon
_0803F4BC: .4byte 0x000181e8
_0803F4C0:
ldr r0, [r2, 0x70]
@@ -4586,7 +4586,7 @@ _0803F4F8:
bx r0
.align 2, 0
_0803F4FC: .4byte 0x00018216
_0803F500: .4byte gDungeonGlobalData
_0803F500: .4byte gDungeon
_0803F504: .4byte 0x0001356c
thumb_func_end sub_803F4A0
@@ -4605,7 +4605,7 @@ sub_803F508:
strb r3, [r0]
b _0803F548
.align 2, 0
_0803F520: .4byte gDungeonGlobalData
_0803F520: .4byte gDungeon
_0803F524: .4byte 0x000181e8
_0803F528: .4byte 0x00018216
_0803F52C:
@@ -4645,7 +4645,7 @@ _0803F566:
bx r0
.align 2, 0
_0803F574: .4byte 0x00018216
_0803F578: .4byte gDungeonGlobalData
_0803F578: .4byte gDungeon
_0803F57C: .4byte 0x0001356c
thumb_func_end sub_803F508
@@ -4701,7 +4701,7 @@ _0803F5D4:
strh r0, [r5, 0xA]
adds r0, r6, 0
movs r1, 0x11
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0803F610
@@ -4717,7 +4717,7 @@ _0803F5D4:
strb r1, [r0]
b _0803F626
.align 2, 0
_0803F600: .4byte gDungeonGlobalData
_0803F600: .4byte gDungeon
_0803F604: .4byte 0x000181e8
_0803F608: .4byte 0x0001820d
_0803F60C: .4byte 0x0001820e
@@ -4813,7 +4813,7 @@ _0803F6B4:
ldrb r2, [r4]
mov r8, r2
adds r0, r6, 0
bl CanSeeInvisible
bl CanSeeInvisibleMonsters
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4937,7 +4937,7 @@ _0803F7A0:
pop {r0}
bx r0
.align 2, 0
_0803F7B4: .4byte gDungeonGlobalData
_0803F7B4: .4byte gDungeon
_0803F7B8: .4byte 0x000135cc
thumb_func_end sub_803F580
@@ -4953,7 +4953,7 @@ sub_803F7BC:
ldrsh r0, [r5, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
bl GetMapTile_1
bl GetTile
ldrb r1, [r0, 0x9]
ldr r2, _0803F808
adds r0, r4, r2
@@ -4976,7 +4976,7 @@ _0803F7F4:
bl sub_8005838
b _0803F86A
.align 2, 0
_0803F800: .4byte gDungeonGlobalData
_0803F800: .4byte gDungeon
_0803F804: .4byte 0x000181e8
_0803F808: .4byte 0x0001820b
_0803F80C:
@@ -5130,7 +5130,7 @@ _0803F91E:
strb r0, [r1]
b _0803F984
.align 2, 0
_0803F92C: .4byte gDungeonGlobalData
_0803F92C: .4byte gDungeon
_0803F930: .4byte 0x000181e8
_0803F934: .4byte 0x0001820d
_0803F938: .4byte 0x00018211
@@ -5190,7 +5190,7 @@ GetCameraXPos:
lsls r0, 8
bx lr
.align 2, 0
_0803F9A8: .4byte gDungeonGlobalData
_0803F9A8: .4byte gDungeon
_0803F9AC: .4byte 0x000181e8
thumb_func_end GetCameraXPos
@@ -5206,7 +5206,7 @@ GetCameraYPos:
lsls r0, 8
bx lr
.align 2, 0
_0803F9C4: .4byte gDungeonGlobalData
_0803F9C4: .4byte gDungeon
_0803F9C8: .4byte 0x000181e8
thumb_func_end GetCameraYPos
@@ -5257,7 +5257,7 @@ _0803FA14:
bl sub_803F38C
b _0803FA3C
.align 2, 0
_0803FA24: .4byte gDungeonGlobalData
_0803FA24: .4byte gDungeon
_0803FA28: .4byte 0x000181f8
_0803FA2C: .4byte 0x0001356c
_0803FA30: .4byte 0x00018218
@@ -5412,7 +5412,7 @@ _0803FB3A:
pop {r0}
bx r0
.align 2, 0
_0803FB4C: .4byte gDungeonGlobalData
_0803FB4C: .4byte gDungeon
_0803FB50: .4byte 0x000181e8
_0803FB54: .4byte gUnknown_3001018
_0803FB58: .4byte gUnknown_80F6490
@@ -5487,7 +5487,7 @@ _0803FBD2:
movs r6, 0x20
b _0803FBF8
.align 2, 0
_0803FBE8: .4byte gDungeonGlobalData
_0803FBE8: .4byte gDungeon
_0803FBEC: .4byte 0x000181e8
_0803FBF0: .4byte gUnknown_202EDCC
_0803FBF4:
@@ -5613,7 +5613,7 @@ _0803FCB0:
_0803FCE4: .4byte gUnknown_203B46C
_0803FCE8: .4byte gUnknown_202D068
_0803FCEC: .4byte gUnknown_202B038
_0803FCF0: .4byte gDungeonGlobalData
_0803FCF0: .4byte gDungeon
_0803FCF4: .4byte 0x00000645
_0803FCF8: .4byte 0x00000644
_0803FCFC:

72
asm/code_8040094.s
View File

@@ -86,7 +86,7 @@ _080401B0:
pop {r0}
bx r0
.align 2, 0
_080401EC: .4byte gDungeonGlobalData
_080401EC: .4byte gDungeon
_080401F0: .4byte 0x0001822c
_080401F4: .4byte 0x0001ba2c
_080401F8: .4byte gUnknown_203B410
@@ -232,7 +232,7 @@ _080402FC:
_08040302:
mov r0, r8
adds r1, r3, 0
bl GetMapTile_1
bl GetTile
mov r9, r0
ldrh r0, [r0]
movs r5, 0x3
@@ -267,7 +267,7 @@ _08040302:
str r3, [sp, 0x18]
b _0804039C
.align 2, 0
_0804034C: .4byte gDungeonGlobalData
_0804034C: .4byte gDungeon
_08040350: .4byte gUnknown_202EE04
_08040354: .4byte gUnknown_202EE01
_08040358: .4byte 0x00018210
@@ -297,7 +297,7 @@ _08040378:
str r0, [sp, 0x18]
b _0804039C
.align 2, 0
_08040390: .4byte gDungeonGlobalData
_08040390: .4byte gDungeon
_08040394: .4byte 0x00018211
_08040398:
movs r2, 0
@@ -351,7 +351,7 @@ _080403F6:
movs r0, 0x1
b _0804040A
.align 2, 0
_080403FC: .4byte gDungeonGlobalData
_080403FC: .4byte gDungeon
_08040400: .4byte 0x0001356c
_08040404: .4byte gUnknown_202EE00
_08040408:
@@ -392,7 +392,7 @@ _08040426:
b _0804045A
.align 2, 0
_0804044C: .4byte gUnknown_203B410
_08040450: .4byte gDungeonGlobalData
_08040450: .4byte gDungeon
_08040454: .4byte 0x00018214
_08040458:
movs r6, 0xA
@@ -553,7 +553,7 @@ _0804056C:
adds r1, r3, 0
adds r1, 0x1
mov r0, r8
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -567,7 +567,7 @@ _0804058A:
adds r1, r5, 0
subs r1, 0x1
mov r0, r8
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -583,7 +583,7 @@ _080405AA:
mov r0, r8
adds r0, 0x1
ldr r1, [sp]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -598,7 +598,7 @@ _080405CA:
ble _080405E8
subs r0, 0x1
ldr r1, [sp]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -889,7 +889,7 @@ _08040800:
blt _080407C8
b _08040868
.align 2, 0
_08040814: .4byte gDungeonGlobalData
_08040814: .4byte gDungeon
_08040818: .4byte 0x0001bdd0
_0804081C: .4byte 0x0001bdd1
_08040820: .4byte 0x0001bdcc
@@ -1130,7 +1130,7 @@ _080408D2:
bl nullsub_11
b _08040A6A
.align 2, 0
_080409F4: .4byte gDungeonGlobalData
_080409F4: .4byte gDungeon
_080409F8: .4byte 0x00018214
_080409FC: .4byte gUnknown_203B410
_08040A00: .4byte gUnknown_202EE02
@@ -1217,7 +1217,7 @@ _08040A98:
pop {r0}
bx r0
.align 2, 0
_08040AB4: .4byte gDungeonGlobalData
_08040AB4: .4byte gDungeon
_08040AB8: .4byte 0x0001bdd1
thumb_func_end sub_8040A84
@@ -1354,7 +1354,7 @@ _08040B9E:
pop {r0}
bx r0
.align 2, 0
_08040BA4: .4byte gDungeonGlobalData
_08040BA4: .4byte gDungeon
_08040BA8: .4byte 0x0001bdd2
_08040BAC: .4byte 0x0001ba2c
thumb_func_end sub_8040B60
@@ -1375,7 +1375,7 @@ sub_8040BB0:
mov r8, r0
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1387,7 +1387,7 @@ sub_8040BB0:
mov r9, r5
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1446,7 +1446,7 @@ sub_8040C4C:
adds r4, r1, 0
adds r6, r2, 0
ldrh r5, [r4, 0x2]
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1466,7 +1466,7 @@ sub_8040C4C:
ldrsh r5, [r6, r0]
ldrh r4, [r4, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1619,7 +1619,7 @@ sub_8040DA0:
mov r1, r8
ldrh r4, [r1, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1657,7 +1657,7 @@ _08040E0E:
ldr r6, [r0]
b _08040E26
.align 2, 0
_08040E1C: .4byte gDungeonGlobalData
_08040E1C: .4byte gDungeon
_08040E20: .4byte 0x000181f8
_08040E24:
adds r6, r7, 0
@@ -1707,7 +1707,7 @@ _08040E6E:
cmp r1, r0
bne _08040ED0
movs r0, 0x7
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _08040EB8
str r0, [r1]
ldr r1, _08040EBC
@@ -1736,7 +1736,7 @@ _08040E6E:
b _08040EF0
.align 2, 0
_08040EB8: .4byte gUnknown_202F224
_08040EBC: .4byte gDungeonGlobalData
_08040EBC: .4byte gDungeon
_08040EC0: .4byte 0x00018204
_08040EC4: .4byte gUnknown_8106A8C
_08040EC8: .4byte gUnknown_202DE30
@@ -1764,7 +1764,7 @@ _08040EF0:
mov r0, r8
ldrh r4, [r0, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1817,7 +1817,7 @@ _08040F52:
bge _08040F52
b _08041026
.align 2, 0
_08040F70: .4byte gDungeonGlobalData
_08040F70: .4byte gDungeon
_08040F74: .4byte 0x00018204
_08040F78: .4byte 0x000003e5
_08040F7C:
@@ -1933,7 +1933,7 @@ sub_8041038:
mov r9, r0
ldrh r4, [r2, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1954,7 +1954,7 @@ sub_8041038:
mov r0, r8
ldrh r4, [r0, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2031,7 +2031,7 @@ sub_8041108:
adds r5, r3, 0
ldrh r4, [r2, 0x2]
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2088,7 +2088,7 @@ sub_8041168:
_0804118A:
ldrh r4, [r7, 0x2]
mov r0, r8
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2490,7 +2490,7 @@ _0804148E:
cmp r0, 0x97
bne _080414A4
adds r0, r4, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2523,7 +2523,7 @@ sub_80414C0:
cmp r0, 0x9C
bne _080414DC
adds r0, r5, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
bl IsTileGround
lsls r0, 24
cmp r0, 0
@@ -2533,7 +2533,7 @@ _080414DC:
cmp r0, 0x8
bne _080414F6
adds r0, r5, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -2741,7 +2741,7 @@ _08041644:
movs r5, 0
b _0804167C
.align 2, 0
_0804166C: .4byte gDungeonGlobalData
_0804166C: .4byte gDungeon
_08041670: .4byte 0x000181f2
_08041674:
movs r0, 0x42
@@ -2913,7 +2913,7 @@ sub_804178C:
ldr r6, _080417B8
b _080417C4
.align 2, 0
_080417B0: .4byte gDungeonGlobalData
_080417B0: .4byte gDungeon
_080417B4: .4byte 0x00018204
_080417B8: .4byte 0x000003e7
_080417BC:
@@ -3010,7 +3010,7 @@ _08041878: .4byte gUnknown_203B40D
thumb_func_end sub_804178C
thumb_func_start EntityGetStatusSprites
@ int EntityGetStatusSprites(struct DungeonEntity *entity)
@ int EntityGetStatusSprites(struct Entity *entity)
EntityGetStatusSprites:
ldr r0, [r0, 0x70]
movs r1, 0x80
@@ -3058,7 +3058,7 @@ _080418C0:
pop {r0}
bx r0
.align 2, 0
_080418CC: .4byte gDungeonGlobalData
_080418CC: .4byte gDungeon
_080418D0: .4byte 0x000135cc
thumb_func_end sub_8041888
@@ -3311,7 +3311,7 @@ _08041AB8: .4byte gStatusSpriteMasks_ItemStatus
_08041ABC: .4byte gStatusSpriteMasks_TransformStatus
_08041AC0: .4byte gStatusSpriteMasks_EyesightStatus
_08041AC4: .4byte gStatusSpriteMasks_MuzzledStatus
_08041AC8: .4byte gDungeonGlobalData
_08041AC8: .4byte gDungeon
_08041ACC: .4byte 0x00000676
thumb_func_end DungeonEntityUpdateStatusSprites

18
asm/code_8041AD0.s
View File

@@ -237,7 +237,7 @@ _080423E2:
.align 2, 0
_08042428: .4byte 0xffff0000
_0804242C: .4byte 0x0000ffff
_08042430: .4byte gDungeonGlobalData
_08042430: .4byte gDungeon
_08042434: .4byte 0x000181f2
_08042438: .4byte 0x000003e7
_0804243C:
@@ -334,7 +334,7 @@ _080424A6:
.align 2, 0
_080424EC: .4byte 0xffff0000
_080424F0: .4byte 0x0000ffff
_080424F4: .4byte gDungeonGlobalData
_080424F4: .4byte gDungeon
_080424F8: .4byte 0x000181f2
_080424FC: .4byte 0x000003e7
_08042500:
@@ -508,7 +508,7 @@ _080425CC:
.align 2, 0
_0804264C: .4byte 0xffff0000
_08042650: .4byte 0x0000ffff
_08042654: .4byte gDungeonGlobalData
_08042654: .4byte gDungeon
_08042658: .4byte 0x000181f2
_0804265C: .4byte 0x00000165
_08042660: .4byte gAdjacentTileOffsets
@@ -560,7 +560,7 @@ _080426AC:
bx r0
.align 2, 0
_080426B8: .4byte 0x000003e5
_080426BC: .4byte gDungeonGlobalData
_080426BC: .4byte gDungeon
_080426C0: .4byte 0x00000644
_080426C4: .4byte 0x00000155
thumb_func_end sub_804267C
@@ -675,7 +675,7 @@ _08042778:
movs r0, 0x1
b _080427A6
.align 2, 0
_08042794: .4byte gDungeonGlobalData
_08042794: .4byte gDungeon
_08042798: .4byte 0x0001820a
_0804279C:
adds r0, r1, 0
@@ -733,7 +733,7 @@ _080427FA:
pop {r0}
bx r0
.align 2, 0
_08042808: .4byte gDungeonGlobalData
_08042808: .4byte gDungeon
_0804280C: .4byte 0x000135cc
_08042810: .4byte gAvailablePokemonNames
_08042814: .4byte gPtrFeralFoundItemMessage
@@ -753,7 +753,7 @@ sub_8042818:
ldr r4, [r0]
cmp r4, 0
bne _08042836
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
_08042836:
ldr r1, _0804287C
@@ -775,7 +775,7 @@ _0804284A:
blt _08042896
cmp r7, 0
beq _08042888
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
bne _08042888
@@ -785,7 +785,7 @@ _0804284A:
bl sub_804151C
b _08042896
.align 2, 0
_08042874: .4byte gDungeonGlobalData
_08042874: .4byte gDungeon
_08042878: .4byte 0x000181f8
_0804287C: .4byte gUnknown_80F682C
_08042880: .4byte 0x000003e5

110
asm/code_80428A0.s
View File

@@ -18,7 +18,7 @@ sub_8042B34:
adds r6, r2, 0
movs r0, 0
mov r8, r0
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
mov r10, r0
ldr r7, _08042CB0
movs r0, 0xCC
@@ -85,7 +85,7 @@ _08042BCC:
asrs r0, 8
strh r0, [r1, 0xE]
movs r0, 0x2
bl RandomCapped
bl RandInt
ldr r1, [r7]
lsls r4, r5, 2
adds r3, r1, 0
@@ -104,7 +104,7 @@ _08042BCC:
adds r1, r0
str r1, [r3]
movs r0, 0xF0
bl RandomCapped
bl RandInt
ldr r1, [r7]
adds r1, r4
adds r0, 0x98
@@ -112,7 +112,7 @@ _08042BCC:
strh r0, [r1]
lsls r0, r5, 1
adds r0, 0x8
bl RandomCapped
bl RandInt
ldr r1, [r7]
adds r2, r1, r4
adds r3, r0, 0
@@ -294,7 +294,7 @@ _08042D56:
pop {r1}
bx r1
.align 2, 0
_08042D74: .4byte gDungeonGlobalData
_08042D74: .4byte gDungeon
_08042D78: .4byte 0x000181f0
thumb_func_end sub_8042CC0
@@ -373,7 +373,7 @@ _08042DE4:
str r0, [r4, 0x8]
b _08042E14
.align 2, 0
_08042E04: .4byte gDungeonGlobalData
_08042E04: .4byte gDungeon
_08042E08: .4byte 0x000005c4
_08042E0C:
adds r3, 0x10
@@ -408,7 +408,7 @@ _08042E24:
movs r0, 0x1
b _08042E56
.align 2, 0
_08042E44: .4byte gDungeonGlobalData
_08042E44: .4byte gDungeon
_08042E48: .4byte 0x000005c4
_08042E4C:
adds r4, 0x10
@@ -452,7 +452,7 @@ _08042E82:
pop {r0}
bx r0
.align 2, 0
_08042E90: .4byte gDungeonGlobalData
_08042E90: .4byte gDungeon
_08042E94: .4byte 0x000005c4
thumb_func_end sub_8042E5C
@@ -479,7 +479,7 @@ _08042EA6:
pop {r0}
bx r0
.align 2, 0
_08042EC0: .4byte gDungeonGlobalData
_08042EC0: .4byte gDungeon
_08042EC4: .4byte 0x000005c4
thumb_func_end sub_8042E98
@@ -563,7 +563,7 @@ _08042F4A:
pop {r0}
bx r0
.align 2, 0
_08042F5C: .4byte gDungeonGlobalData
_08042F5C: .4byte gDungeon
_08042F60: .4byte 0x000005c4
_08042F64: .4byte 0xffff0000
_08042F68: .4byte 0x0000ffff
@@ -768,7 +768,7 @@ _080430D8:
.align 2, 0
_0804310C: .4byte gUnknown_203B40C
_08043110: .4byte gUnknown_203B41C
_08043114: .4byte gDungeonGlobalData
_08043114: .4byte gDungeon
_08043118: .4byte 0x0001cedb
_0804311C: .4byte gUnknown_203B410
_08043120: .4byte 0x0000064c
@@ -815,11 +815,11 @@ _0804315E:
b _080431AC
.align 2, 0
_0804318C: .4byte 0x00000644
_08043190: .4byte gDungeonGlobalData
_08043190: .4byte gDungeon
_08043194: .4byte 0x00000674
_08043198: .4byte 0x0000067c
_0804319C:
bl Random
bl Rand32Bit
ldr r2, [r4]
ldr r1, _08043208
adds r2, r1
@@ -872,7 +872,7 @@ _080431DC:
.align 2, 0
_08043208: .4byte 0x0000067c
_0804320C: .4byte 0x00ffffff
_08043210: .4byte gDungeonGlobalData
_08043210: .4byte gDungeon
_08043214: .4byte 0x00000644
_08043218: .4byte gUnknown_202DE30
_0804321C: .4byte 0x0000067b
@@ -946,7 +946,7 @@ _0804326A:
b _080432F4
.align 2, 0
_080432B4: .4byte gUnknown_80FEC7C
_080432B8: .4byte gDungeonGlobalData
_080432B8: .4byte gDungeon
_080432BC: .4byte 0x00000644
_080432C0: .4byte gUnknown_202DE30
_080432C4: .4byte gUnknown_81002B8
@@ -958,7 +958,7 @@ _080432CC: .4byte 0x00000226
_080432D0:
ldr r4, _080432E4
_080432D2:
bl GetLeaderEntity
bl GetLeader
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0
@@ -1007,7 +1007,7 @@ _08043318:
movs r0, 0xA
strh r0, [r1]
ldr r0, [r2]
bl SetDungeonRNG
bl InitDungeonRNG
_08043346:
ldr r0, [r4]
ldr r1, _080434C4
@@ -1020,7 +1020,7 @@ _08043346:
adds r0, r2
strb r6, [r0]
movs r0, 0x4
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, [r4]
ldr r3, _080434CC
adds r1, r3
@@ -1191,8 +1191,8 @@ _080434A6:
b _0804351C
.align 2, 0
_080434B8: .4byte gPtrFinalChanceMessage
_080434BC: .4byte gLeaderPokemon
_080434C0: .4byte gDungeonGlobalData
_080434BC: .4byte gLeaderPointer
_080434C0: .4byte gDungeon
_080434C4: .4byte 0x000037ec
_080434C8: .4byte 0x000037fc
_080434CC: .4byte 0x000037fd
@@ -1277,7 +1277,7 @@ _08043594:
b _080435D4
.align 2, 0
_080435B4: .4byte gDungeonMusic
_080435B8: .4byte gDungeonGlobalData
_080435B8: .4byte gDungeon
_080435BC: .4byte 0x00003a10
_080435C0: .4byte gUnknown_202EDC8
_080435C4: .4byte 0x00000644
@@ -1326,7 +1326,7 @@ _080435D4:
bl sub_804AAAC
b _08043648
.align 2, 0
_0804362C: .4byte gDungeonGlobalData
_0804362C: .4byte gDungeon
_08043630: .4byte 0x00017b2c
_08043634: .4byte 0x00017b38
_08043638: .4byte 0x00017b3c
@@ -1373,7 +1373,7 @@ _08043690:
b _080436AC
.align 2, 0
_080436A0: .4byte gUnknown_203B40C
_080436A4: .4byte gDungeonGlobalData
_080436A4: .4byte gDungeon
_080436A8:
bl sub_803E7C8
_080436AC:
@@ -1437,12 +1437,12 @@ _08043728:
strb r0, [r1, 0x5]
b _0804374C
.align 2, 0
_08043730: .4byte gDungeonGlobalData
_08043730: .4byte gDungeon
_08043734: .4byte 0x0000066c
_08043738: .4byte 0x0000066d
_0804373C: .4byte gLeaderPokemon
_0804373C: .4byte gLeaderPointer
_08043740:
bl GetLeaderEntity
bl GetLeader
bl sub_803F4A0
bl sub_8040A84
_0804374C:
@@ -1455,7 +1455,7 @@ _0804374C:
bne _0804377C
bl sub_807E5AC
movs r0, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
cmp r0, 0
beq _0804377C
@@ -1463,7 +1463,7 @@ _0804374C:
bl sub_807E7FC
b _0804377C
.align 2, 0
_08043774: .4byte gDungeonGlobalData
_08043774: .4byte gDungeon
_08043778:
bl TriggerWeatherAbilities
_0804377C:
@@ -1473,7 +1473,7 @@ _0804377C:
b _080437A2
_08043784:
bl sub_80427AC
bl GetLeaderEntity
bl GetLeader
ldr r2, _08043960
ldr r1, [r2]
ldr r3, _08043964
@@ -1504,14 +1504,14 @@ _080437A2:
strb r4, [r0]
_080437C8:
adds r0, r4, 0
bl RunDungeon
bl RunFractionalTurn
movs r4, 0
bl sub_8044B28
lsls r0, 24
cmp r0, 0
beq _080437C8
_080437DA:
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -1553,7 +1553,7 @@ _08043822:
bne _08043830
bl sub_806AA70
_08043830:
bl GetLeaderEntity
bl GetLeader
bl EntityExists
lsls r0, 24
cmp r0, 0
@@ -1651,7 +1651,7 @@ _080438AC:
ldrb r0, [r1, 0x6]
cmp r0, 0
beq _08043926
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
ldr r0, _0804398C
ldr r1, [r0]
@@ -1691,7 +1691,7 @@ _0804394C:
bl sub_8080B30
b _080439A6
.align 2, 0
_08043960: .4byte gDungeonGlobalData
_08043960: .4byte gDungeon
_08043964: .4byte 0x00003a08
_08043968: .4byte 0x00000654
_0804396C: .4byte 0x00018218
@@ -1729,7 +1729,7 @@ _080439C4:
bl sub_804700C
b _08043AF4
.align 2, 0
_080439CC: .4byte gDungeonGlobalData
_080439CC: .4byte gDungeon
_080439D0: .4byte 0x00000654
_080439D4:
ldrb r0, [r1, 0x11]
@@ -1739,7 +1739,7 @@ _080439D4:
_080439DC:
cmp r0, 0x2
bne _08043A00
bl GetLeaderEntity
bl GetLeader
adds r2, r0, 0
ldr r0, _080439F8
movs r1, 0
@@ -1754,7 +1754,7 @@ _080439FC: .4byte 0x0000066e
_08043A00:
cmp r0, 0x3
bne _08043A24
bl GetLeaderEntity
bl GetLeader
adds r2, r0, 0
ldr r0, _08043A1C
movs r1, 0
@@ -1787,7 +1787,7 @@ _08043A2A:
ldrb r0, [r0]
cmp r0, 0x2
bne _08043A74
bl GetLeaderEntity
bl GetLeader
adds r2, r0, 0
movs r0, 0x8A
lsls r0, 2
@@ -1847,7 +1847,7 @@ _08043ABA:
bl sub_8097FF8
b _080432FC
.align 2, 0
_08043ACC: .4byte gDungeonGlobalData
_08043ACC: .4byte gDungeon
_08043AD0: .4byte 0x0000066e
_08043AD4: .4byte 0x00000645
_08043AD8: .4byte 0x0001cec8
@@ -1855,7 +1855,7 @@ _08043ADC: .4byte 0x00000644
_08043AE0: .4byte 0x0000060b
_08043AE4:
ldr r4, _08043B80
bl GetLeaderEntity
bl GetLeader
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0
@@ -1927,7 +1927,7 @@ _08043B38:
.align 2, 0
_08043B80: .4byte 0x00000227
_08043B84: .4byte gUnknown_203B40C
_08043B88: .4byte gDungeonGlobalData
_08043B88: .4byte gDungeon
_08043B8C: .4byte 0x0000fffe
_08043B90: .4byte 0x00000644
_08043B94: .4byte 0x0000067c
@@ -1956,7 +1956,7 @@ _08043BA4:
strh r0, [r3]
b _08043BE6
.align 2, 0
_08043BC8: .4byte gDungeonGlobalData
_08043BC8: .4byte gDungeon
_08043BCC:
cmp r0, 0
bne _08043BDC
@@ -1979,7 +1979,7 @@ _08043BE6:
strb r0, [r4]
b _08043C32
.align 2, 0
_08043BF4: .4byte gDungeonGlobalData
_08043BF4: .4byte gDungeon
_08043BF8: .4byte 0x00000674
_08043BFC:
ldr r0, _08043C20
@@ -2082,7 +2082,7 @@ _08043CAC:
pop {r0}
bx r0
.align 2, 0
_08043CD0: .4byte gDungeonGlobalData
_08043CD0: .4byte gDungeon
_08043CD4: .4byte gUnknown_203B41C
thumb_func_end xxx_dungeon_8042F6C
@@ -2145,9 +2145,9 @@ sub_8043D10:
movs r0, 0x2
b _08043D4C
.align 2, 0
_08043D38: .4byte gDungeonGlobalData
_08043D38: .4byte gDungeon
_08043D3C:
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
bne _08043D4A
@@ -2210,7 +2210,7 @@ _08043DA0:
movs r0, 0x1
b _08043DAE
.align 2, 0
_08043DA4: .4byte gDungeonGlobalData
_08043DA4: .4byte gDungeon
_08043DA8: .4byte 0x0001358c
_08043DAC:
movs r0, 0
@@ -2299,7 +2299,7 @@ _08043E46:
cmp r0, 0
beq _08043E58
adds r0, r5, 0
bl GetMoveMaxPP
bl GetMoveBasePP
strb r0, [r4, 0x4]
_08043E58:
adds r4, 0x8
@@ -2318,7 +2318,7 @@ _08043E6A:
_08043E6E:
adds r0, r5, 0
adds r1, r6, 0
bl GetMapTile_2
bl GetTileSafe
ldr r4, [r0, 0x14]
adds r0, r4, 0
bl EntityExists
@@ -2354,7 +2354,7 @@ _08043EA0:
bx r0
.align 2, 0
_08043EC0: .4byte 0x00000207
_08043EC4: .4byte gDungeonGlobalData
_08043EC4: .4byte gDungeon
_08043EC8: .4byte 0x0001357c
_08043ECC: .4byte 0x00000676
thumb_func_end sub_8043D60
@@ -2379,7 +2379,7 @@ _08043EEA:
ldrb r0, [r0, 0x10]
cmp r0, 0x1
bne _08043F40
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2403,7 +2403,7 @@ _08043F20:
ldr r1, _08043F3C
b _08043FAC
.align 2, 0
_08043F2C: .4byte gDungeonGlobalData
_08043F2C: .4byte gDungeon
_08043F30: .4byte gAvailablePokemonNames
_08043F34: .4byte 0x000005f4
_08043F38: .4byte gUnknown_80F89B4
@@ -2411,7 +2411,7 @@ _08043F3C: .4byte 0x0000021f
_08043F40:
cmp r0, 0x2
bne _08043F74
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2433,7 +2433,7 @@ _08043F70: .4byte gUnknown_80F89D4
_08043F74:
cmp r0, 0x3
bne _08043FB6
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2730,7 +2730,7 @@ _080441A4:
pop {r0}
bx r0
.align 2, 0
_080441AC: .4byte gDungeonGlobalData
_080441AC: .4byte gDungeon
_080441B0: .4byte 0x00000644
_080441B4: .4byte gTeamInventory_203B460
_080441B8: .4byte gRecruitedPokemonRef

14
asm/code_8044210.s
View File

@@ -13,7 +13,7 @@ sub_8044574:
mov r5, r8
push {r5-r7}
sub sp, 0x44
bl GetLeaderEntity
bl GetLeader
mov r10, r0
movs r7, 0
mov r0, sp
@@ -54,7 +54,7 @@ _08044592:
adds r0, r6, r2
strb r4, [r0]
adds r0, r5, 0
bl GetMovementSpeed
bl GetSpeedStatus
mov r3, r9
ldr r1, [r3]
movs r2, 0xCC
@@ -99,7 +99,7 @@ _08044592:
strh r0, [r6]
b _080446A4
.align 2, 0
_08044634: .4byte gDungeonGlobalData
_08044634: .4byte gDungeon
_08044638: .4byte 0x0001357c
_0804463C: .4byte gSpeedTurns
_08044640: .4byte 0x0000bfff
@@ -127,7 +127,7 @@ _0804466E:
bgt _080446A4
adds r0, r5, 0
movs r1, 0
bl DecideAction
bl RunMonsterAI
bl sub_8044B28
lsls r0, 24
cmp r0, 0
@@ -202,7 +202,7 @@ _080446D4:
strb r1, [r2]
b _08044760
.align 2, 0
_08044710: .4byte gDungeonGlobalData
_08044710: .4byte gDungeon
_08044714: .4byte 0x0001357c
_08044718:
mov r2, r10
@@ -266,7 +266,7 @@ _0804476A:
strb r6, [r0]
adds r0, r4, 0
movs r1, 0x1
bl DecideAction
bl RunMonsterAI
adds r0, r4, 0
bl sub_8072CF4
bl sub_8086AC0
@@ -332,7 +332,7 @@ _08044802:
bx r0
.align 2, 0
_08044814: .4byte 0x00000145
_08044818: .4byte gDungeonGlobalData
_08044818: .4byte gDungeon
_0804481C: .4byte 0x0001357c
thumb_func_end sub_8044574

12
asm/code_8044CC8.s
View File

@@ -33,7 +33,7 @@ _08044CEC:
ldrsh r0, [r2, r1]
movs r3, 0x6
ldrsh r1, [r2, r3]
bl GetMapTile_1
bl GetTile
ldr r0, [r0, 0x14]
bl GetItemData
b _08044D34
@@ -68,7 +68,7 @@ _08044D34:
pop {r1}
bx r1
.align 2, 0
_08044D38: .4byte gDungeonGlobalData
_08044D38: .4byte gDungeon
_08044D3C: .4byte 0x0001357c
thumb_func_end sub_8044CC8
@@ -145,7 +145,7 @@ sub_8044DA4:
ldr r0, [r2]
bx lr
.align 2, 0
_08044DC0: .4byte gDungeonGlobalData
_08044DC0: .4byte gDungeon
_08044DC4: .4byte 0x0001357c
thumb_func_end sub_8044DA4
@@ -157,7 +157,7 @@ sub_8044DC8:
cmp r0, 0xE9
beq _08044DE8
ldr r4, _08044DE4
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -220,7 +220,7 @@ sub_8044E24:
cmp r0, 0
bne _08044EBA
ldrb r0, [r5, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -327,7 +327,7 @@ _08044F18:
lsls r0, r5, 2
adds r0, r1
ldrb r0, [r0, 0x2]
bl GetItemCategory
bl GetItemActionType
lsls r0, 3
adds r4, 0x4
adds r0, r4

32
asm/code_80450F8.s
View File

@@ -110,7 +110,7 @@ _080451DE:
pop {r0}
bx r0
.align 2, 0
_080451FC: .4byte gDungeonGlobalData
_080451FC: .4byte gDungeon
_08045200: .4byte 0x0001357c
_08045204: .4byte 0x0001381c
_08045208: .4byte gUnknown_202EE70
@@ -162,7 +162,7 @@ _08045248:
bl sub_806C51C
b _080452A2
.align 2, 0
_08045274: .4byte gDungeonGlobalData
_08045274: .4byte gDungeon
_08045278: .4byte 0x00018210
_0804527C: .4byte 0x0001820a
_08045280: .4byte 0x000135cc
@@ -265,7 +265,7 @@ _0804533E:
pop {r0}
bx r0
.align 2, 0
_08045348: .4byte gDungeonGlobalData
_08045348: .4byte gDungeon
_0804534C: .4byte 0x0001357c
_08045350: .4byte 0x0001358c
_08045354: .4byte 0x00003904
@@ -338,7 +338,7 @@ sub_80453AC:
negs r0, r0
mov r9, r0
mov r0, r8
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -482,7 +482,7 @@ _080454C6:
b _080454FE
.align 2, 0
_080454DC: .4byte 0x0000069c
_080454E0: .4byte gDungeonGlobalData
_080454E0: .4byte gDungeon
_080454E4: .4byte 0x0001357c
_080454E8: .4byte 0x00000167
_080454EC: .4byte gUnknown_202EE70
@@ -520,7 +520,7 @@ sub_804550C:
negs r0, r0
mov r9, r0
mov r0, r8
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r7, r0, 24
movs r5, 0
@@ -675,7 +675,7 @@ _08045636:
b _08045672
.align 2, 0
_08045650: .4byte 0x00000ebc
_08045654: .4byte gDungeonGlobalData
_08045654: .4byte gDungeon
_08045658: .4byte 0x0001358c
_0804565C: .4byte 0x00000167
_08045660: .4byte gUnknown_202EE76
@@ -750,7 +750,7 @@ _080456A2:
adds r0, r4, 0
b _080456FA
.align 2, 0
_080456E4: .4byte gDungeonGlobalData
_080456E4: .4byte gDungeon
_080456E8: .4byte 0x00003908
_080456EC: .4byte 0x0001371c
_080456F0:
@@ -792,7 +792,7 @@ sub_8045708:
ldrsh r0, [r1, r2]
movs r3, 0x2
ldrsh r1, [r1, r3]
bl GetMapTile_2
bl GetTileSafe
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -801,7 +801,7 @@ sub_8045708:
b _080457C4
.align 2, 0
_08045744: .4byte gDungeonWaterType
_08045748: .4byte gDungeonGlobalData
_08045748: .4byte gDungeon
_0804574C: .4byte 0x00003a0e
_08045750:
movs r0, 0x3
@@ -872,7 +872,7 @@ _080457C6:
pop {r1}
bx r1
.align 2, 0
_080457D4: .4byte gDungeonGlobalData
_080457D4: .4byte gDungeon
_080457D8: .4byte 0x0001361c
thumb_func_end sub_8045708
@@ -952,12 +952,12 @@ _0804584C:
beq _08045880
adds r1, r4, 0x4
adds r0, r2, 0
bl InSameRoom_2
bl IsPositionActuallyInSight
lsls r0, 24
lsrs r0, 24
b _08045882
.align 2, 0
_08045874: .4byte gDungeonGlobalData
_08045874: .4byte gDungeon
_08045878: .4byte 0x000181e8
_0804587C: .4byte 0x0001820f
_08045880:
@@ -1024,7 +1024,7 @@ _080458B4:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080458F0: .4byte gDungeonGlobalData
_080458F0: .4byte gDungeon
_080458F4: .4byte 0x000181f0
_080458F8: .4byte 0x000181f2
_080458FC: .4byte 0x000181e8
@@ -1073,7 +1073,7 @@ _08045954:
adds r0, 0x25
b _08045920
.align 2, 0
_0804595C: .4byte gDungeonGlobalData
_0804595C: .4byte gDungeon
_08045960: .4byte 0x0001820f
_08045964:
ldr r0, _0804597C
@@ -1088,7 +1088,7 @@ _08045964:
ldrb r0, [r0]
b _0804592E
.align 2, 0
_0804597C: .4byte gDungeonGlobalData
_0804597C: .4byte gDungeon
_08045980: .4byte 0x0001820f
_08045984:
movs r0, 0x1

56
asm/code_8045A00.s
View File

@@ -24,7 +24,7 @@ sub_8045C28:
cmp r6, 0
bne _08045C6C
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _08045C64
ldr r1, [r1]
ldr r2, _08045C68
@@ -34,7 +34,7 @@ sub_8045C28:
bge _08045C72
b _08045C76
.align 2, 0
_08045C64: .4byte gDungeonGlobalData
_08045C64: .4byte gDungeon
_08045C68: .4byte 0x0001c57e
_08045C6C:
cmp r6, 0x1
@@ -50,7 +50,7 @@ _08045C76:
strb r0, [r5]
_08045C7E:
adds r0, r4, 0
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -70,7 +70,7 @@ _08045CA2:
pop {r0}
bx r0
.align 2, 0
_08045CA8: .4byte gDungeonGlobalData
_08045CA8: .4byte gDungeon
_08045CAC: .4byte 0x0001c58b
thumb_func_end sub_8045C28
@@ -83,10 +83,10 @@ sub_8045CB0:
push {r5-r7}
sub sp, 0x8
movs r0, 0x38
bl DungeonRandomCapped
bl DungeonRandInt
adds r5, r0, 0
movs r0, 0x20
bl DungeonRandomCapped
bl DungeonRandInt
adds r6, r0, 0
ldr r0, _08045D34
ldr r0, [r0]
@@ -115,7 +115,7 @@ _08045CEE:
_08045CF6:
adds r0, r5, 0
adds r1, r6, 0
bl GetMapTile_1
bl GetTile
adds r2, r0, 0
ldrh r0, [r2]
movs r3, 0x80
@@ -144,7 +144,7 @@ _08045CF6:
movs r0, 0x1
b _08045D58
.align 2, 0
_08045D34: .4byte gDungeonGlobalData
_08045D34: .4byte gDungeon
_08045D38: .4byte 0x00003904
_08045D3C:
movs r0, 0x3
@@ -222,7 +222,7 @@ sub_8045DB4:
lsls r1, 24
lsrs r1, 24
str r1, [sp, 0xA8]
bl GetLeaderEntity
bl GetLeader
adds r7, r0, 0
ldr r0, [r7, 0x70]
str r0, [sp, 0xAC]
@@ -231,7 +231,7 @@ sub_8045DB4:
ldrsh r0, [r1, r2]
movs r3, 0x2
ldrsh r1, [r1, r3]
bl GetMapTile_1
bl GetTile
ldr r4, [r0, 0x14]
cmp r4, 0
bne _08045DE8
@@ -255,7 +255,7 @@ _08045DF4:
_08045E08:
adds r0, r7, 0
movs r1, 0x1
bl ShouldAvoidEnemiesAndShowEffect
bl ShouldMonsterRunAwayAndShowEffect
lsls r0, 24
cmp r0, 0
beq _08045E40
@@ -279,7 +279,7 @@ _08045E38: .4byte gAvailablePokemonNames
_08045E3C: .4byte gUnknown_80F8F88
_08045E40:
ldrb r0, [r5, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -325,7 +325,7 @@ _08045E94:
mov r8, r2
b _08045EC4
.align 2, 0
_08045EA8: .4byte gDungeonGlobalData
_08045EA8: .4byte gDungeon
_08045EAC: .4byte 0x0000065b
_08045EB0: .4byte gTeamInventory_203B460
_08045EB4:
@@ -647,7 +647,7 @@ _08046110:
ldrsh r0, [r5, r1]
movs r2, 0x2
ldrsh r1, [r5, r2]
bl GetMapTile_2
bl GetTileSafe
str r4, [r0, 0x14]
ldrh r1, [r0]
movs r0, 0x20
@@ -673,7 +673,7 @@ _08046110:
ldr r1, _0804616C
b _0804617E
.align 2, 0
_08046168: .4byte gDungeonGlobalData
_08046168: .4byte gDungeon
_0804616C: .4byte 0x0000068c
_08046170:
adds r0, r6, 0
@@ -718,7 +718,7 @@ _080461B6:
pop {r1}
bx r1
.align 2, 0
_080461BC: .4byte gDungeonGlobalData
_080461BC: .4byte gDungeon
_080461C0: .4byte 0x0001361c
_080461C4: .4byte 0x00003904
thumb_func_end sub_80460F8
@@ -733,7 +733,7 @@ sub_80461C8:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r2, r3]
bl GetMapTile_2
bl GetTileSafe
adds r6, r0, 0
ldr r5, [r6, 0x14]
cmp r5, 0
@@ -774,7 +774,7 @@ _080461F2:
adds r2, r1
b _08046248
.align 2, 0
_08046230: .4byte gDungeonGlobalData
_08046230: .4byte gDungeon
_08046234: .4byte 0x0000068c
_08046238:
adds r0, r4, 0
@@ -822,7 +822,7 @@ _08046284:
pop {r1}
bx r1
.align 2, 0
_0804628C: .4byte gDungeonGlobalData
_0804628C: .4byte gDungeon
_08046290: .4byte 0x0001361c
_08046294: .4byte 0x00003904
thumb_func_end sub_80461C8
@@ -876,7 +876,7 @@ _080462E4:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
movs r1, 0x3
ands r1, r0
@@ -975,7 +975,7 @@ _08046380:
strh r0, [r5, 0x4]
b _08046408
.align 2, 0
_080463A4: .4byte gDungeonGlobalData
_080463A4: .4byte gDungeon
_080463A8: .4byte 0x000181f0
_080463AC: .4byte 0x000181f2
_080463B0: .4byte gUnknown_202EDC0
@@ -1102,7 +1102,7 @@ sub_80464AC:
push {r4,lr}
ldr r4, _080464C4
ldrb r0, [r0, 0x2]
bl GetItemCategory
bl GetItemActionType
lsls r0, 3
adds r0, r4
ldr r0, [r0]
@@ -1181,7 +1181,7 @@ sub_804652C:
ldrsh r0, [r5, r1]
movs r2, 0x6
ldrsh r1, [r5, r2]
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x14]
movs r3, 0
@@ -1248,7 +1248,7 @@ _080465A8:
movs r2, 0
ldrsh r0, [r0, r2]
asrs r1, 16
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldrh r1, [r4]
movs r6, 0x3
@@ -1319,7 +1319,7 @@ _08046644:
ldrsh r0, [r0, r3]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
movs r1, 0x3
ands r1, r0
@@ -1566,7 +1566,7 @@ _08046822:
pop {r0}
bx r0
.align 2, 0
_08046858: .4byte gDungeonGlobalData
_08046858: .4byte gDungeon
_0804685C: .4byte 0x00018210
thumb_func_end sub_8046734
@@ -1688,7 +1688,7 @@ _08046904:
lsls r0, r4, 16
asrs r0, 16
asrs r1, r4, 16
bl GetMapTile_1
bl GetTile
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -2108,7 +2108,7 @@ _08046C7C:
.align 2, 0
_08046C90: .4byte gUnknown_80F947C
_08046C94: .4byte 0x00000524
_08046C98: .4byte gDungeonGlobalData
_08046C98: .4byte gDungeon
_08046C9C: .4byte 0x00018210
_08046CA0: .4byte 0x0000053c
_08046CA4: .4byte 0x000004b4

46
asm/code_8046CE4.s
View File

@@ -97,7 +97,7 @@ sub_8047190:
bne _08047214
mov r0, r9
movs r1, 0x2A
bl HasItem
bl HasHeldItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -139,7 +139,7 @@ _08047228:
movs r3, 0x2
ldrsh r2, [r2, r3]
adds r1, r2
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x3
@@ -171,7 +171,7 @@ _0804727A:
ldrsh r1, [r1, r3]
adds r1, r2
str r2, [sp, 0x234]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -215,7 +215,7 @@ _080472E0:
b _0804744C
.align 2, 0
_080472E8: .4byte 0xfffffdc0
_080472EC: .4byte gDungeonGlobalData
_080472EC: .4byte gDungeon
_080472F0: .4byte 0x00018210
_080472F4: .4byte 0x0001c05e
_080472F8: .4byte gAdjacentTileOffsets
@@ -292,7 +292,7 @@ _0804737A:
ldrsh r0, [r7, r4]
movs r2, 0x6
ldrsh r1, [r7, r2]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x3
@@ -319,7 +319,7 @@ _080473A2:
bne _080473CE
ldr r0, [r5, 0x10]
movs r1, 0x26
bl HasItem
bl HasHeldItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -444,7 +444,7 @@ _080474A6:
b _08047524
.align 2, 0
_080474B8: .4byte 0x00000195
_080474BC: .4byte gDungeonGlobalData
_080474BC: .4byte gDungeon
_080474C0: .4byte 0x0001c05e
_080474C4: .4byte gAvailablePokemonNames
_080474C8: .4byte gUnknown_202DE58
@@ -638,7 +638,7 @@ sub_80475C4:
bne _0804765E
ldr r0, [sp, 0x10]
movs r1, 0x2A
bl HasItem
bl HasHeldItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -848,7 +848,7 @@ _080477D0:
ldrsh r0, [r3, r1]
movs r2, 0x2
ldrsh r1, [r3, r2]
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x10]
cmp r0, 0
@@ -863,7 +863,7 @@ _080477FA:
bne _08047834
ldr r0, [r4, 0x10]
movs r1, 0x26
bl HasItem
bl HasHeldItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -892,7 +892,7 @@ _08047834:
ands r6, r0
b _0804786E
.align 2, 0
_08047848: .4byte gDungeonGlobalData
_08047848: .4byte gDungeon
_0804784C: .4byte 0x00018210
_08047850: .4byte 0x0001c05e
_08047854: .4byte 0x00000195
@@ -1020,7 +1020,7 @@ _0804794C:
b _080479B0
_08047950:
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _08047980
movs r2, 0
ldrsh r1, [r1, r2]
@@ -1035,7 +1035,7 @@ _08047964:
bne _08047994
adds r0, r4, 0
movs r1, 0x28
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08047984
@@ -1046,7 +1046,7 @@ _08047980: .4byte gUnknown_80F4FA2
_08047984:
adds r0, r4, 0
movs r1, 0x2A
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08047994
@@ -1058,7 +1058,7 @@ _08047994:
bne _080479AE
adds r0, r5, 0
movs r1, 0x25
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _080479AE
@@ -1101,18 +1101,18 @@ sub_80479B8:
cmp r0, 0
beq _08047A20
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
cmp r0, 0
beq _08047A3C
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
beq _08047A3C
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -1124,14 +1124,14 @@ sub_80479B8:
b _08047A3C
_08047A20:
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
beq _08047A3C
adds r0, r5, 0
movs r1, 0x2
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1247,7 +1247,7 @@ _08047B30:
bl sub_804245C
_08047B38:
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1261,13 +1261,13 @@ _08047B38:
bl sub_8078B5C
_08047B56:
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
beq _08047B72
ldrb r0, [r7, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0xA

16
asm/code_8048480.s
View File

@@ -216,7 +216,7 @@ sub_8048950:
mov r10, r0
mov r8, r1
ldrb r0, [r1, 0x2]
bl GetItemMove
bl GetItemMoveID
lsls r0, 16
lsrs r0, 16
mov r9, r0
@@ -294,7 +294,7 @@ _080489F6:
movs r0, 0x1
b _08048A06
.align 2, 0
_080489FC: .4byte gDungeonGlobalData
_080489FC: .4byte gDungeon
_08048A00: .4byte 0x0001357c
_08048A04:
movs r0, 0
@@ -381,7 +381,7 @@ _08048A90:
ldr r0, _08048AAC
b _08048A80
.align 2, 0
_08048AA4: .4byte gDungeonGlobalData
_08048AA4: .4byte gDungeon
_08048AA8: .4byte 0x0000065c
_08048AAC: .4byte gUnknown_80F9BD8
_08048AB0:
@@ -447,7 +447,7 @@ _08048B20:
movs r0, 0x1
b _08048B36
.align 2, 0
_08048B24: .4byte gDungeonGlobalData
_08048B24: .4byte gDungeon
_08048B28: .4byte 0x0001357c
_08048B2C: .4byte gRecruitedPokemonRef
_08048B30: .4byte 0x00008df8
@@ -494,7 +494,7 @@ _08048B4A:
b _08048B8E
.align 2, 0
_08048B84: .4byte 0x00000157
_08048B88: .4byte gDungeonGlobalData
_08048B88: .4byte gDungeon
_08048B8C:
movs r0, 0
_08048B8E:
@@ -580,7 +580,7 @@ _08048C24:
movs r0, 0x1
b _08048C32
.align 2, 0
_08048C28: .4byte gDungeonGlobalData
_08048C28: .4byte gDungeon
_08048C2C: .4byte 0x0001357c
_08048C30:
movs r0, 0
@@ -671,7 +671,7 @@ _08048CD0:
bl sub_8063B54
_08048CE2:
adds r0, r6, 0
bl ResetAction
bl ClearMonsterActionFields
movs r0, 0x1
str r0, [sp]
adds r0, r4, 0
@@ -704,7 +704,7 @@ _08048CE2:
bl sub_8044DF0
adds r0, r6, 0
movs r1, 0x2C
bl SetAction
bl SetMonsterActionFields
b _08048D3E
.align 2, 0
_08048D34: .4byte gUnknown_80FECA0

92
asm/code_80495E4.s
View File

@@ -32,7 +32,7 @@ _080498CA:
b _08049B72
_080498D0:
movs r7, 0
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
movs r1, 0x3
mov r8, r1
@@ -55,7 +55,7 @@ _080498D0:
bgt _0804991C
mov r0, r10
mov r1, r9
bl GetMapTile_2
bl GetTileSafe
ldr r2, [r4]
mov r3, r9
lsls r1, r3, 1
@@ -64,12 +64,12 @@ _080498D0:
add r1, r10
b _08049B68
.align 2, 0
_08049914: .4byte gDungeonGlobalData
_08049914: .4byte gDungeon
_08049918: .4byte 0x00003a0e
_0804991C:
mov r0, r10
mov r1, r9
bl GetMapTile_2
bl GetTileSafe
movs r1, 0
b _08049B70
_08049928:
@@ -78,7 +78,7 @@ _08049928:
str r0, [sp, 0x24]
mov r0, r10
ldr r1, [sp, 0x24]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
@@ -87,14 +87,14 @@ _08049928:
adds r4, 0x1
adds r0, r4, 0
ldr r1, [sp, 0x24]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
str r0, [sp, 0x4]
adds r0, r4, 0
mov r1, r9
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
@@ -103,14 +103,14 @@ _08049928:
subs r5, 0x1
adds r0, r4, 0
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
str r0, [sp, 0xC]
mov r0, r10
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
@@ -118,21 +118,21 @@ _08049928:
subs r4, 0x2
adds r0, r4, 0
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
str r0, [sp, 0x14]
adds r0, r4, 0
mov r1, r9
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
mov r0, r8
ands r0, r1
str r0, [sp, 0x18]
adds r0, r4, 0
ldr r1, [sp, 0x24]
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
mov r1, r8
ands r1, r0
@@ -368,13 +368,13 @@ _08049B3A:
orrs r7, r0
_08049B3C:
movs r0, 0x4
bl RandomCapped
bl RandInt
adds r4, r0, 0
cmp r4, 0x3
bne _08049B4A
movs r4, 0
_08049B4A:
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _08049B56
@@ -382,7 +382,7 @@ _08049B4A:
_08049B56:
mov r0, r10
mov r1, r9
bl GetMapTile_2
bl GetTileSafe
ldr r1, _08049B84
ldr r2, [r1]
lsls r1, r7, 1
@@ -405,7 +405,7 @@ _08049B72:
pop {r0}
bx r0
.align 2, 0
_08049B84: .4byte gDungeonGlobalData
_08049B84: .4byte gDungeon
_08049B88: .4byte 0x00012c24
thumb_func_end sub_80498A8
@@ -451,7 +451,7 @@ sub_8049BB0:
mov r9, r0
mov r0, r10
mov r1, r9
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r4, 0x3
adds r0, r4, 0
@@ -462,14 +462,14 @@ sub_8049BB0:
adds r5, 0x1
adds r0, r5, 0
mov r1, r9
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
str r0, [r6, 0x4]
adds r0, r5, 0
ldr r1, [sp, 0x40]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
@@ -479,14 +479,14 @@ sub_8049BB0:
mov r8, r0
adds r0, r5, 0
mov r1, r8
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
str r0, [r6, 0xC]
mov r0, r10
mov r1, r8
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
@@ -494,21 +494,21 @@ sub_8049BB0:
subs r5, 0x2
adds r0, r5, 0
mov r1, r8
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
str r0, [r6, 0x14]
adds r0, r5, 0
ldr r1, [sp, 0x40]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
adds r0, r4, 0
ands r0, r1
str r0, [r6, 0x18]
adds r0, r5, 0
mov r1, r9
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
ands r4, r0
str r4, [r6, 0x1C]
@@ -828,22 +828,22 @@ _08049E84:
_08049E94:
mov r0, r10
ldr r1, [sp, 0x40]
bl GetMapTile_2
bl GetTileSafe
ldr r1, [sp]
strb r1, [r0, 0xA]
mov r0, r10
ldr r1, [sp, 0x40]
bl GetMapTile_2
bl GetTileSafe
ldr r1, [sp, 0x4]
strb r1, [r0, 0xB]
mov r0, r10
ldr r1, [sp, 0x40]
bl GetMapTile_2
bl GetTileSafe
ldr r1, [sp, 0x8]
strb r1, [r0, 0xC]
mov r0, r10
ldr r1, [sp, 0x40]
bl GetMapTile_2
bl GetTileSafe
ldr r1, [sp, 0xC]
strb r1, [r0, 0xD]
add sp, 0x44
@@ -924,7 +924,7 @@ _08049F1C:
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r3, [sp, 0x34]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r2, [r5]
movs r1, 0x80
@@ -940,7 +940,7 @@ _08049F1C:
adds r2, r6, r0
b _0804A06A
.align 2, 0
_08049F78: .4byte gDungeonGlobalData
_08049F78: .4byte gDungeon
_08049F7C: .4byte 0x00018210
_08049F80: .4byte 0x0001820f
_08049F84: .4byte 0x000181f0
@@ -1111,7 +1111,7 @@ _0804A098:
ldr r0, [sp, 0x10]
adds r1, r2, 0
str r3, [sp, 0x34]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r2, [r5]
movs r0, 0x20
@@ -1324,7 +1324,7 @@ sub_804A1F0:
adds r6, r3, r0
ldr r0, [sp, 0xC]
mov r1, r10
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x20
@@ -1337,7 +1337,7 @@ sub_804A1F0:
adds r2, r7, r0
b _0804A356
.align 2, 0
_0804A284: .4byte gDungeonGlobalData
_0804A284: .4byte gDungeon
_0804A288: .4byte 0x00018210
_0804A28C: .4byte 0x0001820f
_0804A290: .4byte 0x000181f0
@@ -1474,7 +1474,7 @@ _0804A386:
ldr r6, [sp, 0x10]
ldr r0, [sp, 0xC]
mov r1, r10
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x20
@@ -1672,7 +1672,7 @@ sub_804A49C:
mov r3, r9
adds r6, r3, r0
mov r0, r10
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x20
@@ -1685,7 +1685,7 @@ sub_804A49C:
adds r2, r7, r0
b _0804A5DA
.align 2, 0
_0804A52C: .4byte gDungeonGlobalData
_0804A52C: .4byte gDungeon
_0804A530: .4byte 0x00018210
_0804A534: .4byte 0x0001820f
_0804A538: .4byte gUnknown_80F6A4A
@@ -1807,7 +1807,7 @@ _0804A60C:
adds r6, r0, r3
mov r0, r10
ldr r1, [sp, 0xC]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldrh r1, [r5]
movs r0, 0x20
@@ -1963,7 +1963,7 @@ sub_804A728:
ldr r6, _0804A814
ldr r0, [r6]
mov r8, r0
bl GetLeaderEntity
bl GetLeader
str r0, [sp, 0x24]
ldr r0, _0804A818
add r0, r8
@@ -2066,7 +2066,7 @@ _0804A7AC:
str r1, [sp, 0x38]
b _0804A8FC
.align 2, 0
_0804A814: .4byte gDungeonGlobalData
_0804A814: .4byte gDungeon
_0804A818: .4byte 0x000181f0
_0804A81C: .4byte 0x0001821a
_0804A820: .4byte gAdjacentTileOffsets
@@ -2400,7 +2400,7 @@ _0804AA78:
bx r0
.align 2, 0
_0804AAA0: .4byte gUnknown_202B038
_0804AAA4: .4byte gDungeonGlobalData
_0804AAA4: .4byte gDungeon
_0804AAA8: .4byte 0x0001821a
thumb_func_end sub_804AA60
@@ -2415,7 +2415,7 @@ _0804AAB2:
_0804AAB6:
adds r0, r4, 0
adds r1, r5, 0
bl GetMapTile_2
bl GetTileSafe
strh r7, [r0, 0x4]
adds r4, 0x1
cmp r4, 0x37
@@ -2482,7 +2482,7 @@ _0804AB2E:
_0804AB32:
adds r0, r4, 0
adds r1, r6, 0
bl GetMapTile_1
bl GetTile
ldrb r2, [r0, 0x9]
adds r3, r4, 0x1
cmp r2, 0xFF
@@ -2591,7 +2591,7 @@ _0804ABE4:
pop {r0}
bx r0
.align 2, 0
_0804AC04: .4byte gDungeonGlobalData
_0804AC04: .4byte gDungeon
_0804AC08: .4byte 0x0000270f
_0804AC0C: .4byte 0x0000d8f1
_0804AC10: .4byte 0x000104c4
@@ -2611,7 +2611,7 @@ sub_804AC20:
ldrsh r0, [r4, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
ldrb r1, [r0, 0x9]
ldr r0, _0804AC6C
ldr r3, [r0]
@@ -2641,7 +2641,7 @@ _0804AC52:
mov r8, r0
b _0804ACA2
.align 2, 0
_0804AC6C: .4byte gDungeonGlobalData
_0804AC6C: .4byte gDungeon
_0804AC70: .4byte 0x00018209
_0804AC74:
lsls r0, r1, 3
@@ -2679,7 +2679,7 @@ _0804ACA8:
_0804ACB0:
adds r0, r4, 0
adds r1, r5, 0
bl GetMapTile_2
bl GetTileSafe
ldrh r2, [r0, 0x4]
movs r1, 0x3
orrs r1, r2

736
asm/code_804AFAC.s
View File

File diff suppressed because it is too large Load Diff

168
asm/code_80521D0.s
View File

@@ -129,7 +129,7 @@ _08052450:
strh r2, [r1]
b _080523FA
.align 2, 0
_0805249C: .4byte gDungeonGlobalData
_0805249C: .4byte gDungeon
_080524A0: .4byte 0x0001c060
_080524A4: .4byte 0x0001c062
_080524A8: .4byte 0x0001c054
@@ -163,7 +163,7 @@ _080524D4:
pop {r0}
bx r0
.align 2, 0
_080524E4: .4byte gDungeonGlobalData
_080524E4: .4byte gDungeon
_080524E8: .4byte 0x0001c064
_080524EC: .4byte 0x0001c06c
thumb_func_end sub_80523A8
@@ -195,7 +195,7 @@ _08052510:
_0805251A:
b _0805267C
.align 2, 0
_0805251C: .4byte gDungeonGlobalData
_0805251C: .4byte gDungeon
_08052520: .4byte 0x0001bdd4
_08052524: .4byte 0x0001c06c
_08052528:
@@ -458,7 +458,7 @@ _08052724:
pop {r0}
bx r0
.align 2, 0
_0805272C: .4byte gDungeonGlobalData
_0805272C: .4byte gDungeon
_08052730: .4byte 0x0001bdd4
_08052734: .4byte 0x0001c06c
_08052738: .4byte 0x0001c060
@@ -523,7 +523,7 @@ _080527A4:
pop {r0}
bx r0
.align 2, 0
_080527B0: .4byte gDungeonGlobalData
_080527B0: .4byte gDungeon
_080527B4: .4byte 0x0001bdd4
_080527B8: .4byte 0x0001c064
_080527BC: .4byte gRealInputs
@@ -605,7 +605,7 @@ _08052844:
b _0805286C
.align 2, 0
_08052858: .4byte gUnknown_203B40C
_0805285C: .4byte gDungeonGlobalData
_0805285C: .4byte gDungeon
_08052860: .4byte 0x0001820a
_08052864: .4byte 0x00000701
_08052868:
@@ -657,7 +657,7 @@ _080528B2:
bl sub_803EAF0
b _080528E4
.align 2, 0
_080528D0: .4byte gDungeonGlobalData
_080528D0: .4byte gDungeon
_080528D4: .4byte 0x0001c05f
_080528D8: .4byte gUnknown_202EE01
_080528DC:
@@ -698,7 +698,7 @@ DisplayDungeonDialogue:
push {r6,r7}
sub sp, 0x14
adds r6, r0, 0
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r4, r0, 0
bl GetPartnerEntity
adds r5, r0, 0
@@ -785,7 +785,7 @@ _080529D4:
ldr r0, _080529E4
ldr r1, _080529E8
ldr r2, _080529EC
bl sprintf_2
bl sprintfStatic
b _08052A28
.align 2, 0
_080529E4: .4byte gUnknown_202E5D8
@@ -795,7 +795,7 @@ _080529F0:
ldr r0, _080529FC
ldr r1, _08052A00
ldr r2, _08052A04
bl sprintf_2
bl sprintfStatic
b _08052A28
.align 2, 0
_080529FC: .4byte gUnknown_202E5D8
@@ -815,7 +815,7 @@ _08052A1C:
ldrsh r4, [r6, r1]
ldr r0, _08052A48
adds r1, r4, 0
bl CopyYellowSpeciesNametoBuffer
bl CopyYellowMonsterNametoBuffer
_08052A28:
ldrh r0, [r6]
subs r0, 0x2
@@ -835,7 +835,7 @@ _08052A3C:
.align 2, 0
_08052A48: .4byte gUnknown_202E5D8
_08052A4C: .4byte gUnknown_80F7B04
_08052A50: .4byte gDungeonGlobalData
_08052A50: .4byte gDungeon
_08052A54:
movs r0, 0x6
ldrsh r1, [r6, r0]
@@ -1055,7 +1055,7 @@ _08052C02:
bl sub_80141E0
b _08052C28
.align 2, 0
_08052C14: .4byte gDungeonGlobalData
_08052C14: .4byte gDungeon
_08052C18: .4byte 0x0001820a
_08052C1C:
movs r2, 0xC0
@@ -1195,7 +1195,7 @@ _08052D20:
pop {r1}
bx r1
.align 2, 0
_08052D3C: .4byte gDungeonGlobalData
_08052D3C: .4byte gDungeon
_08052D40: .4byte 0x0001820a
thumb_func_end sub_8052C68
@@ -1272,7 +1272,7 @@ sub_8052DC0:
thumb_func_start sub_8052DD0
sub_8052DD0:
push {r4-r6,lr}
bl GetLeaderEntity
bl GetLeader
adds r5, r0, 0
ldr r6, _08052E68
ldr r4, [r6]
@@ -1340,7 +1340,7 @@ _08052E46:
_08052E68: .4byte gUnknown_80FF020
_08052E6C: .4byte gUnknown_80FF080
_08052E70: .4byte gUnknown_80FF0D8
_08052E74: .4byte gDungeonGlobalData
_08052E74: .4byte gDungeon
_08052E78: .4byte 0x00000644
_08052E7C: .4byte gUnknown_80FF13C
_08052E80: .4byte gUnknown_80FF1B4
@@ -1379,7 +1379,7 @@ sub_8052EC0:
lsrs r4, r0, 24
adds r5, r4, 0
adds r0, r4, 0
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -1484,7 +1484,7 @@ sub_8052F80:
bl PrintFieldMessage
b _08052FB0
.align 2, 0
_08052F9C: .4byte gDungeonGlobalData
_08052F9C: .4byte gDungeon
_08052FA0: .4byte gUnknown_80FF6F8
_08052FA4:
ldr r0, _08052FB4
@@ -1731,7 +1731,7 @@ sub_805317C:
ldrb r0, [r0]
b _0805319E
.align 2, 0
_08053198: .4byte gDungeonGlobalData
_08053198: .4byte gDungeon
_0805319C:
movs r0, 0x3F
_0805319E:
@@ -1780,7 +1780,7 @@ _080531BC:
pop {r0}
bx r0
.align 2, 0
_080531F0: .4byte gDungeonGlobalData
_080531F0: .4byte gDungeon
_080531F4: .4byte 0x0001c073
_080531F8: .4byte 0x0001c070
_080531FC: .4byte 0x0001c072
@@ -1794,7 +1794,7 @@ sub_8053200:
strb r0, [r1, 0xB]
bx lr
.align 2, 0
_0805320C: .4byte gDungeonGlobalData
_0805320C: .4byte gDungeon
thumb_func_end sub_8053200
thumb_func_start sub_8053210
@@ -1842,7 +1842,7 @@ sub_8053210:
mov r1, r12
b _08053282
.align 2, 0
_08053264: .4byte gDungeonGlobalData
_08053264: .4byte gDungeon
_08053268: .4byte 0x0001c070
_0805326C: .4byte 0x0001c071
_08053270: .4byte 0x0001c072
@@ -2065,7 +2065,7 @@ _0805340A:
pop {r0}
bx r0
.align 2, 0
_08053428: .4byte gDungeonGlobalData
_08053428: .4byte gDungeon
_0805342C: .4byte 0x0001c070
thumb_func_end sub_80533A4
@@ -2091,7 +2091,7 @@ _0805344C:
blt _0805344C
b _0805345E
.align 2, 0
_08053454: .4byte gDungeonGlobalData
_08053454: .4byte gDungeon
_08053458: .4byte gUnknown_202F1F8
_0805345C:
subs r1, 0x14
@@ -2197,7 +2197,7 @@ _08053528:
pop {r1}
bx r1
.align 2, 0
_08053530: .4byte gDungeonGlobalData
_08053530: .4byte gDungeon
_08053534: .4byte 0x0001c070
_08053538: .4byte gUnknown_203B084
_0805353C: .4byte gUnknown_202F1F8
@@ -2224,7 +2224,7 @@ _0805355A:
blt _0805355A
b _0805356E
.align 2, 0
_08053564: .4byte gDungeonGlobalData
_08053564: .4byte gDungeon
_08053568: .4byte gUnknown_202F1F8
_0805356C:
subs r4, 0x14
@@ -2319,7 +2319,7 @@ _08053622:
pop {r1}
bx r1
.align 2, 0
_0805362C: .4byte gDungeonGlobalData
_0805362C: .4byte gDungeon
_08053630: .4byte 0x0001c070
_08053634: .4byte gUnknown_203B080
_08053638: .4byte gUnknown_202F1F8
@@ -2451,7 +2451,7 @@ _08053734:
ldrb r1, [r1]
strb r1, [r0]
ldr r0, [sp, 0x18]
bl MoveTargetsUser
bl CanBeSnatched
lsls r0, 24
cmp r0, 0
beq _080537B4
@@ -2498,14 +2498,14 @@ _08053792:
adds r5, r4, 0
b _08053A1C
.align 2, 0
_080537A4: .4byte gDungeonGlobalData
_080537A4: .4byte gDungeon
_080537A8: .4byte 0x00017b30
_080537AC: .4byte 0x00017b3c
_080537B0: .4byte gUnknown_80FCD28
_080537B4:
adds r0, r7, 0
mov r1, r8
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -2575,14 +2575,14 @@ _08053828:
str r3, [sp, 0x2C]
b _08053A1C
.align 2, 0
_08053844: .4byte gDungeonGlobalData
_08053844: .4byte gDungeon
_08053848: .4byte 0x00017b2c
_0805384C: .4byte 0x00017b38
_08053850: .4byte gUnknown_80FCD0C
_08053854:
adds r0, r5, 0
movs r1, 0x2C
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
bne _08053864
@@ -2599,7 +2599,7 @@ _08053874:
adds r0, r7, 0
mov r1, r8
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
movs r1, 0xF0
ands r1, r0
cmp r1, 0
@@ -2630,7 +2630,7 @@ _080538AE:
adds r0, 0x46
ldrb r4, [r0]
mov r10, r4
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _080538CC
@@ -2668,7 +2668,7 @@ _080538DA:
movs r3, 0x2
ldrsh r2, [r2, r3]
adds r1, r2
bl GetMapTile_1
bl GetTile
ldr r0, [r0, 0x10]
str r0, [sp, 0x38]
bl EntityExists
@@ -2856,7 +2856,7 @@ _08053A86:
cmp r0, 0x5
bne _08053AE8
ldr r0, [sp, 0x18]
bl MoveAffectedByMagicCoat
bl IsReflectedByMagicCoat
lsls r0, 24
cmp r0, 0
beq _08053B5C
@@ -2897,7 +2897,7 @@ _08053AE8:
adds r0, r7, 0
mov r1, r8
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
lsls r0, 16
asrs r1, r0, 16
ldr r0, _08053C88
@@ -2958,7 +2958,7 @@ _08053B5C:
adds r0, r7, 0
mov r1, r8
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
@@ -3006,7 +3006,7 @@ _08053BC0:
cmp r0, 0
beq _08053BFA
mov r0, r8
bl IsBlockedBySoundproof
bl IsSoundMove
lsls r0, 24
cmp r0, 0
beq _08053BFA
@@ -3244,7 +3244,7 @@ _08053DA8:
beq _08053DCE
adds r0, r5, 0x4
adds r1, r7, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
strb r0, [r4]
_08053DCE:
ldr r1, [sp, 0x24]
@@ -3261,7 +3261,7 @@ _08053DCE:
beq _08053DF2
adds r0, r5, 0x4
adds r1, r7, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
strb r0, [r4]
_08053DF2:
adds r0, r5, 0
@@ -3310,7 +3310,7 @@ _08053E4A:
adds r0, r7, 0
mov r1, r8
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
movs r1, 0xF
ands r1, r0
cmp r1, 0
@@ -5857,16 +5857,16 @@ sub_8055640:
mov r9, r3
ldr r7, [sp, 0x44]
adds r1, r5, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
adds r1, r5, 0
bl CalculateMovePower
bl GetMovePower
mov r8, r0
adds r0, r5, 0
bl GetMoveCriticalHitChance
bl GetMoveCritChance
str r0, [sp]
add r0, sp, 0x14
str r0, [sp, 0x4]
@@ -5917,10 +5917,10 @@ sub_80556BC:
lsls r4, 24
lsrs r4, 24
adds r1, r5, 0
bl CalculateMovePower
bl GetMovePower
mov r8, r0
adds r0, r5, 0
bl GetMoveCriticalHitChance
bl GetMoveCritChance
str r0, [sp]
add r0, sp, 0x14
str r0, [sp, 0x4]
@@ -6021,7 +6021,7 @@ _08055790:
bl sub_806D010
b _08055826
.align 2, 0
_080557AC: .4byte gDungeonGlobalData
_080557AC: .4byte gDungeon
_080557B0: .4byte 0x00000662
_080557B4: .4byte 0x000003e7
_080557B8: .4byte 0x00017b34
@@ -6114,7 +6114,7 @@ sub_8055864:
adds r5, r2, 0
adds r6, r3, 0
adds r1, r5, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6290,10 +6290,10 @@ _080559B6:
bgt _080559D4
adds r0, r4, 0x4
adds r1, r2, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r1, r0, 0
adds r0, r4, 0
bl CanAttackInFront
bl CanAttackInDirection
lsls r0, 24
cmp r0, 0
beq _080559D4
@@ -6314,7 +6314,7 @@ sub_80559DC:
ldr r4, [r5, 0x70]
adds r0, r5, 0x4
adds r1, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r1, r0, 0
movs r2, 0x7
ands r0, r2
@@ -7033,7 +7033,7 @@ sub_8055FA0:
cmp r1, r0
bne _08056010
movs r0, 0x69
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _08056004
str r0, [r1]
add r4, sp, 0x110
@@ -7112,7 +7112,7 @@ _08056068:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
movs r4, 0xF0
adds r1, r4, 0
ands r1, r0
@@ -7124,7 +7124,7 @@ _08056084:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
adds r1, r4, 0
ands r1, r0
cmp r1, 0x80
@@ -7135,7 +7135,7 @@ _08056084:
cmp r0, 0x97
bne _080560AE
adds r0, r5, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7182,7 +7182,7 @@ _080560CC:
bl sub_805744C
b _08056142
.align 2, 0
_08056108: .4byte gDungeonGlobalData
_08056108: .4byte gDungeon
_0805610C: .4byte 0x00003a0e
_08056110: .4byte gNaturePowerMoveTable
_08056114: .4byte gUnknown_80FECE0
@@ -7204,7 +7204,7 @@ _08056136:
adds r0, r5, 0
adds r1, r7, 0
movs r2, 0x1
bl IsMoveUsable
bl CanMonsterUseMove
_08056142:
lsls r0, 24
lsrs r4, r0, 24
@@ -7222,7 +7222,7 @@ _08056156:
cmp r0, 0x1
bne _080561A0
ldrh r0, [r7, 0x2]
bl MoveAffectedByMuzzled
bl FailsWhileMuzzled
lsls r0, 24
cmp r0, 0
beq _080561A0
@@ -7393,7 +7393,7 @@ _080562CE:
bne _080562F4
ldr r4, [r5, 0x70]
movs r0, 0x8
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, 0x46
strb r0, [r4]
adds r0, r5, 0
@@ -7735,7 +7735,7 @@ _0805658C:
mov r2, r8
movs r1, 0x4
ldrsh r0, [r2, r1]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -7746,7 +7746,7 @@ _0805658C:
_080565A4:
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7801,7 +7801,7 @@ _08056602:
beq _080566E4
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7819,7 +7819,7 @@ _08056602:
ldrsh r5, [r0, r1]
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7844,7 +7844,7 @@ _08056602:
bl sub_800569C
b _08056694
.align 2, 0
_08056680: .4byte gDungeonGlobalData
_08056680: .4byte gDungeon
_08056684: .4byte 0x0001820a
_08056688: .4byte 0xffff0000
_0805668C: .4byte 0x0000ffff
@@ -7854,7 +7854,7 @@ _08056690:
_08056694:
ldrh r4, [r7, 0x2]
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7995,7 +7995,7 @@ _08056780:
movs r2, 0
ldrsh r0, [r6, r2]
asrs r1, 16
bl GetMapTile_1
bl GetTile
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -8226,7 +8226,7 @@ _0805695E:
b _0805697E
.align 2, 0
_0805696C: .4byte gUnknown_81069D4
_08056970: .4byte gDungeonGlobalData
_08056970: .4byte gDungeon
_08056974: .4byte 0x0001c05e
_08056978: .4byte 0x0001820a
_0805697C:
@@ -8293,7 +8293,7 @@ _080569D4:
.align 2, 0
_080569F0: .4byte 0xffff0000
_080569F4: .4byte 0x0000ffff
_080569F8: .4byte gDungeonGlobalData
_080569F8: .4byte gDungeon
_080569FC: .4byte 0x000181f2
_08056A00:
movs r0, 0x18
@@ -8307,7 +8307,7 @@ _08056A0E:
ldrsh r0, [r7, r2]
movs r6, 0x2
ldrsh r1, [r7, r6]
bl GetMapTile_1
bl GetTile
adds r6, r0, 0
ldrh r1, [r6]
movs r0, 0x3
@@ -8349,7 +8349,7 @@ _08056A66:
mov r0, r10
ldr r1, [sp, 0x1C]
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
adds r2, r0, 0
lsls r2, 16
asrs r2, 16
@@ -8415,7 +8415,7 @@ _08056AC2:
bl sub_8053704
b _08056B22
.align 2, 0
_08056AF4: .4byte gDungeonGlobalData
_08056AF4: .4byte gDungeon
_08056AF8: .4byte 0x0001c05e
_08056AFC:
ldr r0, [sp, 0x20]
@@ -8461,10 +8461,10 @@ sub_8056B34:
lsls r4, 24
lsrs r4, 24
mov r0, r8
bl GetMoveAccuracy
bl GetMoveAccuracyOrAIChance
adds r5, r0, 0
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
str r0, [sp]
ldr r0, [r7, 0x70]
mov r9, r0
@@ -8483,7 +8483,7 @@ _08056B70:
bne _08056B8A
adds r0, r7, 0
movs r1, 0x4
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08056B8A
@@ -8506,7 +8506,7 @@ _08056B9C:
_08056BA2:
adds r0, r6, 0
movs r1, 0x23
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08056BB6
@@ -8516,7 +8516,7 @@ _08056BA2:
_08056BB6:
adds r0, r6, 0
movs r1, 0x5
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08056BCA
@@ -8540,7 +8540,7 @@ _08056BE0:
cmp r0, 0x40
bne _08056BFC
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -8588,7 +8588,7 @@ _08056C2A:
movs r4, 0xA
_08056C3C:
adds r0, r6, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -8720,7 +8720,7 @@ _08056D2E:
str r1, [sp, 0x14]
adds r0, r5, 0
movs r1, 0x7
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08056D44
@@ -8731,7 +8731,7 @@ _08056D44:
adds r0, r5, 0
mov r1, r8
movs r2, 0
bl GetMoveTargetingFlagsForPokemon
bl GetMoveTargetAndRangeForPokemon
lsls r0, 16
asrs r7, r0, 16
movs r0, 0xF
@@ -8748,7 +8748,7 @@ _08056D44:
cmp r0, 0x97
bne _08056D7E
adds r0, r5, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8880,7 +8880,7 @@ _08056E3A:
str r1, [sp, 0x8]
b _08056E86
.align 2, 0
_08056E74: .4byte gDungeonGlobalData
_08056E74: .4byte gDungeon
_08056E78: .4byte 0x000135cc
_08056E7C:
str r4, [sp]
@@ -8983,7 +8983,7 @@ _08056F38:
ble _08056F06
b _08056F64
.align 2, 0
_08056F40: .4byte gDungeonGlobalData
_08056F40: .4byte gDungeon
_08056F44: .4byte 0x000135cc
_08056F48:
cmp r1, 0x70

52
asm/code_8057824.s
View File

@@ -251,7 +251,7 @@ _0805950E:
pop {r1}
bx r1
.align 2, 0
_08059518: .4byte gDungeonGlobalData
_08059518: .4byte gDungeon
_0805951C: .4byte gUnknown_80F4F42
_08059520: .4byte 0x0000e269
_08059524: .4byte gUnknown_80FCF78
@@ -452,7 +452,7 @@ sub_805968C:
mov r8, r1
adds r6, r2, 0
adds r7, r3, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -673,7 +673,7 @@ DiveMoveAction:
adds r5, r2, 0
mov r8, r3
movs r6, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
bl IsTileGround
lsls r0, 24
cmp r0, 0
@@ -1009,7 +1009,7 @@ sub_8059AC4:
adds r5, r0, 0
adds r6, r1, 0
ldr r4, _08059AF4
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -1160,7 +1160,7 @@ _08059BE2:
beq _08059C08
adds r0, r5, 0
adds r1, r4, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
lsls r0, 24
cmp r0, 0
beq _08059C08
@@ -1179,13 +1179,13 @@ _08059C08:
mov r0, r8
cmp r0, 0
beq _08059C5C
bl DungeonRandomCapped
bl DungeonRandInt
lsls r0, 2
mov r1, sp
adds r4, r1, r0
ldr r1, [r4]
adds r0, r5, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
adds r1, r7, 0
adds r1, 0x5C
movs r2, 0
@@ -1524,16 +1524,16 @@ _08059E8A:
bne _08059F1A
adds r0, r6, 0
adds r1, r7, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
adds r1, r7, 0
bl CalculateMovePower
bl GetMovePower
adds r5, r0, 0
adds r0, r7, 0
bl GetMoveCriticalHitChance
bl GetMoveCritChance
str r0, [sp]
add r2, sp, 0x18
str r2, [sp, 0x4]
@@ -1706,16 +1706,16 @@ _08059FFE:
bne _0805A090
adds r0, r6, 0
adds r1, r7, 0
bl GetMoveTypeForPokemon
bl GetMoveTypeForMonster
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
adds r1, r7, 0
bl CalculateMovePower
bl GetMovePower
adds r5, r0, 0
adds r0, r7, 0
bl GetMoveCriticalHitChance
bl GetMoveCritChance
str r0, [sp]
add r2, sp, 0x18
str r2, [sp, 0x4]
@@ -1807,7 +1807,7 @@ sub_805A0A8:
cmp r0, 0
beq _0805A114
movs r0, 0x3
bl DungeonRandomCapped
bl DungeonRandInt
cmp r0, 0x1
beq _0805A0FC
cmp r0, 0x1
@@ -1885,7 +1885,7 @@ _0805A170: .4byte gUnknown_80FCCE4
_0805A174:
adds r0, r5, 0
movs r1, 0x24
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0805A18C
@@ -2174,7 +2174,7 @@ _0805A386:
pop {r1}
bx r1
.align 2, 0
_0805A38C: .4byte gDungeonGlobalData
_0805A38C: .4byte gDungeon
_0805A390: .4byte gUnknown_80FC81C
thumb_func_end sub_805A31C
@@ -2207,7 +2207,7 @@ _0805A3C2:
pop {r1}
bx r1
.align 2, 0
_0805A3CC: .4byte gDungeonGlobalData
_0805A3CC: .4byte gDungeon
_0805A3D0: .4byte gUnknown_80F4F42
_0805A3D4: .4byte 0x0000e268
_0805A3D8: .4byte gUnknown_80FCF7C
@@ -2655,7 +2655,7 @@ _0805A70C: .4byte gUnknown_80FCCE8
_0805A710:
adds r0, r5, 0
movs r1, 0x24
bl HasItem
bl HasHeldItem
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -2837,10 +2837,10 @@ sub_805A85C:
movs r5, 0
_0805A880:
movs r0, 0x3
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
movs r0, 0x3
bl DungeonRandomCapped
bl DungeonRandInt
adds r2, r0, 0
subs r4, 0x1
subs r2, 0x1
@@ -2940,7 +2940,7 @@ _0805A94C:
add r4, sp, 0x18
movs r2, 0x2
ldrsh r1, [r4, r2]
bl GetMapTile_2
bl GetTileSafe
ldr r5, [r0, 0x10]
cmp r5, 0
beq _0805AA4C
@@ -3109,7 +3109,7 @@ _0805AAB8:
pop {r1}
bx r1
.align 2, 0
_0805AAC8: .4byte gDungeonGlobalData
_0805AAC8: .4byte gDungeon
_0805AACC: .4byte 0x00003a08
thumb_func_end sub_805A85C
@@ -3230,7 +3230,7 @@ _0805AB88:
.align 2, 0
_0805ABA8: .4byte gUnknown_80F4E06
_0805ABAC: .4byte gUnknown_80F5978
_0805ABB0: .4byte gDungeonGlobalData
_0805ABB0: .4byte gDungeon
_0805ABB4: .4byte 0x00003a0e
_0805ABB8: .4byte _0805ABBC
.align 2, 0
@@ -3464,7 +3464,7 @@ sub_805AD54:
movs r0, 0x10
b _0805AD92
.align 2, 0
_0805AD80: .4byte gDungeonGlobalData
_0805AD80: .4byte gDungeon
_0805AD84: .4byte 0x0001358c
_0805AD88:
ldr r0, _0805AD98
@@ -3477,7 +3477,7 @@ _0805AD92:
movs r6, 0
b _0805AE0E
.align 2, 0
_0805AD98: .4byte gDungeonGlobalData
_0805AD98: .4byte gDungeon
_0805AD9C: .4byte 0x0001357c
_0805ADA0:
lsls r0, r6, 2
@@ -3696,7 +3696,7 @@ sub_805AF30:
adds r6, r2, 0
adds r4, r3, 0
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r1, r0, 0
cmp r0, 0x9
bgt _0805AF54

500
asm/code_805D8C8.s
View File

File diff suppressed because it is too large Load Diff

142
asm/code_8069E0C.s
View File

@@ -39,7 +39,7 @@ _0806A33E:
str r0, [r1]
b _0806A38A
.align 2, 0
_0806A378: .4byte gDungeonGlobalData
_0806A378: .4byte gDungeon
_0806A37C: .4byte 0x000135cc
_0806A380: .4byte 0x00017b30
_0806A384:
@@ -77,7 +77,7 @@ _0806A3A0:
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
bl GetMoveMaxPP
bl GetMoveBasePP
strb r0, [r4, 0x4]
_0806A3C2:
adds r4, 0x8
@@ -187,7 +187,7 @@ _0806A488:
movs r2, 0x6
ldrsh r1, [r6, r2]
adds r1, r7
bl GetMapTile_2
bl GetTileSafe
adds r4, r0, 0
ldr r0, [r4, 0x10]
cmp r0, 0
@@ -366,7 +366,7 @@ sub_806A5B8:
b _0806A6D2
_0806A5CE:
adds r0, r6, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
ldrh r0, [r0]
movs r1, 0x3
ands r1, r0
@@ -395,7 +395,7 @@ _0806A5CE:
_0806A608:
movs r1, 0x2
ldrsh r0, [r4, r1]
bl GetWalkableTiles
bl GetMovementType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -420,7 +420,7 @@ _0806A608:
b _0806A6D2
.align 2, 0
_0806A640: .4byte gDungeonWaterType
_0806A644: .4byte gDungeonGlobalData
_0806A644: .4byte gDungeon
_0806A648: .4byte 0x00003a0e
_0806A64C: .4byte 0x00000113
_0806A650:
@@ -556,7 +556,7 @@ _0806A744:
bl DungeonEntityUpdateStatusSprites
b _0806A776
.align 2, 0
_0806A75C: .4byte gDungeonGlobalData
_0806A75C: .4byte gDungeon
_0806A760: .4byte 0x00000676
_0806A764:
cmp r1, 0x11
@@ -627,7 +627,7 @@ _0806A7D2:
pop {r0}
bx r0
.align 2, 0
_0806A7E0: .4byte gDungeonGlobalData
_0806A7E0: .4byte gDungeon
_0806A7E4: .4byte 0x0001357c
thumb_func_end sub_806A7A0
@@ -763,14 +763,14 @@ _0806A8C8:
cmp r0, 0
beq _0806A8EE
adds r0, r4, 0
bl CannotAct
bl HasStatusThatPreventsActing
lsls r0, 24
cmp r0, 0
bne _0806A90E
_0806A8EE:
adds r0, r4, 0x4
adds r1, r6, 0
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r2, r0, 0
movs r1, 0x7
ands r0, r1
@@ -836,7 +836,7 @@ _0806A95C:
pop {r0}
bx r0
.align 2, 0
_0806A96C: .4byte gDungeonGlobalData
_0806A96C: .4byte gDungeon
_0806A970: .4byte 0x000135cc
thumb_func_end sub_806A914
@@ -870,7 +870,7 @@ _0806A99E:
pop {r0}
bx r0
.align 2, 0
_0806A9AC: .4byte gDungeonGlobalData
_0806A9AC: .4byte gDungeon
_0806A9B0: .4byte 0x000135cc
thumb_func_end sub_806A974
@@ -963,7 +963,7 @@ _0806AA56:
movs r0, 0
b _0806AA6A
.align 2, 0
_0806AA5C: .4byte gDungeonGlobalData
_0806AA5C: .4byte gDungeon
_0806AA60: .4byte 0x000037fd
_0806AA64: .4byte 0x000037ff
_0806AA68:
@@ -1009,7 +1009,7 @@ _0806AA7C:
bl sub_8042B20
b _0806AB0A
.align 2, 0
_0806AAB4: .4byte gDungeonGlobalData
_0806AAB4: .4byte gDungeon
_0806AAB8: .4byte 0x0001357c
_0806AABC:
adds r0, r4, 0
@@ -1134,7 +1134,7 @@ _0806AB92:
pop {r0}
bx r0
.align 2, 0
_0806ABA4: .4byte gDungeonGlobalData
_0806ABA4: .4byte gDungeon
_0806ABA8: .4byte 0x000135cc
thumb_func_end sub_806AB2C
@@ -1456,7 +1456,7 @@ _0806AE06:
b _0806AE94
.align 2, 0
_0806AE1C: .4byte 0xfffffdfc
_0806AE20: .4byte gDungeonGlobalData
_0806AE20: .4byte gDungeon
_0806AE24: .4byte 0x00002f3c
_0806AE28: .4byte 0x000001a7
_0806AE2C: .4byte 0x0000363c
@@ -1544,7 +1544,7 @@ _0806AEB2:
pop {r0}
bx r0
.align 2, 0
_0806AECC: .4byte gDungeonGlobalData
_0806AECC: .4byte gDungeon
_0806AED0: .4byte 0x0000363c
_0806AED4: .4byte 0x000001a7
thumb_func_end sub_806AD3C
@@ -1573,7 +1573,7 @@ sub_806AED8:
movs r3, 0
b _0806AF7A
.align 2, 0
_0806AF04: .4byte gDungeonGlobalData
_0806AF04: .4byte gDungeon
_0806AF08: .4byte 0x00002f3c
_0806AF0C:
lsls r0, r2, 16
@@ -1902,7 +1902,7 @@ sub_806B168:
adds r1, r4
movs r2, 0
ldrsh r1, [r1, r2]
bl GetMapTile_1
bl GetTile
ldrb r0, [r0, 0x9]
str r0, [sp, 0x2C]
movs r3, 0
@@ -2101,7 +2101,7 @@ _0806B2D2:
ldrsh r1, [r1, r4]
adds r1, r6, r1
str r3, [sp, 0x38]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
ldrb r0, [r1, 0x9]
ldr r3, [sp, 0x38]
@@ -2125,7 +2125,7 @@ _0806B2D2:
mov r3, r10
b _0806B3A8
.align 2, 0
_0806B324: .4byte gDungeonGlobalData
_0806B324: .4byte gDungeon
_0806B328: .4byte 0x0000e218
_0806B32C: .4byte 0x0000e21a
_0806B330: .4byte gRecruitedPokemonRef
@@ -2168,7 +2168,7 @@ _0806B366:
movs r3, 0
ldrsh r1, [r1, r3]
adds r1, r6, r1
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
mov r4, r8
movs r2, 0xE
@@ -2202,7 +2202,7 @@ _0806B3A8:
bl sub_806B8CC
b _0806B3E8
.align 2, 0
_0806B3CC: .4byte gDungeonGlobalData
_0806B3CC: .4byte gDungeon
_0806B3D0: .4byte gUnknown_80F4598
_0806B3D4: .4byte 0x0000e218
_0806B3D8: .4byte 0x0000e21a
@@ -2286,7 +2286,7 @@ _0806B460:
movs r0, 0
mov r2, r9
str r0, [r2]
bl GetLeaderEntity
bl GetLeader
adds r5, r0, 0
bl EntityExists
lsls r0, 24
@@ -2297,7 +2297,7 @@ _0806B460:
ldrh r4, [r5, 0x4]
b _0806B4AE
.align 2, 0
_0806B480: .4byte gLeaderPokemon
_0806B480: .4byte gLeaderPointer
_0806B484: .4byte gRecruitedPokemonRef
_0806B488: .4byte 0x000055aa
_0806B48C: .4byte 0x00008df8
@@ -2324,7 +2324,7 @@ _0806B4AE:
asrs r0, r5, 16
asrs r4, 16
adds r1, r4, 0
bl GetMapTile_1
bl GetTile
ldrb r0, [r0, 0x9]
str r0, [sp, 0x20]
movs r2, 0
@@ -2387,7 +2387,7 @@ _0806B51C:
mov r5, r10
adds r1, r5
str r2, [sp, 0x2C]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
ldrb r0, [r1, 0x9]
ldr r2, [sp, 0x2C]
@@ -2412,7 +2412,7 @@ _0806B51C:
adds r2, r5
b _0806B642
.align 2, 0
_0806B560: .4byte gDungeonGlobalData
_0806B560: .4byte gDungeon
_0806B564: .4byte 0x0000e218
_0806B568: .4byte 0x0000e21a
_0806B56C: .4byte 0x000055aa
@@ -2453,7 +2453,7 @@ _0806B5A8:
mov r5, r10
adds r1, r5
str r2, [sp, 0x2C]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
movs r3, 0xE
ldrsh r0, [r6, r3]
@@ -2503,7 +2503,7 @@ _0806B606:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r5, r3]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
movs r3, 0xE
ldrsh r0, [r6, r3]
@@ -2577,7 +2577,7 @@ _0806B67C:
str r0, [r1]
b _0806B6BE
.align 2, 0
_0806B6AC: .4byte gDungeonGlobalData
_0806B6AC: .4byte gDungeon
_0806B6B0: .4byte 0x0001357c
_0806B6B4: .4byte gUnknown_202EE0C
_0806B6B8:
@@ -2625,7 +2625,7 @@ sub_806B6C4:
adds r0, r2
b _0806B71A
.align 2, 0
_0806B708: .4byte gDungeonGlobalData
_0806B708: .4byte gDungeon
_0806B70C: .4byte 0x000037ff
_0806B710:
ldr r0, _0806B77C
@@ -2636,10 +2636,10 @@ _0806B710:
_0806B71A:
strb r1, [r0]
movs r0, 0x38
bl DungeonRandomCapped
bl DungeonRandInt
adds r5, r0, 0
movs r0, 0x20
bl DungeonRandomCapped
bl DungeonRandInt
adds r7, r0, 0
movs r0, 0
_0806B72E:
@@ -2661,7 +2661,7 @@ _0806B740:
_0806B748:
adds r0, r5, 0
adds r1, r7, 0
bl GetMapTile_1
bl GetTile
ldrh r1, [r0, 0x4]
movs r0, 0x8
ands r0, r1
@@ -2685,7 +2685,7 @@ _0806B748:
movs r6, 0x1
b _0806B794
.align 2, 0
_0806B77C: .4byte gDungeonGlobalData
_0806B77C: .4byte gDungeon
_0806B780: .4byte 0x000037ff
_0806B784:
movs r0, 0
@@ -2745,7 +2745,7 @@ _0806B7E2:
pop {r0}
bx r0
.align 2, 0
_0806B7F4: .4byte gDungeonGlobalData
_0806B7F4: .4byte gDungeon
thumb_func_end sub_806B6C4
thumb_func_start sub_806B7F8
@@ -2763,7 +2763,7 @@ sub_806B7F8:
ldrsh r0, [r6, r1]
movs r2, 0xE
ldrsh r1, [r6, r2]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
movs r3, 0
ldrsh r0, [r6, r3]
@@ -2823,11 +2823,11 @@ _0806B838:
cmp r0, 0
bne _0806B8B6
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
movs r1, 0
ldrsh r0, [r6, r1]
bl GetUnk1D
bl GetChanceAsleep
lsls r0, 24
lsrs r0, 24
cmp r0, r4
@@ -2903,13 +2903,13 @@ _0806B906:
ldrsh r4, [r0, r3]
b _0806B932
.align 2, 0
_0806B92C: .4byte gDungeonGlobalData
_0806B92C: .4byte gDungeon
_0806B930:
adds r4, r1, 0
_0806B932:
mov r0, r9
mov r1, r10
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
adds r0, r4, 0
bl sub_807034C
@@ -3124,7 +3124,7 @@ _0806BA72:
ldrb r0, [r0]
cmp r0, 0
beq _0806BB24
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
bne _0806BB24
@@ -3184,8 +3184,8 @@ _0806BB50: .4byte gUnknown_202F32C
_0806BB54: .4byte 0xffff0000
_0806BB58: .4byte 0x0000ffff
_0806BB5C: .4byte gUnknown_202EE0C
_0806BB60: .4byte gLeaderPokemon
_0806BB64: .4byte gDungeonGlobalData
_0806BB60: .4byte gLeaderPointer
_0806BB64: .4byte gDungeon
_0806BB68: .4byte 0x00000644
thumb_func_end sub_806B8CC
@@ -3394,7 +3394,7 @@ sub_806BC68:
strb r3, [r6, 0x8]
b _0806BD24
.align 2, 0
_0806BD0C: .4byte gDungeonGlobalData
_0806BD0C: .4byte gDungeon
_0806BD10: .4byte 0x0000ffff
_0806BD14: .4byte 0x0000fffe
_0806BD18: .4byte 0x0000066e
@@ -3459,7 +3459,7 @@ _0806BD5E:
strb r0, [r6, 0x9]
b _0806BDA6
.align 2, 0
_0806BD94: .4byte gDungeonGlobalData
_0806BD94: .4byte gDungeon
_0806BD98: .4byte 0x000037fd
_0806BD9C: .4byte 0x000037ff
_0806BDA0: .4byte 0x000037f0
@@ -3663,7 +3663,7 @@ _0806BE12:
adds r0, r6, r1
strb r7, [r0]
mov r0, r8
bl GetMovementSpeed
bl GetSpeedStatus
movs r2, 0xAB
lsls r2, 1
adds r1, r6, r2
@@ -3725,7 +3725,7 @@ _0806BF70:
bx r0
.align 2, 0
_0806BFB4: .4byte 0x00000145
_0806BFB8: .4byte gDungeonGlobalData
_0806BFB8: .4byte gDungeon
_0806BFBC: .4byte 0x00018208
thumb_func_end sub_806BC68
@@ -3932,7 +3932,7 @@ _0806C11E:
cmp r1, 0
beq _0806C170
movs r0, 0
bl GetWeather
bl GetApparentWeather
ldr r1, _0806C16C
lsls r0, 24
lsrs r0, 22
@@ -3999,7 +3999,7 @@ _0806C188:
pop {r0}
bx r0
.align 2, 0
_0806C1D0: .4byte gDungeonGlobalData
_0806C1D0: .4byte gDungeon
_0806C1D4: .4byte 0x00000113
thumb_func_end sub_806BFC0
@@ -4071,7 +4071,7 @@ _0806C244:
pop {r0}
bx r0
.align 2, 0
_0806C258: .4byte gDungeonGlobalData
_0806C258: .4byte gDungeon
_0806C25C: .4byte 0x0001357c
_0806C260: .4byte 0x00000119
thumb_func_end sub_806C1D8
@@ -4217,7 +4217,7 @@ _0806C358:
strb r7, [r1, 0x2]
b _0806C3B8
.align 2, 0
_0806C370: .4byte gDungeonGlobalData
_0806C370: .4byte gDungeon
_0806C374: .4byte 0x0000057c
_0806C378:
adds r1, 0x8
@@ -4313,7 +4313,7 @@ _0806C416:
pop {r0}
bx r0
.align 2, 0
_0806C424: .4byte gDungeonGlobalData
_0806C424: .4byte gDungeon
_0806C428: .4byte 0x0000057c
thumb_func_end sub_806C3C0
@@ -4327,7 +4327,7 @@ sub_806C42C:
str r1, [r0, 0x40]
bx lr
.align 2, 0
_0806C43C: .4byte gDungeonGlobalData
_0806C43C: .4byte gDungeon
_0806C440: .4byte 0x0000057c
thumb_func_end sub_806C42C
@@ -4380,7 +4380,7 @@ sub_806C488:
asrs r6, r0, 16
adds r0, r6, 0
mov r1, r8
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
adds r5, r0, 0
movs r4, 0x2
cmp r4, r7
@@ -4421,7 +4421,7 @@ sub_806C4D4:
asrs r6, r0, 16
adds r0, r6, 0
mov r1, r8
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
adds r5, r0, 0
movs r4, 0x2
cmp r4, r7
@@ -4471,7 +4471,7 @@ sub_806C51C:
str r3, [sp, 0x38]
b _0806C554
.align 2, 0
_0806C544: .4byte gDungeonGlobalData
_0806C544: .4byte gDungeon
_0806C548: .4byte 0x000181f8
_0806C54C:
ldr r4, _0806C5AC
@@ -4662,7 +4662,7 @@ _0806C6A8:
ldr r0, [sp, 0x38]
cmp r0, 0
bne _0806C6D6
bl Random
bl Rand32Bit
movs r4, 0x3
ands r4, r0
adds r5, r6, 0
@@ -4684,7 +4684,7 @@ _0806C6D6:
ldr r0, _0806C774
bl sub_80687D0
adds r5, r0, 0
bl Random
bl Rand32Bit
movs r1, 0x3
ands r1, r0
adds r4, r6, 0
@@ -4725,7 +4725,7 @@ _0806C714:
mov r7, r8
movs r1, 0x4
ldrsh r0, [r7, r1]
bl GetWalkableTiles
bl GetMovementType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -4758,7 +4758,7 @@ _0806C76A:
b _0806C7E2
.align 2, 0
_0806C774: .4byte 0x000001a5
_0806C778: .4byte gDungeonGlobalData
_0806C778: .4byte gDungeon
_0806C77C: .4byte 0x0001356c
_0806C780: .4byte 0x0000015f
_0806C784:
@@ -4898,7 +4898,7 @@ _0806C870:
str r0, [sp, 0x34]
b _0806C8D8
.align 2, 0
_0806C88C: .4byte gDungeonGlobalData
_0806C88C: .4byte gDungeon
_0806C890: .4byte 0x000181f0
_0806C894: .4byte 0x000181f2
_0806C898:
@@ -5033,7 +5033,7 @@ _0806C958:
.align 2, 0
_0806C998: .4byte 0xffff0000
_0806C99C: .4byte 0x0000ffff
_0806C9A0: .4byte gDungeonGlobalData
_0806C9A0: .4byte gDungeon
_0806C9A4: .4byte 0x00018208
_0806C9A8: .4byte 0x0000c7ff
_0806C9AC:
@@ -5137,7 +5137,7 @@ _0806CA58:
_0806CA5C: .4byte 0xfffff400
_0806CA60: .4byte 0x0000f3ff
_0806CA64: .4byte 0x0000ffff
_0806CA68: .4byte gDungeonGlobalData
_0806CA68: .4byte gDungeon
_0806CA6C: .4byte 0x00018208
_0806CA70: .4byte 0xfffffe5f
_0806CA74: .4byte 0x0001820f
@@ -5338,7 +5338,7 @@ _0806CBDE:
bx r0
.align 2, 0
_0806CBF0: .4byte gUnknown_202EDCC
_0806CBF4: .4byte gDungeonGlobalData
_0806CBF4: .4byte gDungeon
_0806CBF8: .4byte 0x000181f0
_0806CBFC: .4byte 0x000181f2
_0806CC00: .4byte 0x0000010f
@@ -5394,7 +5394,7 @@ _0806CC5C:
pop {r0}
bx r0
.align 2, 0
_0806CC68: .4byte gDungeonGlobalData
_0806CC68: .4byte gDungeon
_0806CC6C: .4byte 0x000135cc
thumb_func_end sub_806CC10
@@ -5430,7 +5430,7 @@ _0806CCA0:
pop {r0}
bx r0
.align 2, 0
_0806CCAC: .4byte gDungeonGlobalData
_0806CCAC: .4byte gDungeon
_0806CCB0: .4byte 0x000135cc
thumb_func_end sub_806CC70
@@ -5489,7 +5489,7 @@ _0806CCDC:
beq _0806CD4C
cmp r6, 0
bne _0806CD4C
bl Random
bl Rand32Bit
movs r4, 0x3
ands r4, r0
adds r0, r5, 0
@@ -5505,14 +5505,14 @@ _0806CCDC:
bl sub_80053AC
b _0806CD76
.align 2, 0
_0806CD40: .4byte gDungeonGlobalData
_0806CD40: .4byte gDungeon
_0806CD44: .4byte 0x00018210
_0806CD48: .4byte 0x000181f8
_0806CD4C:
ldr r0, _0806CD8C
bl sub_80687D0
adds r4, r0, 0
bl Random
bl Rand32Bit
movs r1, 0x3
ands r1, r0
adds r0, r5, 0

66
asm/code_806CD90.s
View File

@@ -71,7 +71,7 @@ _0806D088:
ldr r0, [sp, 0x44]
mov r9, r0
adds r0, r5, 0
bl CannotAct
bl HasStatusThatPreventsActing
lsls r0, 24
cmp r0, 0
bne _0806D0A2
@@ -332,7 +332,7 @@ _0806D26C:
beq _0806D2C2
adds r0, r6, 0
movs r1, 0xA
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
bne _0806D2C2
@@ -343,7 +343,7 @@ _0806D26C:
cmp r0, 0
bne _0806D2C2
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3C4
movs r2, 0
ldrsh r1, [r1, r2]
@@ -364,7 +364,7 @@ _0806D2C2:
cmp r0, 0
beq _0806D2EE
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3C8
movs r2, 0
ldrsh r1, [r1, r2]
@@ -386,12 +386,12 @@ _0806D2EE:
beq _0806D328
adds r0, r6, 0
movs r1, 0x11
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
beq _0806D328
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3CC
movs r2, 0
ldrsh r1, [r1, r2]
@@ -414,7 +414,7 @@ _0806D328:
cmp r7, 0
beq _0806D358
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3D0
movs r2, 0
ldrsh r1, [r1, r2]
@@ -435,7 +435,7 @@ _0806D358:
cmp r0, 0
beq _0806D384
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3D4
movs r2, 0
ldrsh r1, [r1, r2]
@@ -458,14 +458,14 @@ _0806D384:
cmp r7, 0
beq _0806D3FA
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D3D8
movs r2, 0
ldrsh r1, [r1, r2]
cmp r0, r1
bge _0806D3FA
movs r0, 0x3
bl DungeonRandomCapped
bl DungeonRandInt
cmp r0, 0
bgt _0806D3DC
movs r3, 0xBC
@@ -509,7 +509,7 @@ _0806D3FA:
cmp r0, 0
beq _0806D428
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D4D4
movs r2, 0
ldrsh r1, [r1, r2]
@@ -533,7 +533,7 @@ _0806D428:
cmp r7, 0
beq _0806D45A
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D4D8
movs r2, 0
ldrsh r1, [r1, r2]
@@ -555,7 +555,7 @@ _0806D45A:
cmp r0, 0
beq _0806D48A
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _0806D4DC
movs r2, 0
ldrsh r1, [r1, r2]
@@ -609,7 +609,7 @@ _0806D48A:
_0806D4D4: .4byte gUnknown_80F4E1C
_0806D4D8: .4byte gUnknown_80F4E1E
_0806D4DC: .4byte gUnknown_80F4E20
_0806D4E0: .4byte gDungeonGlobalData
_0806D4E0: .4byte gDungeon
_0806D4E4: .4byte 0x000135cc
_0806D4E8:
ldr r0, [r4, 0x70]
@@ -928,7 +928,7 @@ _0806D760:
cmp r0, 0
beq _0806D796
adds r0, r7, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
mov r8, r0
movs r0, 0x14
movs r1, 0x18
@@ -1068,7 +1068,7 @@ _0806D858:
bne _0806D8B6
adds r0, r7, 0
mov r1, r9
bl CanSee
bl CanSeeTarget
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -1096,7 +1096,7 @@ _0806D8C8:
adds r0, r7, 0x4
mov r1, r9
adds r1, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
movs r1, 0x7
ands r0, r1
adds r4, 0x46
@@ -1194,7 +1194,7 @@ _0806D978:
_0806D98E:
adds r0, r7, 0
movs r1, 0x10
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806D9B2
@@ -1377,7 +1377,7 @@ _0806DB00:
.align 2, 0
_0806DB04: .4byte gRecruitedPokemonRef
_0806DB08: .4byte 0x00008df8
_0806DB0C: .4byte gDungeonGlobalData
_0806DB0C: .4byte gDungeon
_0806DB10: .4byte 0x0000065c
_0806DB14: .4byte gUnknown_80F9CEC
_0806DB18:
@@ -1429,7 +1429,7 @@ _0806DB4C:
lsls r1, r3, 2
b _0806DB82
.align 2, 0
_0806DB70: .4byte gDungeonGlobalData
_0806DB70: .4byte gDungeon
_0806DB74: .4byte 0x0000065d
_0806DB78: .4byte gUnknown_80F9D8C
_0806DB7C:
@@ -1541,7 +1541,7 @@ _0806DC48:
b _0806DEE4
.align 2, 0
_0806DC4C: .4byte gUnknown_80F9D28
_0806DC50: .4byte gDungeonGlobalData
_0806DC50: .4byte gDungeon
_0806DC54: .4byte 0x00000679
_0806DC58: .4byte 0x00000676
_0806DC5C:
@@ -1587,7 +1587,7 @@ _0806DC86:
beq _0806DCDE
adds r0, r7, 0
mov r1, r8
bl CanSee
bl CanSeeTarget
lsls r0, 24
cmp r0, 0
beq _0806DCDE
@@ -1695,7 +1695,7 @@ _0806DD62:
bl SendWaitingEndMessage
b _0806DDA2
.align 2, 0
_0806DD80: .4byte gDungeonGlobalData
_0806DD80: .4byte gDungeon
_0806DD84: .4byte 0x0001357c
_0806DD88: .4byte 0x00000221
_0806DD8C: .4byte 0x00000679
@@ -1746,7 +1746,7 @@ _0806DDF8:
_0806DDFC:
adds r0, r7, 0
movs r1, 0x16
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
bne _0806DE0C
@@ -1858,7 +1858,7 @@ _0806DEC8:
b _0806DEF2
.align 2, 0
_0806DED4: .4byte gTeamInventory_203B460
_0806DED8: .4byte gDungeonGlobalData
_0806DED8: .4byte gDungeon
_0806DEDC: .4byte 0x00000679
_0806DEE0: .4byte 0x00000676
_0806DEE4:
@@ -2019,7 +2019,7 @@ _0806E020:
mov r10, r3
b _0806E066
.align 2, 0
_0806E02C: .4byte gDungeonGlobalData
_0806E02C: .4byte gDungeon
_0806E030: .4byte 0x0000066a
_0806E034: .4byte 0x000003e7
_0806E038: .4byte 0x0000014b
@@ -2084,7 +2084,7 @@ _0806E08A:
adds r0, r7, 0
b _0806E0DC
.align 2, 0
_0806E0BC: .4byte gDungeonGlobalData
_0806E0BC: .4byte gDungeon
_0806E0C0: .4byte 0x00000644
_0806E0C4: .4byte 0x00000149
_0806E0C8: .4byte 0x000001f5
@@ -2210,7 +2210,7 @@ _0806E17E:
strb r0, [r1]
b _0806E1CA
.align 2, 0
_0806E1AC: .4byte gDungeonGlobalData
_0806E1AC: .4byte gDungeon
_0806E1B0: .4byte 0x00000179
_0806E1B4:
ldr r2, _0806E4E4
@@ -2578,7 +2578,7 @@ _0806E486:
bne _0806E4B8
mov r0, r8
adds r1, r7, 0
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
beq _0806E4B8
@@ -2595,7 +2595,7 @@ _0806E486:
bl sub_800A34C
_0806E4B8:
mov r0, r8
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -2615,7 +2615,7 @@ _0806E4B8:
b _0806E53E
.align 2, 0
_0806E4E4: .4byte gTypeEffectivenessChart
_0806E4E8: .4byte gDungeonGlobalData
_0806E4E8: .4byte gDungeon
_0806E4EC: .4byte gUnknown_8106F54
_0806E4F0: .4byte gUnknown_80F54B4
_0806E4F4: .4byte gUnknown_8106EFC
@@ -2660,7 +2660,7 @@ _0806E53E:
bl sub_800A34C
b _0806E586
.align 2, 0
_0806E560: .4byte gDungeonGlobalData
_0806E560: .4byte gDungeon
_0806E564: .4byte gUnknown_8106F1C
_0806E568: .4byte 0x0000016b
_0806E56C:
@@ -2762,7 +2762,7 @@ _0806E61A:
pop {r1}
bx r1
.align 2, 0
_0806E62C: .4byte gDungeonGlobalData
_0806E62C: .4byte gDungeon
_0806E630: .4byte 0x0000016b
_0806E634: .4byte gUnknown_8106F14
_0806E638: .4byte gUnknown_8106F64

82
asm/code_806E8B0.s
View File

@@ -281,7 +281,7 @@ _0806EACA:
.align 2, 0
_0806EADC: .4byte gUnknown_80FEE04
_0806EAE0: .4byte gUnknown_80FEE2C
_0806EAE4: .4byte gDungeonGlobalData
_0806EAE4: .4byte gDungeon
_0806EAE8: .4byte 0x000037fa
_0806EAEC: .4byte 0x000037f8
_0806EAF0: .4byte gUnknown_80FEE54
@@ -569,14 +569,14 @@ _0806ED0E:
asrs r0, 8
str r0, [sp, 0xC]
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
str r0, [sp, 0x84]
ldr r0, [sp, 0x80]
cmp r0, 0
bne _0806EDC8
ldr r0, [sp, 0x70]
movs r1, 0x13
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806ED4A
@@ -597,7 +597,7 @@ _0806ED0E:
_0806ED4A:
ldr r0, [sp, 0x70]
movs r1, 0x2B
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806ED74
@@ -621,7 +621,7 @@ _0806ED74:
beq _0806EE4A
mov r0, r9
movs r1, 0x1E
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806EE4A
@@ -640,7 +640,7 @@ _0806ED74:
adds r0, r6
b _0806EE48
.align 2, 0
_0806EDA4: .4byte gDungeonGlobalData
_0806EDA4: .4byte gDungeon
_0806EDA8: .4byte 0x000001a1
_0806EDAC: .4byte 0x000001a3
_0806EDB0: .4byte gUnknown_80F504C
@@ -655,7 +655,7 @@ _0806EDC8:
beq _0806EDF6
mov r0, r9
movs r1, 0x22
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806EDF6
@@ -675,7 +675,7 @@ _0806EDC8:
_0806EDF6:
ldr r0, [sp, 0x70]
movs r1, 0x21
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806EE20
@@ -696,7 +696,7 @@ _0806EDF6:
_0806EE20:
ldr r0, [sp, 0x70]
movs r1, 0x2B
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806EE4A
@@ -803,7 +803,7 @@ _0806EE7C:
_0806EEF8: .4byte gUnknown_810AC66
_0806EEFC: .4byte 0x00000163
_0806EF00: .4byte gUnknown_810AC62
_0806EF04: .4byte gDungeonGlobalData
_0806EF04: .4byte gDungeon
_0806EF08: .4byte 0x00000161
_0806EF0C: .4byte gUnknown_810AC68
_0806EF10: .4byte 0x000003e6
@@ -980,7 +980,7 @@ _0806F036:
bl sub_80522F4
b _0806F0BC
.align 2, 0
_0806F098: .4byte gDungeonGlobalData
_0806F098: .4byte gDungeon
_0806F09C: .4byte 0x00000ccc
_0806F0A0: .4byte gUnknown_8106F24
_0806F0A4: .4byte gUnknown_8106F04
@@ -1073,13 +1073,13 @@ _0806F140:
.align 2, 0
_0806F15C: .4byte gUnknown_80FADD8
_0806F160: .4byte gUnknown_8106F1C
_0806F164: .4byte gDungeonGlobalData
_0806F164: .4byte gDungeon
_0806F168: .4byte 0x00000167
_0806F16C: .4byte 0x000003e7
_0806F170:
ldr r0, [sp, 0x70]
movs r1, 0xC
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806F194
@@ -1097,7 +1097,7 @@ _0806F170:
_0806F194:
mov r0, r9
movs r1, 0xD
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806F1B6
@@ -1116,7 +1116,7 @@ _0806F1B6:
beq _0806F1DA
ldr r0, [sp, 0x70]
movs r1, 0x1
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _0806F1DA
@@ -1131,7 +1131,7 @@ _0806F1B6:
strb r0, [r1]
_0806F1DA:
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
cmp r0, r4
bge _0806F1F4
ldr r2, _0806F2B8
@@ -1177,7 +1177,7 @@ _0806F1F4:
str r0, [r1]
movs r0, 0x80
lsls r0, 7
bl DungeonRandomCapped
bl DungeonRandInt
movs r6, 0
str r6, [sp, 0x58]
movs r1, 0xE0
@@ -1222,7 +1222,7 @@ _0806F294:
bx r0
.align 2, 0
_0806F2A4: .4byte gUnknown_80F4DAE
_0806F2A8: .4byte gDungeonGlobalData
_0806F2A8: .4byte gDungeon
_0806F2AC: .4byte 0x00000165
_0806F2B0: .4byte gUnknown_80F4DB0
_0806F2B4: .4byte 0x00000169
@@ -1498,7 +1498,7 @@ sub_806F4A4:
lsrs r4, r1, 24
ldr r5, [r0, 0x70]
movs r1, 0xE
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
beq _0806F4CE
@@ -1670,7 +1670,7 @@ sub_806F500:
strb r2, [r0]
bx lr
.align 2, 0
_0806F5F4: .4byte gDungeonGlobalData
_0806F5F4: .4byte gDungeon
_0806F5F8: .4byte 0x00000161
_0806F5FC: .4byte 0x00000163
_0806F600: .4byte 0x00000165
@@ -1713,7 +1713,7 @@ _0806F652:
pop {r0}
bx r0
.align 2, 0
_0806F658: .4byte gDungeonGlobalData
_0806F658: .4byte gDungeon
_0806F65C: .4byte 0x000181e8
thumb_func_end sub_806F63C
@@ -1734,7 +1734,7 @@ sub_806F660:
mov r9, r1
movs r2, 0x4
ldrsh r0, [r4, r2]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0806F6C0
@@ -1766,7 +1766,7 @@ sub_806F660:
bne _0806F702
b _0806F8FC
.align 2, 0
_0806F6C0: .4byte gDungeonGlobalData
_0806F6C0: .4byte gDungeon
_0806F6C4: .4byte 0x00003a14
_0806F6C8: .4byte 0x0000065c
_0806F6CC:
@@ -1910,7 +1910,7 @@ _0806F7C2:
_0806F7CE:
mov r0, r8
adds r1, r6, 0
bl CanSee
bl CanSeeTarget
lsls r0, 24
cmp r0, 0
bne _0806F7DE
@@ -1919,11 +1919,11 @@ _0806F7DE:
bl sub_806F910
movs r0, 0xFA
lsls r0, 2
bl DungeonRandomCapped
bl DungeonRandInt
adds r7, r0, 0
movs r1, 0x2
ldrsh r0, [r4, r1]
bl GetBaseRecruit
bl GetRecruitRate
lsls r0, 16
asrs r4, r0, 16
ldr r0, _0806F844
@@ -1933,7 +1933,7 @@ _0806F7DE:
_0806F800:
adds r0, r6, 0
movs r1, 0x2E
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0806F816
@@ -1959,7 +1959,7 @@ _0806F816:
b _0806F856
.align 2, 0
_0806F834: .4byte 0x00000644
_0806F838: .4byte gDungeonGlobalData
_0806F838: .4byte gDungeon
_0806F83C: .4byte 0x0000065d
_0806F840: .4byte 0x0000010d
_0806F844: .4byte 0xfffffc19
@@ -2051,7 +2051,7 @@ _0806F8E2:
movs r0, 0x1
b _0806F8FE
.align 2, 0
_0806F8EC: .4byte gDungeonGlobalData
_0806F8EC: .4byte gDungeon
_0806F8F0: .4byte 0x0001357c
_0806F8F4:
adds r0, r6, 0
@@ -2100,7 +2100,7 @@ _0806F91C:
ldr r0, [r4, 0x70]
movs r2, 0x4
ldrsh r0, [r0, r2]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r1, r0, 24
adds r0, r4, 0
@@ -2158,7 +2158,7 @@ _0806F9A2:
pop {r0}
bx r0
.align 2, 0
_0806F9AC: .4byte gDungeonGlobalData
_0806F9AC: .4byte gDungeon
_0806F9B0: .4byte 0x0001357c
_0806F9B4: .4byte 0x00000167
_0806F9B8: .4byte gUnknown_202EE70
@@ -2231,7 +2231,7 @@ _0806FA3C:
movs r0, 0
b _0806FA52
.align 2, 0
_0806FA40: .4byte gDungeonGlobalData
_0806FA40: .4byte gDungeon
_0806FA44: .4byte 0x00000199
_0806FA48: .4byte 0x000001a1
_0806FA4C: .4byte 0x000001a3
@@ -2258,7 +2258,7 @@ sub_806FA5C:
adds r0, r5, 0x4
mov r1, r8
adds r1, 0x4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r4, r0, 0
movs r0, 0
mov r10, r0
@@ -2281,7 +2281,7 @@ sub_806FA5C:
ldr r0, _0806FAD4
movs r3, 0
ldrsh r1, [r6, r3]
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
ldr r0, _0806FAD8
ldr r1, [r0]
movs r0, 0
@@ -2477,7 +2477,7 @@ _0806FBC4:
_0806FC40: .4byte gRecruitedPokemonRef
_0806FC44: .4byte 0x00008df8
_0806FC48: .4byte 0x0000ffff
_0806FC4C: .4byte gDungeonGlobalData
_0806FC4C: .4byte gDungeon
_0806FC50: .4byte 0x00000644
_0806FC54: .4byte gUnknown_80FA058
_0806FC58:
@@ -2520,7 +2520,7 @@ _0806FC94:
mov r0, r10
cmp r0, 0
beq _0806FCD8
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -2564,7 +2564,7 @@ _0806FD04: .4byte gAvailablePokemonNames
_0806FD08: .4byte gUnknown_80FA0F0
_0806FD0C: .4byte gUnknown_202E628
_0806FD10: .4byte gUnknown_80FA120
_0806FD14: .4byte gDungeonGlobalData
_0806FD14: .4byte gDungeon
thumb_func_end sub_806FA5C
thumb_func_start sub_806FD18
@@ -2575,7 +2575,7 @@ sub_806FD18:
negs r6, r6
movs r1, 0x4
ldrsh r0, [r4, r1]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r5, r0, 24
movs r2, 0x2
@@ -2677,7 +2677,7 @@ _0806FDDA:
movs r0, 0x1
b _0806FDEE
.align 2, 0
_0806FDE4: .4byte gDungeonGlobalData
_0806FDE4: .4byte gDungeon
_0806FDE8: .4byte 0x0001357c
_0806FDEC:
movs r0, 0
@@ -2877,7 +2877,7 @@ _0806FF34:
_0806FF74: .4byte gRecruitedPokemonRef
_0806FF78: .4byte 0x00008df8
_0806FF7C: .4byte 0x0000ffff
_0806FF80: .4byte gDungeonGlobalData
_0806FF80: .4byte gDungeon
_0806FF84: .4byte 0x00000644
_0806FF88:
ldr r0, _0806FF9C
@@ -2906,7 +2906,7 @@ _0806FFB8:
mov r4, r9
cmp r4, 0
beq _0806FFE6
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r1, r0, 0
ldr r0, _0807000C
movs r2, 0

4
asm/code_80701A4.s
View File

@@ -18,7 +18,7 @@ sub_80701A4:
adds r0, r6, 0
adds r0, 0x44
movs r1, 0x1
bl SetAction
bl SetMonsterActionFields
adds r0, r6, 0
adds r0, 0xA8
ldrb r0, [r0]
@@ -165,7 +165,7 @@ _080702B0:
adds r0, r6, 0
adds r0, 0x44
movs r1, 0x14
bl SetAction
bl SetMonsterActionFields
adds r3, r5, 0
adds r7, r6, 0
adds r7, 0x50

10
asm/code_807034C.s
View File

@@ -67,7 +67,7 @@ sub_80703A0:
ldrsh r0, [r4, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
movs r1, 0
ldrsh r0, [r4, r1]
@@ -89,7 +89,7 @@ sub_80703A0:
ands r0, r1
cmp r0, 0
bne _08070456
bl IsFixedDungeon
bl IsCurrentFixedRoomBossFight
lsls r0, 24
cmp r0, 0
bne _08070400
@@ -100,7 +100,7 @@ sub_80703A0:
beq _0807044E
adds r0, r6, 0
movs r1, 0x9
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
bne _0807044E
@@ -115,7 +115,7 @@ _08070400:
ands r5, r0
adds r0, r6, 0
movs r1, 0xC
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08070422
@@ -123,7 +123,7 @@ _08070400:
_08070422:
adds r0, r6, 0
movs r1, 0xD
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08070432

2
asm/code_807049C.s
View File

@@ -14,7 +14,7 @@ sub_8070564:
ldrsh r0, [r4, r1]
movs r2, 0x2
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
movs r1, 0
ldrsh r0, [r4, r1]

2
asm/code_8070BC0.s
View File

@@ -23,7 +23,7 @@ sub_8070BC0:
cmp r0, 0x3
beq _08070C56
adds r0, r4, 0
bl ShouldAvoidEnemies
bl ShouldMonsterRunAway
lsls r0, 24
cmp r0, 0
bne _08070C56

30
asm/code_80718D8.s
View File

@@ -48,7 +48,7 @@ _08071B7C:
ldr r0, _08071BA8
b _08071BAE
.align 2, 0
_08071B94: .4byte gDungeonGlobalData
_08071B94: .4byte gDungeon
_08071B98: .4byte 0x00000664
_08071B9C: .4byte 0x000037fd
_08071BA0: .4byte 0x00000662
@@ -117,7 +117,7 @@ _08071C08:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
ldrh r0, [r0]
movs r2, 0x80
lsls r2, 1
@@ -154,7 +154,7 @@ _08071C6C: .4byte 0x00017b40
_08071C70: .4byte gAvailablePokemonNames
_08071C74: .4byte 0x0001358c
_08071C78: .4byte 0x0000066e
_08071C7C: .4byte gDungeonGlobalData
_08071C7C: .4byte gDungeon
_08071C80: .4byte 0x00003a0c
_08071C84: .4byte gUnknown_80F4DA6
_08071C88:
@@ -217,7 +217,7 @@ _08071CDC:
strh r4, [r0, 0x8]
strb r1, [r0, 0x2]
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
ldr r0, _08071D24
ldr r0, [r0]
@@ -232,7 +232,7 @@ _08071CDC:
movs r0, 0x1
b _08071D2E
.align 2, 0
_08071D24: .4byte gDungeonGlobalData
_08071D24: .4byte gDungeon
_08071D28: .4byte 0x00000644
_08071D2C:
movs r0, 0
@@ -301,7 +301,7 @@ _08071D94:
.align 2, 0
_08071D98: .4byte 0x0098967e
_08071D9C: .4byte 0x0098967f
_08071DA0: .4byte gDungeonGlobalData
_08071DA0: .4byte gDungeon
thumb_func_end sub_8071D4C
thumb_func_start sub_8071DA4
@@ -391,7 +391,7 @@ _08071E32:
strb r2, [r1]
b _08071FCA
.align 2, 0
_08071E44: .4byte gDungeonGlobalData
_08071E44: .4byte gDungeon
_08071E48: .4byte 0x000135cc
_08071E4C:
movs r1, 0xFE
@@ -464,7 +464,7 @@ _08071EB6:
cmp r7, 0
beq _08071F38
adds r0, r7, 0
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
movs r1, 0
b _08071F02
@@ -856,7 +856,7 @@ _080721EC:
bl sub_806A3D4
b _0807220A
.align 2, 0
_080721F8: .4byte gDungeonGlobalData
_080721F8: .4byte gDungeon
_080721FC: .4byte 0x0000065c
_08072200:
ldr r0, _08072308
@@ -980,7 +980,7 @@ _080722E2:
movs r2, 0x1
bl PrintFieldMessage
_080722F4:
bl GetLeaderEntity
bl GetLeader
movs r1, 0
bl sub_806A2BC
add sp, 0x190
@@ -1610,7 +1610,7 @@ _080727A8:
cmp r7, 0
beq _08072810
adds r0, r7, 0
bl DungeonRandomCapped
bl DungeonRandInt
movs r2, 0
lsls r0, 1
mov r1, sp
@@ -2020,7 +2020,7 @@ _08072AEA:
cmp r5, 0x4
bne _08072AF6
movs r0, 0x4
bl DungeonRandomCapped
bl DungeonRandInt
b _08072AFA
_08072AF6:
adds r0, r5, 0
@@ -2075,7 +2075,7 @@ _08072B44:
cmp r3, 0
bge _08072B32
adds r0, r4, 0
bl DungeonRandomCapped
bl DungeonRandInt
adds r3, r0, 0
adds r4, r5, 0
adds r4, 0x38
@@ -2117,7 +2117,7 @@ sub_8072B78:
adds r4, 0x50
adds r0, r4, 0
adds r1, r5, 0
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
adds r0, r5, 0
bl sub_80687D0
adds r4, r0, 0
@@ -2175,7 +2175,7 @@ _08072C0C:
movs r3, 0x6
ldrsh r2, [r7, r3]
adds r1, r2
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
ldr r0, _08072C80
bl sub_807034C

22
asm/code_8072CF4.s
View File

@@ -50,7 +50,7 @@ sub_8072CF4:
b _08072D64
.align 2, 0
_08072D4C: .4byte gUnknown_203B434
_08072D50: .4byte gDungeonGlobalData
_08072D50: .4byte gDungeon
_08072D54: .4byte gUnknown_80F58F4
_08072D58:
adds r0, r2, 0x1
@@ -339,7 +339,7 @@ _08072FE8:
bl sub_8074FB0
adds r0, r4, 0
movs r1, 0xD
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08073038
@@ -350,7 +350,7 @@ _08072FE8:
beq _08073038
adds r0, r4, 0
movs r1, 0x9
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
bne _08073038
@@ -380,7 +380,7 @@ _08073046:
ldr r0, _08073070
b _080731A2
.align 2, 0
_08073064: .4byte gDungeonGlobalData
_08073064: .4byte gDungeon
_08073068: .4byte 0x00000644
_0807306C: .4byte 0x000037fe
_08073070: .4byte gUnknown_80FA5B4
@@ -397,7 +397,7 @@ _08073074:
strb r0, [r1]
b _080731B8
.align 2, 0
_0807308C: .4byte gDungeonGlobalData
_0807308C: .4byte gDungeon
_08073090: .4byte gUnknown_202F32C
_08073094:
adds r0, r4, 0
@@ -453,7 +453,7 @@ _080730E0:
str r0, [r2]
b _080731B8
.align 2, 0
_080730FC: .4byte gDungeonGlobalData
_080730FC: .4byte gDungeon
_08073100: .4byte 0x0001357c
_08073104:
adds r0, r4, 0
@@ -746,7 +746,7 @@ _08073332:
strb r0, [r4]
b _08073472
.align 2, 0
_0807335C: .4byte gDungeonGlobalData
_0807335C: .4byte gDungeon
_08073360: .4byte 0x000135cc
_08073364:
adds r0, r7, 0
@@ -762,7 +762,7 @@ _0807336E:
b _08073472
_08073378:
movs r0, 0x4
bl DungeonRandomCapped
bl DungeonRandInt
adds r3, r0, 0
movs r4, 0
_08073382:
@@ -820,7 +820,7 @@ _080733DE:
mov r0, r8
adds r1, r5, 0
movs r2, 0x1
bl IsMoveUsable
bl CanMonsterUseMove
lsls r0, 24
cmp r0, 0
bne _08073440
@@ -951,7 +951,7 @@ _080734CC:
strb r0, [r4]
b _080735DA
.align 2, 0
_080734E8: .4byte gDungeonGlobalData
_080734E8: .4byte gDungeon
_080734EC: .4byte 0x000135cc
_080734F0: .4byte 0x00000165
_080734F4:
@@ -1031,7 +1031,7 @@ _0807357A:
adds r1, r5, 0
movs r2, 0x1
str r3, [sp, 0x14]
bl IsMoveUsable
bl CanMonsterUseMove
lsls r0, 24
ldr r3, [sp, 0x14]
cmp r0, 0

82
asm/code_8073CF0.s
View File

@@ -15,7 +15,7 @@ sub_8073D14:
sub sp, 0xB0
adds r6, r0, 0
ldr r4, [r6, 0x70]
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
ldr r5, [r0, 0x14]
cmp r5, 0
bne _08073D30
@@ -81,7 +81,7 @@ _08073D80:
_08073D98:
adds r0, r6, 0
movs r1, 0x1
bl ShouldAvoidEnemiesAndShowEffect
bl ShouldMonsterRunAwayAndShowEffect
lsls r0, 24
cmp r0, 0
beq _08073DC8
@@ -104,7 +104,7 @@ _08073DC8:
cmp r0, 0
bne _08073E24
ldrb r0, [r5, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -171,7 +171,7 @@ _08073E48:
mov r8, r0
b _08073E80
.align 2, 0
_08073E64: .4byte gDungeonGlobalData
_08073E64: .4byte gDungeon
_08073E68: .4byte 0x0000065b
_08073E6C: .4byte gTeamInventory_203B460
_08073E70:
@@ -487,7 +487,7 @@ _080740C8:
bl sub_807E8F0
adds r0, r5, 0
movs r1, 0x16
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08074170
@@ -504,7 +504,7 @@ _080740C8:
strb r0, [r4]
_08074102:
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r2, _08074350
ldrb r1, [r4]
lsls r1, 1
@@ -565,7 +565,7 @@ _0807417A:
movs r4, 0xA
adds r0, r5, 0
movs r1, 0x17
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08074190
@@ -573,7 +573,7 @@ _0807417A:
_08074190:
adds r0, r5, 0
movs r1, 0x1F
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _080741A0
@@ -581,7 +581,7 @@ _08074190:
_080741A0:
adds r0, r5, 0
movs r1, 0x10
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _080741B0
@@ -589,7 +589,7 @@ _080741A0:
_080741B0:
adds r0, r5, 0
movs r1, 0x1B
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _080741C0
@@ -597,7 +597,7 @@ _080741B0:
_080741C0:
adds r0, r5, 0
movs r1, 0xA
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _080741D0
@@ -605,7 +605,7 @@ _080741C0:
_080741D0:
adds r0, r5, 0
movs r1, 0x2B
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _080741E0
@@ -786,7 +786,7 @@ _08074320:
.align 2, 0
_0807434C: .4byte 0x00000169
_08074350: .4byte gWarpScarfActivationChances
_08074354: .4byte gDungeonGlobalData
_08074354: .4byte gDungeon
_08074358: .4byte 0x0000199a
_0807435C: .4byte gUnknown_80F54F4
_08074360: .4byte 0x00000153
@@ -842,14 +842,14 @@ _080743CA:
cmp r0, 0
bne _08074480
adds r0, r5, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
bne _0807441C
adds r0, r5, 0
movs r1, 0x6
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
bne _08074466
@@ -863,33 +863,33 @@ _080743CA:
bl sub_806F324
b _08074466
.align 2, 0
_08074408: .4byte gDungeonGlobalData
_08074408: .4byte gDungeon
_0807440C: .4byte 0x00000679
_08074410: .4byte 0x00000153
_08074414: .4byte 0x0000e266
_08074418: .4byte gUnknown_80F4F8E
_0807441C:
adds r0, r5, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _08074466
adds r0, r5, 0
movs r1, 0x9
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
bne _08074466
adds r0, r5, 0
movs r1, 0xD
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
bne _08074466
adds r0, r5, 0
movs r1, 0x11
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
bne _08074466
@@ -916,7 +916,7 @@ _08074474:
b _08074B2E
_08074480:
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0x21
@@ -1456,7 +1456,7 @@ _080748D4: .4byte gUnknown_80F4F3C
_080748D8: .4byte gUnknown_80F4FB2
_080748DC: .4byte gUnknown_80F4F3E
_080748E0: .4byte gUnknown_80F4FB4
_080748E4: .4byte gDungeonGlobalData
_080748E4: .4byte gDungeon
_080748E8: .4byte 0x000135cc
_080748EC: .4byte gUnknown_80F4F40
_080748F0:
@@ -1643,7 +1643,7 @@ _08074A46:
cmp r0, 0
bne _08074AD4
adds r0, r5, 0
bl CannotAct
bl HasStatusThatPreventsActing
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -1778,7 +1778,7 @@ _08074B7A:
bne _08074BAE
movs r2, 0x2
ldrsh r0, [r6, r2]
bl GetUnk1B
bl GetRegenSpeed
lsls r0, 24
lsrs r4, r0, 24
_08074BAE:
@@ -1786,7 +1786,7 @@ _08074BAE:
beq _08074C48
adds r0, r7, 0
movs r1, 0xA
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08074BC8
@@ -1812,7 +1812,7 @@ _08074BDA:
cmp r0, 0
beq _08074BFE
adds r0, r7, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -2253,7 +2253,7 @@ _08074F5C:
adds r0, r2
ldr r4, [r0]
adds r0, r7, 0
bl GetMovementSpeed
bl GetSpeedStatus
adds r5, r0, 0
cmp r4, r5
beq _08074F96
@@ -2664,14 +2664,14 @@ _0807524E:
cmp r0, 0
beq _080752B2
adds r0, r5, 0
bl CannotAct
bl HasStatusThatPreventsActing
lsls r0, 24
cmp r0, 0
bne _0807534C
_080752B2:
adds r0, r5, 0x4
adds r1, r6, 0
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r1, r0, 0
adds r0, r4, 0
adds r0, 0x46
@@ -2683,7 +2683,7 @@ _080752B2:
b _0807534C
.align 2, 0
_080752D0: .4byte gUnknown_202F378
_080752D4: .4byte gDungeonGlobalData
_080752D4: .4byte gDungeon
_080752D8: .4byte 0x000135cc
_080752DC: .4byte 0x00000147
_080752E0:
@@ -2776,7 +2776,7 @@ _08075384:
movs r5, 0
b _0807549E
.align 2, 0
_08075390: .4byte gDungeonGlobalData
_08075390: .4byte gDungeon
_08075394: .4byte 0x0000066c
_08075398:
movs r0, 0x7
@@ -2846,7 +2846,7 @@ _080753A6:
strh r2, [r6]
b _08075492
.align 2, 0
_08075420: .4byte gDungeonGlobalData
_08075420: .4byte gDungeon
_08075424: .4byte 0x000135cc
_08075428:
movs r0, 0
@@ -2965,7 +2965,7 @@ _08075506:
b _08075600
.align 2, 0
_08075510: .4byte gUnknown_202F378
_08075514: .4byte gDungeonGlobalData
_08075514: .4byte gDungeon
_08075518: .4byte 0x000135cc
_0807551C:
ldr r2, [r4, 0x70]
@@ -3110,7 +3110,7 @@ _08075632:
str r3, [r0]
b _0807566A
.align 2, 0
_08075650: .4byte gDungeonGlobalData
_08075650: .4byte gDungeon
_08075654: .4byte 0x00003a08
_08075658: .4byte gUnknown_202F32D
_0807565C: .4byte 0x000135cc
@@ -3132,7 +3132,7 @@ _0807566C:
pop {r1}
bx r1
.align 2, 0
_0807567C: .4byte gDungeonGlobalData
_0807567C: .4byte gDungeon
thumb_func_end UseAttack
thumb_func_start sub_8075680
@@ -3173,7 +3173,7 @@ _08075684:
bne _080756EE
adds r0, r5, 0x4
adds r1, r4, 0
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r4, r0, 0
movs r1, 0x7
ands r0, r1
@@ -3196,7 +3196,7 @@ _080756EE:
pop {r0}
bx r0
.align 2, 0
_080756FC: .4byte gDungeonGlobalData
_080756FC: .4byte gDungeon
_08075700: .4byte 0x000135cc
thumb_func_end sub_8075680
@@ -3218,11 +3218,11 @@ sub_8075708:
cmp r0, 0
beq _0807580C
adds r0, r4, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0xD
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _08075752
@@ -3233,7 +3233,7 @@ sub_8075708:
beq _08075752
adds r0, r4, 0
movs r1, 0x9
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
bne _08075752
@@ -3271,7 +3271,7 @@ _08075788:
mov r9, r0
adds r0, r4, 0
movs r1, 0x13
bl HasIQSkill
bl IQSkillIsEnabled
lsls r0, 24
cmp r0, 0
beq _080757BA

2
asm/code_8077274.s
View File

@@ -271,7 +271,7 @@ _08078B86:
bne _08078BB8
adds r0, r6, 0
movs r1, 0x1B
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08078BB8

12
asm/code_8077274_1.s
View File

@@ -24,7 +24,7 @@ sub_807AB38:
_0807AB54:
adds r0, r2, 0
str r2, [sp, 0x1A4]
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
ldrh r1, [r0]
movs r0, 0x40
ands r0, r1
@@ -86,7 +86,7 @@ _0807ABC6:
adds r0, r4, 0
adds r1, r6, 0
str r2, [sp, 0x1A4]
bl GetMapTile_2
bl GetTileSafe
adds r1, r0, 0
ldr r0, [r1, 0x10]
ldr r2, [sp, 0x1A4]
@@ -121,7 +121,7 @@ _0807AC00:
ble _0807ABAE
b _0807ACB4
.align 2, 0
_0807AC10: .4byte gDungeonGlobalData
_0807AC10: .4byte gDungeon
_0807AC14: .4byte 0x00000671
_0807AC18: .4byte 0x00003a0c
_0807AC1C: .4byte 0x000104c4
@@ -176,7 +176,7 @@ _0807AC72:
adds r0, r4, 0
adds r1, r6, 0
str r2, [sp, 0x1A4]
bl GetMapTile_2
bl GetTileSafe
adds r1, r0, 0
ldr r0, [r1, 0x10]
ldr r2, [sp, 0x1A4]
@@ -214,7 +214,7 @@ _0807ACB4:
ldr r1, _0807AD78
movs r4, 0
ldrsh r1, [r1, r4]
bl DungeonRandomRange
bl DungeonRandRange
adds r7, r0, 0
cmp r7, r8
blt _0807ACCC
@@ -226,7 +226,7 @@ _0807ACCC:
mov r10, r6
_0807ACD4:
mov r0, r8
bl DungeonRandomCapped
bl DungeonRandInt
adds r2, r0, 0
movs r3, 0
cmp r3, r8

8
asm/code_807CABC.s
View File

@@ -108,7 +108,7 @@ _0807CB80:
stm r0!, {r2-r4}
ldm r1!, {r2-r4}
stm r0!, {r2-r4}
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _0807CBAC
@@ -126,7 +126,7 @@ _0807CBAC:
add r4, sp, 0x20
lsls r5, 8
lsrs r0, r5, 24
bl GetItemMove
bl GetItemMoveID
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -151,7 +151,7 @@ _0807CBAC:
adds r2, r7, r3
adds r0, r4, 0
adds r1, r6, 0
bl FindMoveTarget
bl AIConsiderMove
ldrb r0, [r4]
cmp r0, 0
beq _0807CC08
@@ -301,7 +301,7 @@ _0807CD18:
bl sub_8075900
b _0807CD44
.align 2, 0
_0807CD30: .4byte gDungeonGlobalData
_0807CD30: .4byte gDungeon
_0807CD34: .4byte 0x00003a08
_0807CD38:
cmp r4, 0

72
asm/code_807CD9C.s
View File

@@ -18,7 +18,7 @@ sub_807CD9C:
adds r4, r2, 0
movs r0, 0xA
str r0, [sp, 0x24]
bl IsFixedDungeon
bl IsCurrentFixedRoomBossFight
lsls r0, 24
cmp r0, 0
beq _0807CDC4
@@ -167,7 +167,7 @@ _0807CED8:
ldrsh r0, [r7, r1]
ldr r1, [sp, 0x18]
asrs r1, 16
bl GetMapTile_1
bl GetTile
adds r5, r0, 0
ldr r0, [r5, 0x10]
cmp r0, 0
@@ -333,7 +333,7 @@ _0807D050: .4byte gUnknown_80F4F90
_0807D054: .4byte 0x00000219
_0807D058: .4byte 0x00000163
_0807D05C: .4byte 0x0000021a
_0807D060: .4byte gDungeonGlobalData
_0807D060: .4byte gDungeon
_0807D064: .4byte 0x00003a08
thumb_func_end sub_807CD9C
@@ -483,7 +483,7 @@ sub_807D148:
_0807D180: .4byte gAvailablePokemonNames
_0807D184: .4byte gUnknown_80FCAE8
_0807D188:
bl IsFixedDungeon
bl IsCurrentFixedRoomBossFight
lsls r0, 24
cmp r0, 0
beq _0807D1A4
@@ -518,7 +518,7 @@ _0807D1A4:
bl PetrifiedStatusTarget
b _0807D3A8
.align 2, 0
_0807D1D0: .4byte gDungeonGlobalData
_0807D1D0: .4byte gDungeon
_0807D1D4: .4byte 0x0000e21c
_0807D1D8: .4byte gUnknown_80FC9A0
_0807D1DC:
@@ -618,7 +618,7 @@ _0807D288:
str r3, [sp, 0x8]
b _0807D2CE
.align 2, 0
_0807D2A8: .4byte gDungeonGlobalData
_0807D2A8: .4byte gDungeon
_0807D2AC: .4byte 0x0000e21c
_0807D2B0:
mov r0, sp
@@ -751,7 +751,7 @@ _0807D3A8:
_0807D3B8: .4byte gUnknown_202EDCC
_0807D3BC: .4byte 0xfffffc00
_0807D3C0: .4byte gUnknown_80FCB14
_0807D3C4: .4byte gDungeonGlobalData
_0807D3C4: .4byte gDungeon
_0807D3C8: .4byte 0x00003a08
thumb_func_end sub_807D148
@@ -774,7 +774,7 @@ sub_807D3CC:
_0807D3E8:
mov r0, r8
str r2, [sp]
bl GetEntityRoomIndex
bl GetEntityRoom
lsls r0, 24
lsrs r1, r0, 24
ldr r2, [sp]
@@ -822,7 +822,7 @@ _0807D438:
ble _0807D408
b _0807D4A8
.align 2, 0
_0807D448: .4byte gDungeonGlobalData
_0807D448: .4byte gDungeon
_0807D44C: .4byte 0x00018209
_0807D450:
lsls r0, r1, 3
@@ -902,7 +902,7 @@ _0807D4DC: .4byte gUnknown_80FD320
thumb_func_start sub_807D4E0
sub_807D4E0:
push {r4,lr}
bl GetMapTile_1
bl GetTile
ldr r4, [r0, 0x14]
cmp r4, 0
beq _0807D506
@@ -990,7 +990,7 @@ _0807D580:
ldrsh r0, [r5, r1]
movs r2, 0x6
ldrsh r1, [r5, r2]
bl GetMapTile_1
bl GetTile
ldrh r1, [r0]
movs r2, 0x3
adds r0, r2, 0
@@ -1092,7 +1092,7 @@ _0807D634:
_0807D650: .4byte 0x00000d08
_0807D654: .4byte 0x00000b58
_0807D658: .4byte 0x00000d0c
_0807D65C: .4byte gDungeonGlobalData
_0807D65C: .4byte gDungeon
_0807D660: .4byte 0x00003804
_0807D664: .4byte 0x00003904
_0807D668: .4byte 0x0001361c
@@ -1190,7 +1190,7 @@ _0807D6DA:
lsls r0, r6, 16
asrs r0, 16
asrs r1, r6, 16
bl GetMapTile_1
bl GetTile
adds r2, r0, 0
ldrh r1, [r2]
movs r3, 0x3
@@ -1514,7 +1514,7 @@ _0807D9B8: .4byte 0x00000bbc
_0807D9BC: .4byte 0x00000d0c
_0807D9C0: .4byte 0x00000c24
_0807D9C4: .4byte 0x00000d08
_0807D9C8: .4byte gDungeonGlobalData
_0807D9C8: .4byte gDungeon
_0807D9CC: .4byte 0x00018210
_0807D9D0: .4byte 0x00000d14
_0807D9D4: .4byte 0x00000d1c
@@ -1575,7 +1575,7 @@ sub_807DA14:
_0807DA48: .4byte gAvailablePokemonNames
_0807DA4C: .4byte gUnknown_80FCB98
_0807DA50:
bl IsFixedDungeon
bl IsCurrentFixedRoomBossFight
lsls r0, 24
cmp r0, 0
beq _0807DA6C
@@ -1631,7 +1631,7 @@ _0807DA8C:
bgt _0807DB00
adds r0, r5, 0
adds r1, r4, 0
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
ldr r0, [r1, 0x10]
cmp r0, 0
@@ -1709,7 +1709,7 @@ _0807DB5E:
pop {r0}
bx r0
.align 2, 0
_0807DB6C: .4byte gDungeonGlobalData
_0807DB6C: .4byte gDungeon
_0807DB70: .4byte 0x00003a08
thumb_func_end sub_807DA14
@@ -1722,7 +1722,7 @@ sub_807DB74:
adds r7, r0, 0
movs r0, 0
mov r8, r0
bl IsFixedDungeon
bl IsCurrentFixedRoomBossFight
lsls r0, 24
cmp r0, 0
beq _0807DB94
@@ -1752,7 +1752,7 @@ _0807DBB6:
_0807DBB8:
adds r0, r4, 0
adds r1, r5, 0
bl GetMapTile_2
bl GetTileSafe
adds r2, r0, 0
ldrh r1, [r2]
movs r0, 0x3
@@ -1830,7 +1830,7 @@ _0807DC54:
bx r0
.align 2, 0
_0807DC60: .4byte gUnknown_80FD060
_0807DC64: .4byte gDungeonGlobalData
_0807DC64: .4byte gDungeon
thumb_func_end sub_807DB74
thumb_func_start sub_807DC68
@@ -1851,7 +1851,7 @@ sub_807DC68:
ldr r0, _0807DC90
b _0807DCB8
.align 2, 0
_0807DC88: .4byte gDungeonGlobalData
_0807DC88: .4byte gDungeon
_0807DC8C: .4byte 0x00003a08
_0807DC90: .4byte gUnknown_80FD3C8
_0807DC94:
@@ -1866,7 +1866,7 @@ _0807DC94:
_0807DCA4: .4byte 0x00003a0b
_0807DCA8: .4byte gUnknown_80FD3CC
_0807DCAC:
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _0807DCC8
@@ -1892,7 +1892,7 @@ _0807DCD8:
movs r6, 0
adds r0, r5, 0
adds r1, r4, 0
bl GetMapTile_2
bl GetTileSafe
adds r2, r0, 0
ldrh r1, [r2]
ldr r3, _0807DD6C
@@ -1967,7 +1967,7 @@ _0807DD5C:
_0807DD68: .4byte 0x0000fffc
_0807DD6C: .4byte 0x0000fbff
_0807DD70: .4byte 0x0000fff7
_0807DD74: .4byte gDungeonGlobalData
_0807DD74: .4byte gDungeon
_0807DD78:
ldrh r1, [r2]
movs r0, 0x3
@@ -2015,7 +2015,7 @@ _0807DDC8:
_0807DDCA:
adds r0, r5, 0
adds r1, r4, 0
bl GetMapTile_2
bl GetTileSafe
adds r2, r0, 0
ldrh r1, [r2]
movs r3, 0x80
@@ -2062,7 +2062,7 @@ _0807DE1A:
beq _0807DE30
adds r0, r5, 0
adds r1, r4, 0
bl GetMapTile_2
bl GetTileSafe
ldrh r2, [r0]
movs r1, 0x40
orrs r1, r2
@@ -2095,7 +2095,7 @@ _0807DE46:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
bl GetMapTile_1
bl GetTile
ldrb r1, [r0, 0x9]
adds r0, r4, 0
adds r0, 0x25
@@ -2174,7 +2174,7 @@ _0807DF0E:
pop {r0}
bx r0
.align 2, 0
_0807DF1C: .4byte gDungeonGlobalData
_0807DF1C: .4byte gDungeon
_0807DF20: .4byte 0x0000e21c
_0807DF24: .4byte 0x0000fffc
_0807DF28: .4byte 0x00003a0c
@@ -2240,12 +2240,12 @@ _0807DF8E:
bl SetMessageArgument
b _0807DFC2
.align 2, 0
_0807DFA8: .4byte gDungeonGlobalData
_0807DFA8: .4byte gDungeon
_0807DFAC: .4byte 0x000135cc
_0807DFB0: .4byte gAvailablePokemonNames
_0807DFB4:
mov r0, r10
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -2323,7 +2323,7 @@ _0807E014:
bgt _0807E112
cmp r1, 0x1F
bgt _0807E112
bl GetMapTile_2
bl GetTileSafe
mov r8, r0
ldr r0, [sp, 0x18]
movs r2, 0
@@ -2522,7 +2522,7 @@ sub_807E1A0:
asrs r4, r5, 1
adds r0, r6, 0
movs r1, 0x2
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
beq _0807E202
@@ -2540,7 +2540,7 @@ _0807E210:
ldr r4, [sp, 0x40]
adds r0, r6, 0
movs r1, 0x2
bl HasType
bl MonsterIsType
lsls r0, 24
cmp r0, 0
beq _0807E226
@@ -2700,14 +2700,14 @@ _0807E366:
pop {r0}
bx r0
.align 2, 0
_0807E370: .4byte gDungeonGlobalData
_0807E370: .4byte gDungeon
_0807E374: .4byte 0x00003a08
thumb_func_end sub_807E254
thumb_func_start sub_807E378
sub_807E378:
push {r4-r7,lr}
bl GetLeaderEntity
bl GetLeader
adds r4, r0, 0
bl EntityExists
lsls r0, 24
@@ -2785,7 +2785,7 @@ _0807E3EE:
strb r1, [r0]
b _0807E564
.align 2, 0
_0807E41C: .4byte gDungeonGlobalData
_0807E41C: .4byte gDungeon
_0807E420: .4byte 0x00000666
_0807E424: .4byte 0x0000067a
_0807E428: .4byte gUnknown_80F9C4C

118
asm/code_807E5AC.s
View File

@@ -17,7 +17,7 @@ sub_807E698:
lsrs r0, 24
str r0, [sp]
movs r0, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 16
str r0, [sp, 0x4]
@@ -26,7 +26,7 @@ sub_807E698:
ldr r0, [r0, 0x4]
mov r10, r0
movs r0, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -76,7 +76,7 @@ _0807E71A:
.align 2, 0
_0807E724: .4byte gUnknown_202ECA0
_0807E728: .4byte gUnknown_203B40D
_0807E72C: .4byte gDungeonGlobalData
_0807E72C: .4byte gDungeon
_0807E730:
movs r7, 0x1
adds r2, r0, 0
@@ -206,7 +206,7 @@ sub_807E7FC:
ldr r5, [r0]
cmp r5, 0
bne _0807E816
bl GetLeaderEntity
bl GetLeader
adds r5, r0, 0
_0807E816:
cmp r4, 0
@@ -219,7 +219,7 @@ _0807E816:
bne _0807E844
ldr r4, _0807E880
movs r0, 0
bl GetWeather
bl GetApparentWeather
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -254,7 +254,7 @@ _0807E866:
pop {r0}
bx r0
.align 2, 0
_0807E874: .4byte gDungeonGlobalData
_0807E874: .4byte gDungeon
_0807E878: .4byte 0x000181f8
_0807E87C: .4byte 0x0001356c
_0807E880: .4byte gAvailablePokemonNames
@@ -266,7 +266,7 @@ _0807E888: .4byte 0x000135cc
sub_807E88C:
push {r4-r7,lr}
movs r0, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
ldr r1, _0807E8E4
ldr r1, [r1]
@@ -309,7 +309,7 @@ _0807E8A8:
bx r0
.align 2, 0
_0807E8E4: .4byte gUnknown_202ECA0
_0807E8E8: .4byte gDungeonGlobalData
_0807E8E8: .4byte gDungeon
_0807E8EC: .4byte 0x0000017d
thumb_func_end sub_807E88C
@@ -344,7 +344,7 @@ _0807E90E:
ldrb r0, [r7]
strb r0, [r1, 0x1]
adds r0, r5, 0
bl GetMovementSpeed
bl GetSpeedStatus
adds r0, r5, 0
movs r1, 0x25
bl HasAbility
@@ -352,7 +352,7 @@ _0807E90E:
cmp r0, 0
beq _0807E958
adds r0, r5, 0
bl GetWeather
bl GetApparentWeather
ldr r1, _0807E954
lsls r0, 24
lsrs r0, 22
@@ -491,14 +491,14 @@ sub_807EA30:
ldr r2, _0807EA64
adds r1, r2
strb r0, [r1]
bl GetLeaderEntity
bl GetLeader
ldr r1, _0807EA68
ldr r1, [r1]
bl SendMessage
b _0807EA8C
.align 2, 0
_0807EA5C: .4byte gUnknown_80F4EAC
_0807EA60: .4byte gDungeonGlobalData
_0807EA60: .4byte gDungeon
_0807EA64: .4byte 0x0000e277
_0807EA68: .4byte gUnknown_80FAD8C
_0807EA6C:
@@ -511,7 +511,7 @@ _0807EA6C:
ldr r2, _0807EA98
adds r1, r2
strb r0, [r1]
bl GetLeaderEntity
bl GetLeader
ldr r1, _0807EA9C
ldr r1, [r1]
bl SendMessage
@@ -520,7 +520,7 @@ _0807EA8C:
bx r0
.align 2, 0
_0807EA90: .4byte gUnknown_80F4EAC
_0807EA94: .4byte gDungeonGlobalData
_0807EA94: .4byte gDungeon
_0807EA98: .4byte 0x0000e278
_0807EA9C: .4byte gUnknown_80FADB0
thumb_func_end sub_807EA30
@@ -546,7 +546,7 @@ sub_807EAA0:
mov r9, r1
movs r2, 0
str r2, [sp, 0x8]
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -568,7 +568,7 @@ _0807EAD6:
strb r0, [r4]
b _0807EB08
.align 2, 0
_0807EAF0: .4byte gDungeonGlobalData
_0807EAF0: .4byte gDungeon
_0807EAF4: .4byte 0x0000e267
_0807EAF8: .4byte 0x0000e26f
_0807EAFC:
@@ -605,7 +605,7 @@ _0807EB1C:
b _0807EB4E
.align 2, 0
_0807EB38: .4byte 0x0000e267
_0807EB3C: .4byte gDungeonGlobalData
_0807EB3C: .4byte gDungeon
_0807EB40: .4byte 0x0000e265
_0807EB44:
ldr r0, [r0]
@@ -627,7 +627,7 @@ _0807EB4E:
strb r0, [r1]
_0807EB64:
movs r0, 0
bl GetWeather
bl GetApparentWeather
lsls r0, 24
lsrs r0, 24
cmp r10, r0
@@ -652,7 +652,7 @@ _0807EB82:
b _0807EBA6
.align 2, 0
_0807EB94: .4byte 0x0000e264
_0807EB98: .4byte gDungeonGlobalData
_0807EB98: .4byte gDungeon
_0807EB9C: .4byte 0x0000e279
_0807EBA0: .4byte 0x0000e266
_0807EBA4:
@@ -674,7 +674,7 @@ _0807EBA6:
ldrb r0, [r0]
cmp r0, 0
bne _0807EBD4
bl GetLeaderEntity
bl GetLeader
ldr r1, _0807EC1C
ldr r1, [r1]
bl SendMessage
@@ -694,7 +694,7 @@ _0807EBD4:
ldrb r0, [r0]
cmp r0, 0
bne _0807EC00
bl GetLeaderEntity
bl GetLeader
ldr r1, _0807EC24
ldr r1, [r1]
bl SendMessage
@@ -709,7 +709,7 @@ _0807EC00:
pop {r1}
bx r1
.align 2, 0
_0807EC14: .4byte gDungeonGlobalData
_0807EC14: .4byte gDungeon
_0807EC18: .4byte 0x0000e277
_0807EC1C: .4byte gUnknown_80FA778
_0807EC20: .4byte 0x0000e278
@@ -733,7 +733,7 @@ sub_807EC28:
beq _0807EC46
b _0807EF32
_0807EC46:
bl GetLeaderEntity
bl GetLeader
adds r7, r0, 0
ldr r0, [r7, 0x70]
mov r9, r0
@@ -745,7 +745,7 @@ _0807EC46:
ldrb r0, [r0]
str r0, [sp, 0x8]
adds r0, r7, 0
bl GetMapTileForDungeonEntity_2
bl GetTileAtEntitySafe
ldrh r0, [r0]
lsrs r0, 5
mov r10, r0
@@ -788,7 +788,7 @@ _0807EC9C:
strb r1, [r0]
b _0807EF32
.align 2, 0
_0807ECB4: .4byte gDungeonGlobalData
_0807ECB4: .4byte gDungeon
_0807ECB8: .4byte 0x00000699
_0807ECBC: .4byte 0x0000066e
_0807ECC0:
@@ -818,10 +818,10 @@ _0807ECC6:
cmp r0, 0
beq _0807ED0E
adds r0, r7, 0
bl GetEntityRoomIndex
bl GetEntityRoom
adds r4, r0, 0
adds r0, r5, 0
bl GetEntityRoomIndex
bl GetEntityRoom
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -859,7 +859,7 @@ _0807ED3A:
bl PrintFieldMessage
b _0807EF32
.align 2, 0
_0807ED48: .4byte gDungeonGlobalData
_0807ED48: .4byte gDungeon
_0807ED4C: .4byte 0x0001358c
_0807ED50: .4byte 0xffff0000
_0807ED54: .4byte 0xff00ffff
@@ -924,10 +924,10 @@ _0807EDB8:
b _0807EEC4
_0807EDC6:
adds r0, r7, 0
bl GetEntityRoomIndex
bl GetEntityRoom
adds r4, r0, 0
adds r0, r5, 0
bl GetEntityRoomIndex
bl GetEntityRoom
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -992,7 +992,7 @@ _0807EE22:
ldrsh r0, [r6, r2]
asrs r1, 16
str r3, [sp, 0x18]
bl GetMapTile_1
bl GetTile
ldrb r0, [r0, 0x9]
ldr r3, [sp, 0x18]
cmp r0, 0xFF
@@ -1019,13 +1019,13 @@ _0807EE72:
beq _0807EEAE
mov r0, r9
mov r1, r8
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r1, r0, 0
adds r0, r7, 0
bl sub_806CE34
b _0807EEB2
.align 2, 0
_0807EE90: .4byte gDungeonGlobalData
_0807EE90: .4byte gDungeon
_0807EE94: .4byte 0x0001358c
_0807EE98: .4byte 0xffff0000
_0807EE9C: .4byte 0x0000ffff
@@ -1042,7 +1042,7 @@ _0807EEAE:
_0807EEB2:
mov r0, r8
mov r1, r9
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r1, r0, 0
adds r0, r5, 0
bl sub_806CE68
@@ -1077,7 +1077,7 @@ _0807EEF2:
bl sub_807F33C
b _0807EF32
.align 2, 0
_0807EEF8: .4byte gDungeonGlobalData
_0807EEF8: .4byte gDungeon
_0807EEFC: .4byte 0x00000694
_0807EF00: .4byte 0x0000068c
_0807EF04:
@@ -1137,7 +1137,7 @@ sub_807EF48:
movs r0, 0
b _0807EF7E
.align 2, 0
_0807EF70: .4byte gDungeonGlobalData
_0807EF70: .4byte gDungeon
_0807EF74: .4byte 0x00000694
_0807EF78: .4byte 0x0000068c
_0807EF7C:
@@ -1167,8 +1167,8 @@ sub_807EF84:
adds r4, r0, 0
cmp r4, 0
beq _0807EFE2
bl GetLeaderEntity
bl GetMapTileForDungeonEntity_2
bl GetLeader
bl GetTileAtEntitySafe
ldrh r1, [r0]
movs r0, 0x20
ands r0, r1
@@ -1293,7 +1293,7 @@ _0807F09A:
str r0, [sp, 0x4]
adds r0, r6, 0
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldrh r1, [r4]
movs r0, 0x20
@@ -1389,7 +1389,7 @@ _0807F158:
pop {r0}
bx r0
.align 2, 0
_0807F168: .4byte gDungeonGlobalData
_0807F168: .4byte gDungeon
_0807F16C: .4byte 0xffff0000
_0807F170: .4byte 0xff00ffff
_0807F174: .4byte gUnknown_202DE30
@@ -1449,7 +1449,7 @@ _0807F1E6:
.align 2, 0
_0807F1EC: .4byte 0xffff0000
_0807F1F0: .4byte 0xff00ffff
_0807F1F4: .4byte gDungeonGlobalData
_0807F1F4: .4byte gDungeon
_0807F1F8: .4byte 0x00000694
_0807F1FC: .4byte gUnknown_202DE30
_0807F200: .4byte gUnknown_80FE568
@@ -1485,7 +1485,7 @@ _0807F23C:
_0807F240:
adds r0, r6, 0
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldrh r1, [r4]
movs r0, 0x20
@@ -1598,7 +1598,7 @@ _0807F31C:
bx r1
.align 2, 0
_0807F324: .4byte gTeamInventory_203B460
_0807F328: .4byte gDungeonGlobalData
_0807F328: .4byte gDungeon
_0807F32C: .4byte 0x000135cc
_0807F330: .4byte 0x00000694
_0807F334: .4byte 0x0000068c
@@ -1618,7 +1618,7 @@ sub_807F33C:
ldr r2, _0807F424
adds r0, r2
strb r1, [r0]
bl GetLeaderEntity
bl GetLeader
ldr r1, _0807F428
ldr r1, [r1]
bl SendMessage
@@ -1629,7 +1629,7 @@ _0807F360:
_0807F364:
adds r0, r6, 0
adds r1, r5, 0
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x14]
cmp r0, 0
@@ -1688,7 +1688,7 @@ _0807F3BC:
movs r0, 0
strb r0, [r4, 0x8]
adds r0, r5, 0
bl GetMovementSpeed
bl GetSpeedStatus
adds r4, 0x60
ldrb r1, [r4]
movs r0, 0x1
@@ -1719,7 +1719,7 @@ _0807F3F4:
pop {r0}
bx r0
.align 2, 0
_0807F41C: .4byte gDungeonGlobalData
_0807F41C: .4byte gDungeon
_0807F420: .4byte 0x0000066e
_0807F424: .4byte 0x0000066f
_0807F428: .4byte gUnknown_80FE4B8
@@ -1810,7 +1810,7 @@ _0807F4D0:
b _0807F602
_0807F4D6:
adds r1, r4, 0
bl CanSee
bl CanSeeTarget
lsls r0, 24
cmp r0, 0
bne _0807F4E4
@@ -1832,7 +1832,7 @@ _0807F4E4:
_0807F500:
b _0807F51E
.align 2, 0
_0807F504: .4byte gDungeonGlobalData
_0807F504: .4byte gDungeon
_0807F508: .4byte 0x000135cc
_0807F50C:
ldr r0, [sp, 0xEC]
@@ -1990,7 +1990,7 @@ _0807F634: .4byte 0xffff0000
_0807F638: .4byte 0x0000ffff
_0807F63C:
mov r0, r9
bl DungeonRandomCapped
bl DungeonRandInt
lsls r0, 2
add r0, sp
adds r0, 0x18
@@ -2004,7 +2004,7 @@ _0807F64E:
_0807F654:
ldr r0, [r4]
ldr r1, [r4, 0x8]
bl DungeonRandomRange
bl DungeonRandRange
lsls r0, 16
lsrs r0, 16
ldr r2, _0807F6A0
@@ -2014,7 +2014,7 @@ _0807F654:
str r1, [r6]
ldr r0, [r4, 0x4]
ldr r1, [r4, 0xC]
bl DungeonRandomRange
bl DungeonRandRange
lsls r0, 16
ldrh r1, [r6]
orrs r1, r0
@@ -2096,7 +2096,7 @@ _0807F70C:
mov r1, r8
adds r1, 0x4
add r0, sp, 0xD4
bl CalculateFacingDir
bl GetDirectionTowardsPosition
adds r5, r0, 0
add r2, sp, 0xD4
movs r1, 0
@@ -2230,7 +2230,7 @@ _0807F7FC:
adds r4, r2, 0
movs r3, 0x2
ldrsh r1, [r4, r3]
bl GetMapTile_1
bl GetTile
ldr r6, [r0, 0x10]
adds r0, r6, 0
bl EntityExists
@@ -2453,7 +2453,7 @@ _0807FA0A:
pop {r0}
bx r0
.align 2, 0
_0807FA10: .4byte gDungeonGlobalData
_0807FA10: .4byte gDungeon
_0807FA14: .4byte 0x00003a08
thumb_func_end sub_807F9BC
@@ -2468,7 +2468,7 @@ _0807FA1E:
_0807FA22:
adds r0, r5, 0
adds r1, r6, 0
bl GetMapTile_2
bl GetTileSafe
adds r4, r0, 0
ldrh r1, [r4, 0x4]
movs r0, 0x4
@@ -2552,7 +2552,7 @@ sub_807FA9C:
mov r8, r1
b _0807FBFE
.align 2, 0
_0807FAC4: .4byte gDungeonGlobalData
_0807FAC4: .4byte gDungeon
_0807FAC8: .4byte 0x0001820f
_0807FACC: .4byte 0x000181ea
_0807FAD0:
@@ -2581,7 +2581,7 @@ _0807FAF8:
movs r6, 0
adds r0, r5, 0
mov r1, r8
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x14]
cmp r0, 0
@@ -2729,7 +2729,7 @@ _0807FC06:
_0807FC18: .4byte 0x000181e8
_0807FC1C: .4byte gUnknown_202EDC0
_0807FC20: .4byte 0x0000f3ff
_0807FC24: .4byte gDungeonGlobalData
_0807FC24: .4byte gDungeon
_0807FC28: .4byte 0x000181f0
_0807FC2C: .4byte 0x000181f2
_0807FC30: .4byte 0x00000fff

100
asm/code_807FCD4.s
View File

@@ -20,7 +20,7 @@ sub_807FCD4:
ldrsh r0, [r7, r1]
movs r2, 0x2
ldrsh r1, [r7, r2]
bl GetMapTile_2
bl GetTileSafe
adds r6, r0, 0
cmp r5, 0x13
bls _0807FD12
@@ -115,7 +115,7 @@ sub_807FD84:
movs r0, 0
b _0807FDF6
.align 2, 0
_0807FD9C: .4byte gDungeonGlobalData
_0807FD9C: .4byte gDungeon
_0807FDA0: .4byte 0x00013570
_0807FDA4:
strb r5, [r1]
@@ -174,7 +174,7 @@ sub_807FE04:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r2, r3]
bl GetMapTile_2
bl GetTileSafe
adds r4, r0, 0
ldr r0, [r4, 0x14]
cmp r0, 0
@@ -210,7 +210,7 @@ sub_807FE44:
ldrsh r0, [r2, r1]
movs r3, 0x2
ldrsh r1, [r2, r3]
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x14]
cmp r0, 0
@@ -268,7 +268,7 @@ sub_807FE9C:
ldrsh r0, [r1, r2]
movs r3, 0x2
ldrsh r1, [r1, r3]
bl GetMapTile_2
bl GetTileSafe
str r0, [sp, 0x4]
ldr r0, [r0, 0x14]
mov r10, r0
@@ -317,12 +317,12 @@ _0807FEFE:
cmp r0, 0x11
beq _0807FF96
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r7, r0, 0
movs r6, 0
adds r0, r4, 0
movs r1, 0x1C
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _0807FF3C
@@ -346,7 +346,7 @@ _0807FF50:
.align 2, 0
_0807FF58: .4byte gAvailablePokemonNames
_0807FF5C: .4byte gUnknown_80FDB5C
_0807FF60: .4byte gDungeonGlobalData
_0807FF60: .4byte gDungeon
_0807FF64: .4byte 0x0001820f
_0807FF68:
cmp r7, 0xE
@@ -402,7 +402,7 @@ _0807FF96:
b _0807FFFA
.align 2, 0
_0807FFD8: .4byte gUnknown_80FDB7C
_0807FFDC: .4byte gDungeonGlobalData
_0807FFDC: .4byte gDungeon
_0807FFE0: .4byte 0x0001820a
_0807FFE4: .4byte gUnknown_80FD7F4
_0807FFE8:
@@ -633,7 +633,7 @@ sub_80801CC:
cmp r4, 0
beq _08080240
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
adds r1, r0, 0
cmp r0, 0x18
bgt _080801EC
@@ -705,7 +705,7 @@ sub_808024C:
mov r8, r0
mov r0, r10
movs r1, 0xE
bl HasItem
bl HasHeldItem
lsls r0, 24
cmp r0, 0
beq _08080278
@@ -795,7 +795,7 @@ _0808030C: .4byte gTeamInventory_203B460
_08080310: .4byte gUnknown_80FDC40
_08080314:
adds r0, r6, 0
bl DungeonRandomCapped
bl DungeonRandInt
ldr r2, _0808035C
lsls r0, 2
mov r1, sp
@@ -998,7 +998,7 @@ _08080470:
_08080478:
ldr r0, [r4]
ldrb r0, [r0, 0x2]
bl GetItemType
bl GetItemCategory
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -1008,7 +1008,7 @@ _08080478:
cmp r0, 0x54
beq _080804AE
movs r0, 0x64
bl DungeonRandomCapped
bl DungeonRandInt
ldr r1, _080804C4
movs r2, 0
ldrsh r1, [r1, r2]
@@ -1080,7 +1080,7 @@ sub_8080504:
bne _0808051A
b _0808060E
_0808051A:
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _08080534
@@ -1145,7 +1145,7 @@ _0808055E:
_080805A4: .4byte 0x00000193
_080805A8: .4byte gUnknown_80F4F8A
_080805AC: .4byte 0x00000215
_080805B0: .4byte gDungeonGlobalData
_080805B0: .4byte gDungeon
_080805B4:
ldr r0, _080805C0
ldr r1, [r0]
@@ -1210,13 +1210,13 @@ sub_8080620:
str r0, [sp, 0x14]
adds r7, r1, 0
movs r0, 0x3
bl DungeonRandomCapped
bl DungeonRandInt
adds r6, r0, 0
adds r4, r6, 0x2
movs r0, 0x8
bl DungeonRandomCapped
bl DungeonRandInt
adds r5, r0, 0
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
bne _080806CA
@@ -1352,7 +1352,7 @@ _08080742:
cmp r4, 0
beq _0808077A
adds r0, r4, 0
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
lsls r4, 2
mov r0, sp
@@ -1464,7 +1464,7 @@ _08080816:
cmp r5, 0
beq _08080848
adds r0, r5, 0
bl DungeonRandomCapped
bl DungeonRandInt
lsls r0, 2
mov r1, sp
adds r3, r1, r0
@@ -1518,7 +1518,7 @@ sub_8080884:
cmp r4, 0
beq _0808089E
movs r0, 0x8
bl DungeonRandomCapped
bl DungeonRandInt
adds r2, r0, 0
adds r0, r5, 0
adds r1, r4, 0
@@ -1546,14 +1546,14 @@ sub_80808A4:
ldr r1, _080808D4
adds r0, r1
ldrb r4, [r0]
bl IsBossBattle
bl IsBossFight
lsls r0, 24
cmp r0, 0
beq _080808DC
ldr r0, _080808D8
b _08080A2E
.align 2, 0
_080808D0: .4byte gDungeonGlobalData
_080808D0: .4byte gDungeon
_080808D4: .4byte 0x00018209
_080808D8: .4byte gUnknown_80FED08
_080808DC:
@@ -1565,7 +1565,7 @@ _080808E2:
ldrsh r0, [r5, r2]
movs r3, 0x2
ldrsh r1, [r5, r3]
bl GetMapTile_1
bl GetTile
ldrb r1, [r0, 0x9]
cmp r1, 0xFF
bne _0808090A
@@ -1618,7 +1618,7 @@ _0808093E:
_0808094A:
adds r0, r6, 0
adds r1, r7, 0
bl GetMapTile_1
bl GetTile
adds r4, r0, 0
ldr r0, [r4, 0x14]
adds r2, r6, 0x1
@@ -1653,7 +1653,7 @@ _08080980:
b _080809AE
.align 2, 0
_08080994: .4byte 0x000104c4
_08080998: .4byte gDungeonGlobalData
_08080998: .4byte gDungeon
_0808099C: .4byte 0x0000066e
_080809A0:
movs r0, 0
@@ -1916,7 +1916,7 @@ sub_8080B90:
bx r0
.align 2, 0
_08080BB0: .4byte gUnknown_81071E0
_08080BB4: .4byte gDungeonGlobalData
_08080BB4: .4byte gDungeon
_08080BB8: .4byte 0x00000644
thumb_func_end sub_8080B90
@@ -1982,7 +1982,7 @@ _08080C28:
bx r0
.align 2, 0
_08080C38: .4byte gUnknown_81071E0
_08080C3C: .4byte gDungeonGlobalData
_08080C3C: .4byte gDungeon
_08080C40: .4byte 0x0001361c
thumb_func_end sub_8080BBC
@@ -2065,7 +2065,7 @@ _08080CD6:
bx r0
.align 2, 0
_08080CE4: .4byte gUnknown_81071E0
_08080CE8: .4byte gDungeonGlobalData
_08080CE8: .4byte gDungeon
_08080CEC: .4byte 0x0001371c
thumb_func_end sub_8080C44
@@ -2175,7 +2175,7 @@ _08080DB6:
bx r0
.align 2, 0
_08080DD4: .4byte gUnknown_81071E0
_08080DD8: .4byte gDungeonGlobalData
_08080DD8: .4byte gDungeon
_08080DDC: .4byte 0x000037f0
_08080DE0: .4byte 0x000037f4
_08080DE4: .4byte 0x000037f8
@@ -3065,7 +3065,7 @@ _080815B2:
bx r0
.align 2, 0
_08081600: .4byte gUnknown_81071E0
_08081604: .4byte gDungeonGlobalData
_08081604: .4byte gDungeon
_08081608: .4byte 0x00003a08
_0808160C: .4byte 0x00003a09
_08081610: .4byte 0x00003a0a
@@ -3167,7 +3167,7 @@ sub_808165C:
bx r0
.align 2, 0
_08081708: .4byte gUnknown_81071E0
_0808170C: .4byte gDungeonGlobalData
_0808170C: .4byte gDungeon
_08081710: .4byte 0x00018208
_08081714: .4byte 0x00018209
_08081718: .4byte 0x0001820a
@@ -3211,7 +3211,7 @@ sub_808173C:
pop {r0}
bx r0
.align 2, 0
_08081778: .4byte gDungeonGlobalData
_08081778: .4byte gDungeon
_0808177C: .4byte 0x0001ced6
_08081780: .4byte 0x0001ced8
_08081784: .4byte 0x0001ceda
@@ -3867,7 +3867,7 @@ sub_8081C50:
bx r0
.align 2, 0
_08081C70: .4byte gUnknown_81071E0
_08081C74: .4byte gDungeonGlobalData
_08081C74: .4byte gDungeon
_08081C78: .4byte 0x00000644
thumb_func_end sub_8081C50
@@ -4067,7 +4067,7 @@ _08081DD0:
bx r0
.align 2, 0
_08081E20: .4byte gUnknown_81071E0
_08081E24: .4byte gDungeonGlobalData
_08081E24: .4byte gDungeon
_08081E28: .4byte 0x00003a08
_08081E2C: .4byte 0x00003a09
_08081E30: .4byte 0x00003a0a
@@ -4257,7 +4257,7 @@ sub_8081F2C:
bx r0
.align 2, 0
_08081FE4: .4byte gUnknown_81071E0
_08081FE8: .4byte gDungeonGlobalData
_08081FE8: .4byte gDungeon
_08081FEC: .4byte 0x000181f8
_08081FF0: .4byte 0x00018208
_08081FF4: .4byte 0x00018209
@@ -4298,7 +4298,7 @@ sub_808201C:
pop {r0}
bx r0
.align 2, 0
_08082050: .4byte gDungeonGlobalData
_08082050: .4byte gDungeon
_08082054: .4byte 0x0001ced6
_08082058: .4byte 0x0001ced8
_0808205C: .4byte 0x0001ceda
@@ -4416,7 +4416,7 @@ _080820FC:
mov r3, sp
movs r2, 0x6
ldrsh r1, [r3, r2]
bl GetMapTile_2
bl GetTileSafe
adds r4, r0, 0
ldrb r0, [r7]
mov r3, r9
@@ -4544,7 +4544,7 @@ _08082238:
bx r0
.align 2, 0
_08082250: .4byte gUnknown_81071E0
_08082254: .4byte gDungeonGlobalData
_08082254: .4byte gDungeon
_08082258: .4byte 0x000037f0
_0808225C: .4byte 0x000037f4
_08082260: .4byte 0x000037f8
@@ -4978,7 +4978,7 @@ _080824DC:
b _08082678
.align 2, 0
_0808266C: .4byte 0xfffffd60
_08082670: .4byte gLeaderPokemon
_08082670: .4byte gLeaderPointer
_08082674: .4byte 0x0000010d
_08082678:
ldr r1, _08082818
@@ -5165,7 +5165,7 @@ _08082830: .4byte 0x00000155
_08082834: .4byte 0x00000165
_08082838: .4byte 0x00000167
_0808283C: .4byte 0x00000169
_08082840: .4byte gLeaderPokemon
_08082840: .4byte gLeaderPointer
_08082844:
mov r0, sp
movs r1, 0x2
@@ -5190,7 +5190,7 @@ _08082856:
add r3, sp
movs r2, 0
ldrsh r1, [r3, r2]
bl GetMapTile_2
bl GetTileSafe
ldr r1, [r4]
str r1, [r7, 0x8]
ldr r1, [r4]
@@ -5238,7 +5238,7 @@ _080828BE:
bx r0
.align 2, 0
_080828D4: .4byte 0x0000020a
_080828D8: .4byte gLeaderPokemon
_080828D8: .4byte gLeaderPointer
_080828DC: .4byte gUnknown_203B410
thumb_func_end sub_8082280
@@ -5259,7 +5259,7 @@ sub_80828E0:
movs r4, 0x1
negs r4, r4
mov r0, r8
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r6, r0, 24
movs r3, 0
@@ -5389,7 +5389,7 @@ _080829E6:
pop {r1}
bx r1
.align 2, 0
_080829F4: .4byte gDungeonGlobalData
_080829F4: .4byte gDungeon
_080829F8: .4byte 0x0001357c
_080829FC: .4byte 0x0000069c
_08082A00: .4byte 0x00000167
@@ -5415,7 +5415,7 @@ sub_8082A08:
negs r0, r0
mov r8, r0
mov r0, r9
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r6, r0, 24
movs r3, 0
@@ -5552,7 +5552,7 @@ _08082B1C:
pop {r1}
bx r1
.align 2, 0
_08082B2C: .4byte gDungeonGlobalData
_08082B2C: .4byte gDungeon
_08082B30: .4byte 0x0001358c
_08082B34: .4byte 0x00000ebc
_08082B38: .4byte 0x00000167
@@ -5603,7 +5603,7 @@ _08082B46:
ldrsh r0, [r5, r1]
movs r2, 0x6
ldrsh r1, [r5, r2]
bl GetMapTile_2
bl GetTileSafe
ldrb r1, [r0, 0x9]
adds r0, r5, 0
adds r0, 0x25
@@ -5617,7 +5617,7 @@ _08082BA8:
pop {r0}
bx r0
.align 2, 0
_08082BB8: .4byte gDungeonGlobalData
_08082BB8: .4byte gDungeon
_08082BBC: .4byte 0x000135cc
thumb_func_end sub_8082B40

2
asm/code_808333C.s
View File

@@ -66,7 +66,7 @@ sub_8083568:
movs r0, 0x1
b _080835FA
.align 2, 0
_080835E0: .4byte gDungeonGlobalData
_080835E0: .4byte gDungeon
_080835E4: .4byte 0x000181f0
_080835E8: .4byte 0x000181f2
_080835EC: .4byte gUnknown_202ED28

14
asm/code_8083654.s
View File

@@ -18,7 +18,7 @@ sub_8083660:
lsls r1, 5
add r1, sp
str r0, [r1]
bl GetLeaderEntity
bl GetLeader
ldr r2, _080836D8
add r2, sp
str r0, [r2]
@@ -29,10 +29,10 @@ sub_8083660:
str r0, [r1]
_0808368A:
movs r0, 0x38
bl DungeonRandomCapped
bl DungeonRandInt
adds r4, r0, 0
movs r0, 0x20
bl DungeonRandomCapped
bl DungeonRandInt
ldr r2, _080836E0
add r2, sp
str r0, [r2]
@@ -178,7 +178,7 @@ _0808379C:
ldr r2, _0808380C
add r2, sp
str r3, [r2]
bl GetMapTile_1
bl GetTile
adds r2, r0, 0
ldr r0, _08083810
ldr r1, _0808380C
@@ -210,7 +210,7 @@ _080837E6:
cmp r7, 0
beq _08083820
adds r0, r7, 0
bl DungeonRandomCapped
bl DungeonRandInt
lsls r0, 2
mov r2, sp
adds r1, r2, r0
@@ -290,7 +290,7 @@ _0808386A:
adds r0, r5, 0
adds r1, r4, 0
str r3, [sp]
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
ldrh r2, [r1]
movs r7, 0x80
@@ -441,7 +441,7 @@ _08083960:
b _080839D0
.align 2, 0
_080839A0: .4byte gUnknown_80F4CC4
_080839A4: .4byte gDungeonGlobalData
_080839A4: .4byte gDungeon
_080839A8: .4byte 0x000037fc
_080839AC: .4byte 0x000135cc
_080839B0:

28
asm/code_808417C.s
View File

@@ -68,7 +68,7 @@ sub_80841EC:
bl sub_8083DE0
b _0808427C
.align 2, 0
_0808426C: .4byte gDungeonGlobalData
_0808426C: .4byte gDungeon
_08084270: .4byte 0x0001ceac
_08084274: .4byte 0x00000225
_08084278:
@@ -102,7 +102,7 @@ _08084290:
b _08084290
.align 2, 0
_080842B8: .4byte gUnknown_80FE6E8
_080842BC: .4byte gDungeonGlobalData
_080842BC: .4byte gDungeon
_080842C0: .4byte 0x0001ce98
_080842C4:
bl sub_8094D14
@@ -191,7 +191,7 @@ _08084320:
strb r7, [r2, 0x9]
b _080843A8
.align 2, 0
_0808436C: .4byte gDungeonGlobalData
_0808436C: .4byte gDungeon
_08084370: .4byte 0x00000677
_08084374: .4byte 0x0000068a
_08084378: .4byte 0x0000ffff
@@ -285,7 +285,7 @@ _0808440C:
bx r0
.align 2, 0
_08084418: .4byte 0x0000ffff
_0808441C: .4byte gDungeonGlobalData
_0808441C: .4byte gDungeon
_08084420: .4byte 0x00000644
thumb_func_end sub_80843BC
@@ -318,7 +318,7 @@ sub_8084448:
adds r5, r0, 0
ldr r7, [r5, 0x70]
ldr r4, _0808447C
bl GetLeaderEntity
bl GetLeader
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -402,7 +402,7 @@ _080844F0:
bl PrintFieldMessage
b _080845D4
.align 2, 0
_080844FC: .4byte gDungeonGlobalData
_080844FC: .4byte gDungeon
_08084500: .4byte 0x0000068a
_08084504: .4byte gUnknown_80FA32C
_08084508: .4byte gUnknown_202DE58
@@ -481,7 +481,7 @@ _08084582:
_080845B0: .4byte gUnknown_80FA2F0
_080845B4: .4byte gUnknown_80FA260
_080845B8: .4byte gUnknown_80FA36C
_080845BC: .4byte gDungeonGlobalData
_080845BC: .4byte gDungeon
_080845C0: .4byte gUnknown_80FA394
_080845C4:
ldr r0, _080845DC
@@ -512,7 +512,7 @@ sub_80845E0:
movs r1, 0
mov r9, r1
ldr r4, _08084620
bl GetLeaderEntity
bl GetLeader
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -563,7 +563,7 @@ _0808465A:
movs r0, 0x1
b _0808466A
.align 2, 0
_08084660: .4byte gDungeonGlobalData
_08084660: .4byte gDungeon
_08084664: .4byte 0x0001357c
_08084668:
movs r0, 0
@@ -599,7 +599,7 @@ _080846A0: .4byte gUnknown_80FA54C
_080846A4:
adds r0, r6, 0
adds r1, r7, 0
bl CanSee
bl CanSeeTarget
lsls r0, 24
cmp r0, 0
bne _080846C4
@@ -670,7 +670,7 @@ _08084716:
b _08084768
.align 2, 0
_08084744: .4byte gUnknown_80FA4D4
_08084748: .4byte gDungeonGlobalData
_08084748: .4byte gDungeon
_0808474C: .4byte 0x00000644
_08084750: .4byte gUnknown_80FA4D8
_08084754: .4byte gUnknown_80FA394
@@ -722,12 +722,12 @@ _08084784:
movs r0, 0xE
ldrsh r1, [r1, r0]
ldr r0, _080847B8
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
b _080847CE
.align 2, 0
_080847B8: .4byte gUnknown_202E088
_080847BC: .4byte gUnknown_8107224
_080847C0: .4byte gDungeonGlobalData
_080847C0: .4byte gDungeon
_080847C4: .4byte 0x00000644
_080847C8:
adds r4, 0x1
@@ -780,7 +780,7 @@ _08084810:
bl sub_8084854
b _08084846
.align 2, 0
_08084820: .4byte gDungeonGlobalData
_08084820: .4byte gDungeon
_08084824: .4byte 0x00003a0d
_08084828: .4byte 0x0001356c
_0808482C: .4byte gUnknown_8107234

16
asm/code_80848F0.s
View File

@@ -218,7 +218,7 @@ _080853EE:
lsls r0, r4, 16
asrs r0, 16
asrs r1, r4, 16
bl GetMapTile_1
bl GetTile
adds r1, r0, 0
mov r0, r8
bl sub_807034C
@@ -241,7 +241,7 @@ _080853EE:
bl sub_806B7F8
b _0808546E
.align 2, 0
_08085444: .4byte gDungeonGlobalData
_08085444: .4byte gDungeon
_08085448: .4byte 0x0001357c
_0808544C: .4byte 0x0000065c
_08085450: .4byte gUnknown_80F4598
@@ -269,13 +269,13 @@ _0808546E:
_0808547C: .4byte gUnknown_80F4598
thumb_func_end sub_8085374
thumb_func_start xxx_call_GetLeaderEntity
xxx_call_GetLeaderEntity:
thumb_func_start xxx_call_GetLeader
xxx_call_GetLeader:
push {lr}
bl GetLeaderEntity
bl GetLeader
pop {r1}
bx r1
thumb_func_end xxx_call_GetLeaderEntity
thumb_func_end xxx_call_GetLeader
thumb_func_start GetPartnerEntity
GetPartnerEntity:
@@ -302,7 +302,7 @@ _08085490:
adds r0, r4, 0
b _080854CC
.align 2, 0
_080854B8: .4byte gDungeonGlobalData
_080854B8: .4byte gDungeon
_080854BC: .4byte 0x0001357c
_080854C0:
adds r5, 0x1
@@ -461,7 +461,7 @@ _080855C4:
pop {r0}
bx r0
.align 2, 0
_080855D8: .4byte gDungeonGlobalData
_080855D8: .4byte gDungeon
_080855DC: .4byte 0x0001357c
_080855E0: .4byte 0x0000e220
thumb_func_end sub_80854D4

12
asm/code_8085B0C.s
View File

@@ -443,7 +443,7 @@ _08085E74: .4byte 0xffffff00
_08085E78: .4byte 0xffff00ff
_08085E7C: .4byte 0xff00ffff
_08085E80: .4byte gUnknown_202EDC8
_08085E84: .4byte gDungeonGlobalData
_08085E84: .4byte gDungeon
_08085E88: .4byte 0xffff0000
_08085E8C: .4byte gUnknown_202EE8C
_08085E90: .4byte gUnknown_202ECA4
@@ -460,7 +460,7 @@ sub_8085E98:
strb r1, [r0]
bx lr
.align 2, 0
_08085EA8: .4byte gDungeonGlobalData
_08085EA8: .4byte gDungeon
_08085EAC: .4byte 0x00018215
thumb_func_end sub_8085E98
@@ -474,7 +474,7 @@ sub_8085EB0:
strb r1, [r0]
bx lr
.align 2, 0
_08085EC0: .4byte gDungeonGlobalData
_08085EC0: .4byte gDungeon
_08085EC4: .4byte 0x00018215
thumb_func_end sub_8085EB0
@@ -562,7 +562,7 @@ _08085F5C:
pop {r0}
bx r0
.align 2, 0
_08085F70: .4byte gDungeonGlobalData
_08085F70: .4byte gDungeon
_08085F74: .4byte 0x000181f0
thumb_func_end sub_8085F44
@@ -584,7 +584,7 @@ _08085F8A:
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08085F94: .4byte gDungeonGlobalData
_08085F94: .4byte gDungeon
_08085F98: .4byte 0x00003a0d
_08085F9C: .4byte _08085FA0
.align 2, 0
@@ -718,7 +718,7 @@ _08086104:
b _0808611C
.align 2, 0
_08086108: .4byte gTeamInventory_203B460
_0808610C: .4byte gDungeonGlobalData
_0808610C: .4byte gDungeon
_08086110: .4byte 0x0001357c
_08086114:
adds r5, 0x1

22
asm/code_8086A3C.s
View File

@@ -54,14 +54,14 @@ _08086FA8:
pop {r0}
bx r0
.align 2, 0
_08086FB0: .4byte gDungeonGlobalData
_08086FB0: .4byte gDungeon
_08086FB4: .4byte 0x0001358c
thumb_func_end sub_8086F54
thumb_func_start TeamMeaniesPreFightDialogue
TeamMeaniesPreFightDialogue:
push {r4,lr}
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r4, r0, 0
bl sub_8086448
movs r0, 0xA
@@ -125,7 +125,7 @@ _08087060: .4byte gTeamMeaniesPreFightDialogue_7
thumb_func_start TeamMeaniesReFightDialogue
TeamMeaniesReFightDialogue:
push {r4,r5,lr}
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r4, r0, 0
bl GetPartnerEntity
adds r5, r0, 0
@@ -321,7 +321,7 @@ _0808722C: .4byte 0x0000015f
thumb_func_start sub_8087230
sub_8087230:
push {r4-r6,lr}
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r6, r0, 0
movs r0, 0x8
bl GetEntityFromClientType
@@ -350,11 +350,11 @@ sub_8087230:
movs r1, 0x96
lsls r1, 1
adds r0, r4, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
adds r4, 0x50
adds r0, r4, 0
movs r1, 0x91
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
pop {r4-r6}
pop {r0}
bx r0
@@ -367,7 +367,7 @@ _08087298: .4byte gUnknown_202E038
sub_808729C:
push {r4-r6,lr}
sub sp, 0x4
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
adds r5, r0, 0
movs r0, 0x8
bl GetEntityFromClientType
@@ -417,11 +417,11 @@ _08087300:
movs r1, 0x96
lsls r1, 1
adds r0, r4, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
adds r4, 0x50
adds r0, r4, 0
movs r1, 0x91
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -455,7 +455,7 @@ _0808735A:
pop {r0}
bx r0
.align 2, 0
_08087360: .4byte gDungeonGlobalData
_08087360: .4byte gDungeon
thumb_func_end sub_8087334
thumb_func_start ZapdosPreFightDialogue
@@ -466,7 +466,7 @@ ZapdosPreFightDialogue:
mov r5, r8
push {r5-r7}
sub sp, 0x70
bl xxx_call_GetLeaderEntity
bl xxx_call_GetLeader
mov r9, r0
bl GetPartnerEntity
adds r6, r0, 0

2
asm/code_8095014.s
View File

@@ -400,7 +400,7 @@ sub_809542C:
ldr r0, [r0]
str r0, [r2, 0x4]
str r1, [r2, 0x8]
bl Random
bl Rand32Bit
bl sub_8094D28
bl sub_8094E4C
ldr r1, [r4]

38
asm/code_80958E8.s
View File

@@ -26,7 +26,7 @@ _08095B48:
movs r0, 0x5
strb r0, [r4]
movs r0, 0x8
bl RandomCapped
bl RandInt
ldr r1, _08095BC8
adds r0, r1
ldrb r0, [r0]
@@ -42,7 +42,7 @@ _08095B48:
_08095B6C:
movs r0, 0
strb r0, [r4, 0x2]
bl Random
bl Rand32Bit
ldr r1, _08095BCC
ands r1, r0
str r1, [r4, 0x8]
@@ -72,13 +72,13 @@ _08095B9E:
cmp r7, 0
beq _08095BD4
adds r0, r7, 0
bl RandomCapped
bl RandInt
lsls r0, 1
add r0, sp
ldrh r0, [r0]
strh r0, [r4, 0xC]
adds r0, r7, 0
bl RandomCapped
bl RandInt
lsls r0, 1
add r0, sp
ldrh r0, [r0]
@@ -152,7 +152,7 @@ _08095C28:
_08095C4E:
cmp r0, 0x4
bgt _08095CCA
bl Random
bl Rand32Bit
adds r1, r0, 0
movs r0, 0xE0
lsls r0, 3
@@ -165,7 +165,7 @@ _08095C4E:
bgt _08095CB4
b _08095CAA
_08095C6C:
bl Random
bl Rand32Bit
adds r1, r0, 0
movs r0, 0x70
ands r1, r0
@@ -183,7 +183,7 @@ _08095C88:
bl sub_803C45C
b _08095CCA
_08095C90:
bl Random
bl Rand32Bit
movs r1, 0xC0
lsls r1, 6
ands r1, r0
@@ -251,7 +251,7 @@ sub_8095CE0:
str r2, [sp, 0x4C]
_08095D0C:
ldr r0, [sp, 0x4C]
bl RandomCapped
bl RandInt
mov r9, r0
str r0, [sp, 0x48]
mov r1, sp
@@ -270,7 +270,7 @@ _08095D1C:
asrs r0, 1
str r0, [sp, 0x54]
adds r1, r2, 0
bl RandomRange
bl RandRange
adds r4, r0, 0
str r4, [sp, 0x50]
_08095D3E:
@@ -528,7 +528,7 @@ _08095F08: .4byte gUnknown_203B490
_08095F0C: .4byte 0x00000101
_08095F10:
adds r0, r6, 0
bl RandomCapped
bl RandInt
add r0, sp
ldrb r0, [r0]
_08095F1A:
@@ -581,7 +581,7 @@ _08095F6A:
cmp r6, 0
beq _08095F80
adds r0, r6, 0
bl RandomCapped
bl RandInt
add r0, sp
ldrb r0, [r0]
b _08095F82
@@ -944,7 +944,7 @@ sub_80961D8:
bl sub_8095F8C
adds r6, r0, 0
movs r1, 0x4
bl RandomRange
bl RandRange
mov r8, r0
cmp r6, 0x3
bgt _08096202
@@ -1127,7 +1127,7 @@ _08096340:
_0809636C:
movs r0, 0x5
movs r1, 0xA
bl RandomRange
bl RandRange
strb r0, [r4, 0x11]
lsls r0, 24
lsrs r0, 24
@@ -1236,7 +1236,7 @@ _08096418:
strb r0, [r5, 0x4]
movs r0, 0x3
strb r0, [r5, 0x5]
bl Random
bl Rand32Bit
ldr r1, _08096484
ands r1, r0
str r1, [r5, 0x8]
@@ -1679,7 +1679,7 @@ sub_809674C:
push {r7}
movs r0, 0x4
movs r1, 0x8
bl RandomRange
bl RandRange
mov r8, r0
ldr r3, _08096864
movs r2, 0
@@ -1713,7 +1713,7 @@ _08096764:
strb r0, [r5, 0x4]
movs r0, 0xA
strb r0, [r5, 0x5]
bl Random
bl Rand32Bit
ldr r1, _08096868
ands r1, r0
str r1, [r5, 0x8]
@@ -1749,7 +1749,7 @@ _080967C0:
strb r0, [r5, 0x4]
movs r0, 0xF
strb r0, [r5, 0x5]
bl Random
bl Rand32Bit
ldr r1, _08096868
ands r1, r0
str r1, [r5, 0x8]
@@ -1784,7 +1784,7 @@ _0809680A:
strb r0, [r5, 0x4]
movs r0, 0x14
strb r0, [r5, 0x5]
bl Random
bl Rand32Bit
ldr r1, _08096868
ands r1, r0
str r1, [r5, 0x8]
@@ -1814,7 +1814,7 @@ _0809686C: .4byte 0x0000014d
_08096870:
movs r0, 0
movs r1, 0x4
bl RandomRange
bl RandRange
ldr r1, [r6]
adds r1, r4
adds r1, 0x61

14
asm/code_8098BDC.s
View File

@@ -3455,7 +3455,7 @@ _0809AB80:
adds r0, r4, r0
movs r2, 0x2
ldrsh r1, [r6, r2]
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
ldr r0, _0809ABAC
adds r4, r0
ldr r1, _0809ABB0
@@ -3506,7 +3506,7 @@ _0809ABE8:
movs r0, 0x2
ldrsh r1, [r6, r0]
adds r0, r5, 0
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
ldr r0, _0809AC14
adds r4, r0
adds r0, r4, 0
@@ -3555,7 +3555,7 @@ _0809AC4C:
adds r0, r4, r0
movs r2, 0x2
ldrsh r1, [r6, r2]
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
ldr r0, _0809AC78
adds r4, r0
movs r3, 0
@@ -4174,7 +4174,7 @@ _0809B0E4:
lsls r2, 4
ldr r3, _0809B13C
adds r2, r3
bl sprintf_2
bl sprintfStatic
_0809B0F6:
adds r0, r4, 0
bl sub_809AE3C
@@ -4471,7 +4471,7 @@ _0809B318:
lsls r2, 4
ldr r3, _0809B3D8
adds r2, r3
bl sprintf_2
bl sprintfStatic
_0809B32A:
ldr r0, _0809B3DC
mov r8, r0
@@ -4483,7 +4483,7 @@ _0809B32A:
ldr r1, _0809B3E0
adds r0, r4, 0
adds r2, r7, 0
bl sprintf_2
bl sprintfStatic
adds r7, r4, 0
_0809B344:
adds r0, r6, 0
@@ -7539,7 +7539,7 @@ sub_809CBBC:
adds r0, r3
ldr r3, [r0]
mov r0, sp
bl sprintf_2
bl sprintfStatic
ldr r0, _0809CC14
ldr r0, [r0]
movs r1, 0x98

8
asm/code_809D148.s
View File

@@ -192,12 +192,12 @@ _0809D3A8:
negs r4, r4
adds r0, r4, 0
movs r1, 0x2
bl OtherRandomRange
bl OtherRandRange
lsls r0, 10
str r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x2
bl OtherRandomRange
bl OtherRandRange
lsls r0, 10
b _0809D402
_0809D3D2:
@@ -212,14 +212,14 @@ _0809D3D2:
negs r4, r4
adds r0, r4, 0
movs r1, 0x2
bl OtherRandomRange
bl OtherRandRange
ldr r1, [r5, 0x28]
muls r0, r1
lsls r0, 8
str r0, [r5, 0x34]
adds r0, r4, 0
movs r1, 0x2
bl OtherRandomRange
bl OtherRandRange
ldr r1, [r5, 0x28]
muls r0, r1
lsls r0, 8

8
asm/dungeon_2.s
View File

@@ -170,7 +170,7 @@ _0809048E:
beq _0809054E
ldr r0, _080904B0
adds r1, r2, 0
bl CopyCyanSpeciesNametoBuffer
bl CopyCyanMonsterNametoBuffer
cmp r5, 0x3
ble _080904D2
mov r0, r8
@@ -197,7 +197,7 @@ _080904BA:
mov r8, r1
_080904D2:
ldr r0, [sp, 0xE0]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -222,7 +222,7 @@ _080904E4:
beq _08090510
movs r1, 0x8
ldrsh r0, [r2, r1]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r0, 24
adds r5, r0
@@ -572,7 +572,7 @@ _080907DA:
bne _0809080C
ldr r1, _08090808
adds r0, r7, 0
bl sprintf_2
bl sprintfStatic
movs r0, 0
b _0809080E
.align 2, 0

2
asm/friend_rescue.s
View File

@@ -1542,7 +1542,7 @@ _080335C0:
adds r0, r4
ldr r1, _080335F0
add r2, sp, 0x14
bl sprintf_2
bl sprintfStatic
ldr r0, [r5]
adds r0, r4
b _0803388E

6
asm/ground_lives.s
View File

@@ -1051,7 +1051,7 @@ _080A7FF4:
b _080A8094
_080A7FFC:
movs r0, 0xF
bl RandomCapped
bl RandInt
ldr r1, _080A8010
lsls r0, 1
adds r0, r1
@@ -1558,7 +1558,7 @@ _080A834A:
cmp r0, 0xF
bhi _080A83E4
movs r0, 0x12
bl OtherRandomCapped
bl OtherRandInt
movs r2, 0xA0
lsls r2, 1
adds r1, r5, r2
@@ -3103,7 +3103,7 @@ _080A8F30:
ldrsh r1, [r0, r2]
_080A8F34:
adds r0, r4, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
b _080A8F44
_080A8F3C:
ldr r1, _080A8F4C

34
asm/ground_script.s
View File

@@ -4130,12 +4130,12 @@ _0809FFBA:
add r0, sp, 0x8
movs r5, 0x2
ldrsh r0, [r0, r5]
bl OtherRandomCapped
bl OtherRandInt
lsls r0, 8
add r4, sp, 0xD4
str r0, [r4]
ldr r0, [sp, 0xC]
bl OtherRandomCapped
bl OtherRandInt
lsls r0, 8
str r0, [r4, 0x4]
mov r0, r9
@@ -4185,14 +4185,14 @@ _080A0010:
ldr r0, [r5]
ldr r1, [r4]
subs r0, r1
bl OtherRandomCapped
bl OtherRandInt
ldr r1, [r4]
adds r1, r0
str r1, [r6]
ldr r0, [r5, 0x4]
ldr r1, [r4, 0x4]
subs r0, r1
bl OtherRandomCapped
bl OtherRandInt
ldr r1, [r4, 0x4]
adds r1, r0
str r1, [r6, 0x4]
@@ -4452,7 +4452,7 @@ _080A0250:
str r0, [r5, 0x30]
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
bl OtherRandomCapped
bl OtherRandInt
b _080A05EA
_080A0282:
ldr r0, [sp, 0xC]
@@ -4584,7 +4584,7 @@ _080A0370:
ldr r2, [r2, 0xC]
bl _call_via_r2
adds r0, r4, 0
bl OtherRandomCapped
bl OtherRandInt
add r1, sp, 0x8
movs r2, 0x2
ldrsh r1, [r1, r2]
@@ -4595,7 +4595,7 @@ _080A0370:
adds r1, r0
str r1, [r3, 0x3C]
adds r0, r5, 0
bl OtherRandomCapped
bl OtherRandInt
ldr r1, [sp, 0xC]
subs r0, r1
lsls r0, 8
@@ -4705,7 +4705,7 @@ _080A0462:
adds r1, r5, 0
bl sub_80AD8B4
adds r0, r4, 0
bl OtherRandomCapped
bl OtherRandInt
add r1, sp, 0x8
movs r3, 0x2
ldrsh r1, [r1, r3]
@@ -4716,7 +4716,7 @@ _080A0462:
adds r1, r0
str r1, [r5, 0x3C]
adds r0, r4, 0
bl OtherRandomCapped
bl OtherRandInt
add r1, sp, 0x8
movs r2, 0x2
ldrsh r1, [r1, r2]
@@ -5987,7 +5987,7 @@ _080A0EFA:
add r0, sp, 0x8
movs r3, 0x2
ldrsh r0, [r0, r3]
bl OtherRandomCapped
bl OtherRandInt
adds r1, r0, 0
b _080A1098
_080A0F08:
@@ -6459,7 +6459,7 @@ _080A12B4:
ldrsh r1, [r0, r3]
ldr r0, [sp, 0xC]
subs r0, r1
bl OtherRandomCapped
bl OtherRandInt
add r1, sp, 0x8
ldrh r1, [r1, 0x2]
adds r1, r0
@@ -6853,7 +6853,7 @@ _080A164C:
negs r1, r1
cmp r0, r1
bne _080A1660
bl Random
bl Rand32Bit
bl sub_8011C40
_080A1660:
movs r0, 0x1
@@ -7092,7 +7092,7 @@ _080A184C:
bl sub_80A8BFC
lsls r0, 16
asrs r0, 16
bl GetIsMoving
bl CanMove
b _080A171E
_080A185E:
lsls r0, r5, 16
@@ -7593,12 +7593,12 @@ _080A1C80: .4byte gUnknown_81167E4
_080A1C84:
movs r0, 0xD1
lsls r0, 1
bl RandomCapped
bl RandInt
adds r0, 0x1
lsls r0, 16
asrs r5, r0, 16
movs r0, 0x20
bl RandomCapped
bl RandInt
adds r4, r0, 0
movs r7, 0xD2
lsls r7, 1
@@ -7623,7 +7623,7 @@ _080A1CBC:
cmp r4, r6
blt _080A1CCC
adds r0, r6, 0
bl RandomCapped
bl RandInt
adds r4, r0, 0
movs r7, 0xD2
lsls r7, 1
@@ -7972,7 +7972,7 @@ _080A1FA2:
_080A1FB2:
movs r0, 0x80
lsls r0, 1
bl OtherRandomCapped
bl OtherRandInt
cmp r0, 0
bne _080A1FCC
movs r0, 0

2
asm/ground_sprite.s
View File

@@ -2344,7 +2344,7 @@ sub_80A7428:
movs r1, 0
bl GetFileDataPtr
adds r0, r4, 0
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r0, 24
ldr r1, _080A7488

2
asm/moves_1.s
View File

@@ -2522,7 +2522,7 @@ sub_8093E90:
adds r3, r5, 0
bl xxx_format_and_draw
adds r0, r6, 0
bl GetMovePower
bl GetMoveBasePower
ldr r1, _08093F0C
str r0, [r1]
add sp, 0x4

28
asm/pokemon.s
View File

@@ -45,22 +45,22 @@ _0808CEA4:
strh r0, [r1, 0x16]
adds r0, r7, 0
movs r1, 0
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
mov r1, sp
strb r0, [r1, 0x18]
adds r0, r7, 0
movs r1, 0x1
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
mov r1, sp
strb r0, [r1, 0x19]
adds r0, r7, 0
movs r1, 0
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
mov r1, sp
strb r0, [r1, 0x1A]
adds r0, r7, 0
movs r1, 0x1
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
mov r1, sp
strb r0, [r1, 0x1B]
mov r0, sp
@@ -90,7 +90,7 @@ _0808CEA4:
add r4, sp, 0x58
adds r0, r4, 0
adds r1, r7, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
add r0, sp, 0x4C
adds r1, r4, 0
movs r2, 0xA
@@ -207,19 +207,19 @@ sub_808CFD0:
strh r0, [r7, 0x16]
mov r0, r9
movs r1, 0
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
strb r0, [r7, 0x18]
mov r0, r9
movs r1, 0x1
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
strb r0, [r7, 0x19]
mov r0, r9
movs r1, 0
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
strb r0, [r7, 0x1A]
mov r0, r9
movs r1, 0x1
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
strb r0, [r7, 0x1B]
mov r1, r9
strh r1, [r7, 0x8]
@@ -282,7 +282,7 @@ _0808D09A:
bne _0808D0B4
mov r0, sp
mov r1, r9
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
mov r0, r8
mov r1, sp
movs r2, 0xA
@@ -326,22 +326,22 @@ sub_808D0D8:
movs r2, 0x8
ldrsh r0, [r7, r2]
movs r1, 0
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
strb r0, [r7, 0x18]
movs r1, 0x8
ldrsh r0, [r7, r1]
movs r1, 0x1
bl GetPokemonAttSpatt
bl GetBaseOffensiveStat
strb r0, [r7, 0x19]
movs r2, 0x8
ldrsh r0, [r7, r2]
movs r1, 0
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
strb r0, [r7, 0x1A]
movs r1, 0x8
ldrsh r0, [r7, r1]
movs r1, 0x1
bl GetPokemonDefSpdef
bl GetBaseDefensiveStat
strb r0, [r7, 0x1B]
str r6, [r7, 0x1C]
adds r0, r7, 0

4
asm/pokemon_3.s
View File

@@ -1195,7 +1195,7 @@ _0808FDB0:
movs r3, 0
ldrsh r1, [r2, r3]
adds r0, r6, 0
bl CopySpeciesNametoBuffer
bl CopyMonsterNametoBuffer
ldr r1, _0808FEF4
mov r2, r10
movs r3, 0
@@ -1283,7 +1283,7 @@ _0808FDB0:
mov r3, r10
movs r1, 0
ldrsh r0, [r3, r1]
bl GetPokemonSize
bl GetBodySize
lsls r0, 24
lsrs r0, 22
adds r0, r4

2
asm/sprite.s
View File

@@ -1052,7 +1052,7 @@ _08005524:
_08005542:
ldr r0, [r4, 0x28]
str r0, [r4, 0x2C]
bl Random
bl Rand32Bit
movs r1, 0x1
ands r0, r1
strh r0, [r4, 0x4]

2
asm/wonder_mail_5.s
View File

@@ -114,7 +114,7 @@ _08030EE8:
ldr r1, _08030F54
adds r0, r6, 0
adds r2, r4, 0
bl sprintf_2
bl sprintfStatic
ldr r0, [r5]
ldr r3, [r0, 0x10]
mov r0, r8

160
data/data_80F59C8.s
View File

@@ -284,122 +284,122 @@ gUnknown_80F6624: @ 80F6624
.global gStatusSpriteMasks_SleepStatus
gStatusSpriteMasks_SleepStatus: @ 80F669C
.4byte 0 @ SLEEP_STATUS_NONE
.4byte STATUS_SPRITE_SLEEP @ SLEEP_STATUS_SLEEP
.4byte STATUS_SPRITE_SLEEPLESS @ SLEEP_STATUS_SLEEPLESS
.4byte STATUS_SPRITE_SLEEP @ SLEEP_STATUS_NIGHTMARE
.4byte 0 @ SLEEP_STATUS_YAWNING
.4byte STATUS_SPRITE_SLEEP @ SLEEP_STATUS_NAPPING
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_SLEEP @ STATUS_SLEEP
.4byte STATUS_SPRITE_SLEEPLESS @ STATUS_SLEEPLESS
.4byte STATUS_SPRITE_SLEEP @ STATUS_NIGHTMARE
.4byte 0 @ STATUS_YAWNING
.4byte STATUS_SPRITE_SLEEP @ STATUS_NAPPING
.global gStatusSpriteMasks_NonVolatileStatus
gStatusSpriteMasks_NonVolatileStatus: @ 80F66B4
.4byte 0 @ NON_VOLATILE_STATUS_NONE
.4byte STATUS_SPRITE_BURNED @ NON_VOLATILE_STATUS_BURNED
.4byte STATUS_SPRITE_POISONED @ NON_VOLATILE_STATUS_POISONED
.4byte STATUS_SPRITE_BADLY_POISONED @ NON_VOLATILE_STATUS_BADLY_POISONED
.4byte 0 @ NON_VOLATILE_STATUS_PARALYZED
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_BURNED @ STATUS_BURN
.4byte STATUS_SPRITE_POISONED @ STATUS_POISONED
.4byte STATUS_SPRITE_BADLY_POISONED @ STATUS_BADLY_POISONED
.4byte 0 @ STATUS_PARALYSIS
.global gStatusSpriteMasks_ImmobilizeStatus
gStatusSpriteMasks_ImmobilizeStatus: @ 80F66C8
.4byte 0 @ IMMOBILIZE_STATUS_NONE
.4byte STATUS_SPRITE_FROZEN @ IMMOBILIZE_STATUS_FROZEN
.4byte 0 @ IMMOBILIZE_STATUS_IMMOBILIZED
.4byte 0 @ IMMOBILIZE_STATUS_WRAPPED_AROUND_FOE
.4byte 0 @ IMMOBILIZE_STATUS_WRAPPED_BY_FOE
.4byte 0 @ IMMOBILIZE_STATUS_INGRAIN
.4byte 0 @ IMMOBILIZE_STATUS_PETRIFIED
.4byte 0 @ IMMOBILIZE_STATUS_SQUEEZED
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_FROZEN @ STATUS_FROZEN
.4byte 0 @ STATUS_SHADOW_HOLD
.4byte 0 @ STATUS_WRAP
.4byte 0 @ STATUS_WRAPPED
.4byte 0 @ STATUS_INGRAIN
.4byte 0 @ STATUS_PETRIFIED
.4byte 0 @ STATUS_CONSTRICTION
.global gStatusSpriteMasks_VolatileStatus
gStatusSpriteMasks_VolatileStatus: @ 80F66E8
.4byte 0 @ VOLATILE_STATUS_NONE
.4byte 0 @ VOLATILE_STATUS_CRINGING
.4byte STATUS_SPRITE_CONFUSED @ VOLATILE_STATUS_CONFUSED
.4byte 0 @ VOLATILE_STATUS_PAUSED
.4byte STATUS_SPRITE_COWERING @ VOLATILE_STATUS_COWERING
.4byte STATUS_SPRITE_TAUNTED @ VOLATILE_STATUS_TAUNTED
.4byte STATUS_SPRITE_ENCORE @ VOLATILE_STATUS_ENCORE
.4byte 0 @ VOLATILE_STATUS_INFATUATED
.4byte 0 @ STATUS_NONE
.4byte 0 @ STATUS_CRINGE
.4byte STATUS_SPRITE_CONFUSED @ STATUS_CONFUSED
.4byte 0 @ STATUS_PAUSED
.4byte STATUS_SPRITE_COWERING @ STATUS_COWERING
.4byte STATUS_SPRITE_TAUNTED @ STATUS_TAUNTED
.4byte STATUS_SPRITE_ENCORE @ STATUS_ENCORE
.4byte 0 @ STATUS_INFATUATED
.global gStatusSpriteMasks_ChargingStatus
gStatusSpriteMasks_ChargingStatus: @ 80F6708
.4byte 0 @ CHARGING_STATUS_NONE
.4byte 0 @ CHARGING_STATUS_BIDE
.4byte 0 @ CHARGING_STATUS_SOLARBEAM
.4byte 0 @ CHARGING_STATUS_SKY_ATTACK
.4byte 0 @ CHARGING_STATUS_RAZOR_WIND
.4byte 0 @ CHARGING_STATUS_FOCUS_PUNCH
.4byte 0 @ CHARGING_STATUS_SKULL_BASH
.4byte 0 @ CHARGING_STATUS_FLY
.4byte 0 @ CHARGING_STATUS_BOUNCE
.4byte 0 @ CHARGING_STATUS_DIVE
.4byte 0 @ CHARGING_STATUS_DIG
.4byte 0 @ CHARGING_STATUS_CHARGE
.4byte 0 @ CHARGING_STATUS_RAGE
.4byte 0 @ STATUS_NONE
.4byte 0 @ STATUS_BIDE
.4byte 0 @ STATUS_SOLARBEAM
.4byte 0 @ STATUS_SKY_ATTACK
.4byte 0 @ STATUS_RAZOR_WIND
.4byte 0 @ STATUS_FOCUS_PUNCH
.4byte 0 @ STATUS_SKULL_BASH
.4byte 0 @ STATUS_FLYING
.4byte 0 @ STATUS_BOUNCING
.4byte 0 @ STATUS_DIVING
.4byte 0 @ STATUS_DIGGING
.4byte 0 @ STATUS_CHARGING
.4byte 0 @ STATUS_ENRAGED
.global gStatusSpriteMasks_ProtectionStatus
gStatusSpriteMasks_ProtectionStatus: @ 80F673C
.4byte 0 @ PROTECTION_STATUS_NONE
.4byte STATUS_SPRITE_SHIELD_BLUE @ PROTECTION_STATUS_REFLECT
.4byte STATUS_SPRITE_SHIELD_RED @ PROTECTION_STATUS_SAFEGUARD
.4byte STATUS_SPRITE_SHIELD_YELLOW @ PROTECTION_STATUS_LIGHT_SCREEN
.4byte STATUS_SPRITE_SHIELD_BLUE @ PROTECTION_STATUS_COUNTER
.4byte STATUS_SPRITE_SHIELD_YELLOW @ PROTECTION_STATUS_MAGIC_COAT
.4byte 0 @ PROTECTION_STATUS_WISH
.4byte STATUS_SPRITE_SHIELD_GREEN @ PROTECTION_STATUS_PROTECT
.4byte STATUS_SPRITE_SHIELD_RED @ PROTECTION_STATUS_MIRROR_COAT
.4byte STATUS_SPRITE_ENDURE @ PROTECTION_STATUS_ENDURE
.4byte STATUS_SPRITE_SHIELD_BLUE @ PROTECTION_STATUS_MINI_COUNTER
.4byte STATUS_SPRITE_SHIELD_GREEN @ PROTECTION_STATUS_MIRROR_MOVE
.4byte 0 @ PROTECTION_STATUS_CONVERSION_2
.4byte STATUS_SPRITE_SHIELD_GREEN @ PROTECTION_STATUS_VITAL_THROW
.4byte STATUS_SPRITE_SHIELD_BLUE @ PROTECTION_STATUS_MIST
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_SHIELD_BLUE @ STATUS_REFLECT
.4byte STATUS_SPRITE_SHIELD_RED @ STATUS_SAFEGUARD
.4byte STATUS_SPRITE_SHIELD_YELLOW @ STATUS_LIGHT_SCREEN
.4byte STATUS_SPRITE_SHIELD_BLUE @ STATUS_COUNTER
.4byte STATUS_SPRITE_SHIELD_YELLOW @ STATUS_MAGIC_COAT
.4byte 0 @ STATUS_WISH
.4byte STATUS_SPRITE_SHIELD_GREEN @ STATUS_PROTECT
.4byte STATUS_SPRITE_SHIELD_RED @ STATUS_MIRROR_COAT
.4byte STATUS_SPRITE_ENDURE @ STATUS_ENDURING
.4byte STATUS_SPRITE_SHIELD_BLUE @ STATUS_MINI_COUNTER
.4byte STATUS_SPRITE_SHIELD_GREEN @ STATUS_MIRROR_MOVE
.4byte 0 @ STATUS_CONVERSION2
.4byte STATUS_SPRITE_SHIELD_GREEN @ STATUS_VITAL_THROW
.4byte STATUS_SPRITE_SHIELD_BLUE @ STATUS_MIST
.global gStatusSpriteMasks_WaitingStatus
gStatusSpriteMasks_WaitingStatus: @ 80F6778
.4byte 0 @ WAITING_STATUS_NONE
.4byte STATUS_SPRITE_CURSED @ WAITING_STATUS_CURSED
.4byte 0 @ WAITING_STATUS_DECOY
.4byte STATUS_SPRITE_SNATCH @ WAITING_STATUS_SNATCH
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_CURSED @ STATUS_CURSED
.4byte 0 @ STATUS_DECOY
.4byte STATUS_SPRITE_SNATCH @ STATUS_SNATCH
.global gStatusSpriteMasks_LinkedStatus
gStatusSpriteMasks_LinkedStatus: @ 80F6788
.4byte 0 @ LINKED_STATUS_NONE
.4byte 0 @ LINKED_STATUS_LEECH_SEED
.4byte 0 @ LINKED_STATUS_DESTINY_BOND
.4byte 0 @ STATUS_NONE
.4byte 0 @ STATUS_LEECH_SEED
.4byte 0 @ STATUS_DESTINY_BOND
.global gStatusSpriteMasks_MoveStatus
gStatusSpriteMasks_MoveStatus: @ 80F6794
.4byte 0 @ MOVE_STATUS_NONE
.4byte STATUS_SPRITE_SURE_SHOT @ MOVE_STATUS_SURE_SHOT
.4byte STATUS_SPRITE_WHIFFER @ MOVE_STATUS_WHIFFER
.4byte STATUS_SPRITE_SET_DAMAGE @ MOVE_STATUS_SET_DAMAGE
.4byte STATUS_SPRITE_FOCUS_ENERGY @ MOVE_STATUS_FOCUS_ENERGY
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_SURE_SHOT @ STATUS_SURE_SHOT
.4byte STATUS_SPRITE_WHIFFER @ STATUS_WHIFFER
.4byte STATUS_SPRITE_SET_DAMAGE @ STATUS_SET_DAMAGE
.4byte STATUS_SPRITE_FOCUS_ENERGY @ STATUS_FOCUS_ENERGY
.global gStatusSpriteMasks_ItemStatus
gStatusSpriteMasks_ItemStatus: @ 80F67A8
.4byte 0 @ ITEM_STATUS_NONE
.4byte 0 @ ITEM_STATUS_LONG_TOSS
.4byte 0 @ ITEM_STATUS_PIERCE
.4byte 0 @ STATUS_NONE
.4byte 0 @ STATUS_LONG_TOSS
.4byte 0 @ STATUS_PIERCE
.global gStatusSpriteMasks_TransformStatus
gStatusSpriteMasks_TransformStatus: @ 80F67B4
.4byte 0 @ TRANSFORM_STATUS_NONE
.4byte 0 @ TRANSFORM_STATUS_INVISIBLE
.4byte 0 @ TRANSFORM_STATUS_TRANSFORMED
.4byte 0 @ TRANSFORM_STATUS_MOBILE
.4byte 0 @ STATUS_NONE
.4byte 0 @ STATUS_INVISIBLE
.4byte 0 @ STATUS_TRANSFORMED
.4byte 0 @ STATUS_MOBILE
.global gStatusSpriteMasks_EyesightStatus
gStatusSpriteMasks_EyesightStatus: @ 80F67C4
.4byte 0 @ EYESIGHT_STATUS_NONE
.4byte STATUS_SPRITE_BLINKER @ EYESIGHT_STATUS_BLINKER
.4byte STATUS_SPRITE_CROSS_EYED @ EYESIGHT_STATUS_CROSS_EYED
.4byte STATUS_SPRITE_EYEDROPS @ EYESIGHT_STATUS_EYEDROPS
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_BLINKER @ STATUS_BLINKER
.4byte STATUS_SPRITE_CROSS_EYED @ STATUS_CROSS_EYED
.4byte STATUS_SPRITE_EYEDROPS @ STATUS_EYEDROPS
.global gStatusSpriteMasks_MuzzledStatus
gStatusSpriteMasks_MuzzledStatus: @ 80F67D4
.4byte 0 @ MUZZLED_STATUS_NONE
.4byte STATUS_SPRITE_MUZZLED @ MUZZLED_STATUS_MUZZLED
.4byte 0 @ STATUS_NONE
.4byte STATUS_SPRITE_MUZZLED @ STATUS_MUZZLED
.global gUnknown_80F67DC
gUnknown_80F67DC: @ 80F67DC

8
data/dungeon/Boss3/pokemon_found.json
View File

@@ -4,22 +4,22 @@
"name": "pokemon_found_out206",
"pokemon": [
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 10,
"probability": 7273
},
{
"species": "SPECIES_CASTFORM",
"species": "MONSTER_CASTFORM",
"level": 10,
"probability": 2727
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

106
data/dungeon/Boss4/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out207",
"pokemon": [
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 2000
},
{
"species": "SPECIES_NIDORAN_F",
"species": "MONSTER_NIDORAN_F",
"level": 4,
"probability": 2000
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -44,42 +44,42 @@
"name": "pokemon_found_out208",
"pokemon": [
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 1667
},
{
"species": "SPECIES_NIDORAN_F",
"species": "MONSTER_NIDORAN_F",
"level": 4,
"probability": 1666
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 1667
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 10,
"probability": 1667
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 1666
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -89,37 +89,37 @@
"name": "pokemon_found_out209",
"pokemon": [
{
"species": "SPECIES_PIDGEOTTO",
"species": "MONSTER_PIDGEOTTO",
"level": 11,
"probability": 2000
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 2000
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -129,42 +129,42 @@
"name": "pokemon_found_out210",
"pokemon": [
{
"species": "SPECIES_PIDGEOTTO",
"species": "MONSTER_PIDGEOTTO",
"level": 11,
"probability": 1667
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 1666
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 1667
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 1667
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 12,
"probability": 1666
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 10,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -174,37 +174,37 @@
"name": "pokemon_found_out211",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 2000
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 2000
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -214,37 +214,37 @@
"name": "pokemon_found_out212",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 1905
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 1905
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 1904
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 12,
"probability": 1905
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 10,
"probability": 2381
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -254,32 +254,32 @@
"name": "pokemon_found_out213",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 2353
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 2353
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2353
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 10,
"probability": 2941
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -289,17 +289,17 @@
"name": "pokemon_found_out214",
"pokemon": [
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

6
data/dungeon/Boss9/pokemon_found.json
View File

@@ -4,17 +4,17 @@
"name": "pokemon_found_out339",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 10000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

510
data/dungeon/BuriedRelic/pokemon_found.json
View File

File diff suppressed because it is too large Load Diff

296
data/dungeon/D51/pokemon_found.json
View File

@@ -4,47 +4,47 @@
"name": "pokemon_found_out526",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"species": "MONSTER_WEEDLE",
"level": 8,
"probability": 1429
},
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 1428
},
{
"species": "SPECIES_RATTATA",
"species": "MONSTER_RATTATA",
"level": 3,
"probability": 1429
},
{
"species": "SPECIES_NIDORAN_F",
"species": "MONSTER_NIDORAN_F",
"level": 4,
"probability": 1428
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 1429
},
{
"species": "SPECIES_CLEFAIRY",
"species": "MONSTER_CLEFAIRY",
"level": 8,
"probability": 1428
},
{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -54,37 +54,37 @@
"name": "pokemon_found_out527",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"species": "MONSTER_ODDISH",
"level": 7,
"probability": 2000
},
{
"species": "SPECIES_PARAS",
"species": "MONSTER_PARAS",
"level": 11,
"probability": 2000
},
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_PONYTA",
"species": "MONSTER_PONYTA",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -94,57 +94,57 @@
"name": "pokemon_found_out528",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"species": "MONSTER_ODDISH",
"level": 7,
"probability": 1111
},
{
"species": "SPECIES_PARAS",
"species": "MONSTER_PARAS",
"level": 11,
"probability": 1111
},
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 10,
"probability": 1111
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 1111
},
{
"species": "SPECIES_PONYTA",
"species": "MONSTER_PONYTA",
"level": 30,
"probability": 1112
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 14,
"probability": 1111
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 1111
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 1111
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 1111
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,42 +154,42 @@
"name": "pokemon_found_out529",
"pokemon": [
{
"species": "SPECIES_GASTLY",
"species": "MONSTER_GASTLY",
"level": 15,
"probability": 1667
},
{
"species": "SPECIES_HYPNO",
"species": "MONSTER_HYPNO",
"level": 15,
"probability": 1666
},
{
"species": "SPECIES_VOLTORB",
"species": "MONSTER_VOLTORB",
"level": 3,
"probability": 1667
},
{
"species": "SPECIES_EXEGGCUTE",
"species": "MONSTER_EXEGGCUTE",
"level": 1,
"probability": 1667
},
{
"species": "SPECIES_HITMONLEE",
"species": "MONSTER_HITMONLEE",
"level": 22,
"probability": 1666
},
{
"species": "SPECIES_LICKITUNG",
"species": "MONSTER_LICKITUNG",
"level": 36,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -199,47 +199,47 @@
"name": "pokemon_found_out530",
"pokemon": [
{
"species": "SPECIES_TANGELA",
"species": "MONSTER_TANGELA",
"level": 14,
"probability": 1429
},
{
"species": "SPECIES_MR_MIME",
"species": "MONSTER_MR_MIME",
"level": 15,
"probability": 1428
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 1429
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 21,
"probability": 1428
},
{
"species": "SPECIES_PINSIR",
"species": "MONSTER_PINSIR",
"level": 6,
"probability": 1429
},
{
"species": "SPECIES_SENTRET",
"species": "MONSTER_SENTRET",
"level": 6,
"probability": 1428
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 7,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -249,52 +249,52 @@
"name": "pokemon_found_out531",
"pokemon": [
{
"species": "SPECIES_FLAAFFY",
"species": "MONSTER_FLAAFFY",
"level": 30,
"probability": 1250
},
{
"species": "SPECIES_MARILL",
"species": "MONSTER_MARILL",
"level": 8,
"probability": 1250
},
{
"species": "SPECIES_HOPPIP",
"species": "MONSTER_HOPPIP",
"level": 8,
"probability": 1250
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 13,
"probability": 1250
},
{
"species": "SPECIES_AIPOM",
"species": "MONSTER_AIPOM",
"level": 15,
"probability": 1250
},
{
"species": "SPECIES_WOOPER",
"species": "MONSTER_WOOPER",
"level": 32,
"probability": 1250
},
{
"species": "SPECIES_MURKROW",
"species": "MONSTER_MURKROW",
"level": 14,
"probability": 1250
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -304,37 +304,37 @@
"name": "pokemon_found_out532",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"species": "MONSTER_ODDISH",
"level": 7,
"probability": 2000
},
{
"species": "SPECIES_PARAS",
"species": "MONSTER_PARAS",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_PONYTA",
"species": "MONSTER_PONYTA",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -344,57 +344,57 @@
"name": "pokemon_found_out533",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"species": "MONSTER_ODDISH",
"level": 7,
"probability": 1111
},
{
"species": "SPECIES_PARAS",
"species": "MONSTER_PARAS",
"level": 25,
"probability": 1111
},
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 10,
"probability": 1111
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 1111
},
{
"species": "SPECIES_PONYTA",
"species": "MONSTER_PONYTA",
"level": 30,
"probability": 1112
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 14,
"probability": 1111
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 1111
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 1111
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 1111
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -404,42 +404,42 @@
"name": "pokemon_found_out534",
"pokemon": [
{
"species": "SPECIES_PINECO",
"species": "MONSTER_PINECO",
"level": 18,
"probability": 1667
},
{
"species": "SPECIES_DUNSPARCE",
"species": "MONSTER_DUNSPARCE",
"level": 13,
"probability": 1666
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 1667
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1667
},
{
"species": "SPECIES_HERACROSS",
"species": "MONSTER_HERACROSS",
"level": 14,
"probability": 1666
},
{
"species": "SPECIES_TEDDIURSA",
"species": "MONSTER_TEDDIURSA",
"level": 10,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -449,47 +449,47 @@
"name": "pokemon_found_out535",
"pokemon": [
{
"species": "SPECIES_SWINUB",
"species": "MONSTER_SWINUB",
"level": 8,
"probability": 1429
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 1428
},
{
"species": "SPECIES_PHANPY",
"species": "MONSTER_PHANPY",
"level": 14,
"probability": 1429
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 12,
"probability": 1428
},
{
"species": "SPECIES_TYROGUE",
"species": "MONSTER_TYROGUE",
"level": 6,
"probability": 1429
},
{
"species": "SPECIES_SMOOCHUM",
"species": "MONSTER_SMOOCHUM",
"level": 15,
"probability": 1428
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 4,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -499,47 +499,47 @@
"name": "pokemon_found_out536",
"pokemon": [
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 1429
},
{
"species": "SPECIES_LARVITAR",
"species": "MONSTER_LARVITAR",
"level": 28,
"probability": 1428
},
{
"species": "SPECIES_POOCHYENA",
"species": "MONSTER_POOCHYENA",
"level": 3,
"probability": 1429
},
{
"species": "SPECIES_WURMPLE",
"species": "MONSTER_WURMPLE",
"level": 1,
"probability": 1428
},
{
"species": "SPECIES_CASCOON",
"species": "MONSTER_CASCOON",
"level": 8,
"probability": 1429
},
{
"species": "SPECIES_SEEDOT",
"species": "MONSTER_SEEDOT",
"level": 16,
"probability": 1428
},
{
"species": "SPECIES_TAILLOW",
"species": "MONSTER_TAILLOW",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -549,52 +549,52 @@
"name": "pokemon_found_out537",
"pokemon": [
{
"species": "SPECIES_SURSKIT",
"species": "MONSTER_SURSKIT",
"level": 24,
"probability": 1250
},
{
"species": "SPECIES_SHROOMISH",
"species": "MONSTER_SHROOMISH",
"level": 9,
"probability": 1250
},
{
"species": "SPECIES_SLAKOTH",
"species": "MONSTER_SLAKOTH",
"level": 8,
"probability": 1250
},
{
"species": "SPECIES_NINCADA",
"species": "MONSTER_NINCADA",
"level": 14,
"probability": 1250
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 1,
"probability": 1250
},
{
"species": "SPECIES_MAKUHITA",
"species": "MONSTER_MAKUHITA",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 27,
"probability": 1250
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 16,
"probability": 1250
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -604,37 +604,37 @@
"name": "pokemon_found_out538",
"pokemon": [
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 2000
},
{
"species": "SPECIES_MEDITITE",
"species": "MONSTER_MEDITITE",
"level": 6,
"probability": 2000
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -644,37 +644,37 @@
"name": "pokemon_found_out539",
"pokemon": [
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 3,
"probability": 2000
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 3,
"probability": 2000
},
{
"species": "SPECIES_VOLBEAT",
"species": "MONSTER_VOLBEAT",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_ILLIMISE",
"species": "MONSTER_ILLIMISE",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -684,52 +684,52 @@
"name": "pokemon_found_out540",
"pokemon": [
{
"species": "SPECIES_ROSELIA",
"species": "MONSTER_ROSELIA",
"level": 16,
"probability": 1250
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 1250
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 1250
},
{
"species": "SPECIES_SPOINK",
"species": "MONSTER_SPOINK",
"level": 20,
"probability": 1250
},
{
"species": "SPECIES_SPINDA",
"species": "MONSTER_SPINDA",
"level": 2,
"probability": 1250
},
{
"species": "SPECIES_TRAPINCH",
"species": "MONSTER_TRAPINCH",
"level": 11,
"probability": 1250
},
{
"species": "SPECIES_CACNEA",
"species": "MONSTER_CACNEA",
"level": 13,
"probability": 1250
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 18,
"probability": 1250
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -739,42 +739,42 @@
"name": "pokemon_found_out541",
"pokemon": [
{
"species": "SPECIES_ZANGOOSE",
"species": "MONSTER_ZANGOOSE",
"level": 18,
"probability": 1667
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 19,
"probability": 1666
},
{
"species": "SPECIES_LUNATONE",
"species": "MONSTER_LUNATONE",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_SOLROCK",
"species": "MONSTER_SOLROCK",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_BALTOY",
"species": "MONSTER_BALTOY",
"level": 5,
"probability": 1666
},
{
"species": "SPECIES_CLAYDOL",
"species": "MONSTER_CLAYDOL",
"level": 26,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -784,42 +784,42 @@
"name": "pokemon_found_out542",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 1667
},
{
"species": "SPECIES_BANETTE",
"species": "MONSTER_BANETTE",
"level": 30,
"probability": 1666
},
{
"species": "SPECIES_DUSKULL",
"species": "MONSTER_DUSKULL",
"level": 27,
"probability": 1667
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_CHIMECHO",
"species": "MONSTER_CHIMECHO",
"level": 22,
"probability": 1666
},
{
"species": "SPECIES_ABSOL",
"species": "MONSTER_ABSOL",
"level": 45,
"probability": 1667
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

310
data/dungeon/D61/pokemon_found.json
View File

@@ -4,47 +4,47 @@
"name": "pokemon_found_out727",
"pokemon": [
{
"species": "SPECIES_JYNX",
"species": "MONSTER_JYNX",
"level": 32,
"probability": 1702
},
{
"species": "SPECIES_CLEFFA",
"species": "MONSTER_CLEFFA",
"level": 1,
"probability": 851
},
{
"species": "SPECIES_MARILL",
"species": "MONSTER_MARILL",
"level": 8,
"probability": 638
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 1,
"probability": 1703
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 27,
"probability": 1702
},
{
"species": "SPECIES_ROSELIA",
"species": "MONSTER_ROSELIA",
"level": 16,
"probability": 1702
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_WYNAUT",
"species": "MONSTER_WYNAUT",
"level": 1,
"probability": 1702
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -54,42 +54,42 @@
"name": "pokemon_found_out728",
"pokemon": [
{
"species": "SPECIES_JYNX",
"species": "MONSTER_JYNX",
"level": 32,
"probability": 2051
},
{
"species": "SPECIES_CLEFFA",
"species": "MONSTER_CLEFFA",
"level": 1,
"probability": 1026
},
{
"species": "SPECIES_MARILL",
"species": "MONSTER_MARILL",
"level": 8,
"probability": 769
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 1,
"probability": 2051
},
{
"species": "SPECIES_ROSELIA",
"species": "MONSTER_ROSELIA",
"level": 16,
"probability": 2052
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_WYNAUT",
"species": "MONSTER_WYNAUT",
"level": 1,
"probability": 2051
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -99,47 +99,47 @@
"name": "pokemon_found_out729",
"pokemon": [
{
"species": "SPECIES_HITMONLEE",
"species": "MONSTER_HITMONLEE",
"level": 22,
"probability": 1702
},
{
"species": "SPECIES_HITMONCHAN",
"species": "MONSTER_HITMONCHAN",
"level": 22,
"probability": 1702
},
{
"species": "SPECIES_CLEFFA",
"species": "MONSTER_CLEFFA",
"level": 1,
"probability": 851
},
{
"species": "SPECIES_MARILL",
"species": "MONSTER_MARILL",
"level": 8,
"probability": 639
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 1702
},
{
"species": "SPECIES_PELIPPER",
"species": "MONSTER_PELIPPER",
"level": 23,
"probability": 1702
},
{
"species": "SPECIES_MAKUHITA",
"species": "MONSTER_MAKUHITA",
"level": 25,
"probability": 1702
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,37 +149,37 @@
"name": "pokemon_found_out730",
"pokemon": [
{
"species": "SPECIES_HITMONLEE",
"species": "MONSTER_HITMONLEE",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_HITMONCHAN",
"species": "MONSTER_HITMONCHAN",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 2000
},
{
"species": "SPECIES_PELIPPER",
"species": "MONSTER_PELIPPER",
"level": 23,
"probability": 2000
},
{
"species": "SPECIES_MAKUHITA",
"species": "MONSTER_MAKUHITA",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -189,47 +189,47 @@
"name": "pokemon_found_out731",
"pokemon": [
{
"species": "SPECIES_HITMONLEE",
"species": "MONSTER_HITMONLEE",
"level": 22,
"probability": 1538
},
{
"species": "SPECIES_HITMONCHAN",
"species": "MONSTER_HITMONCHAN",
"level": 22,
"probability": 1539
},
{
"species": "SPECIES_MR_MIME",
"species": "MONSTER_MR_MIME",
"level": 15,
"probability": 1154
},
{
"species": "SPECIES_NATU",
"species": "MONSTER_NATU",
"level": 8,
"probability": 1154
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 1538
},
{
"species": "SPECIES_PELIPPER",
"species": "MONSTER_PELIPPER",
"level": 23,
"probability": 1539
},
{
"species": "SPECIES_MAKUHITA",
"species": "MONSTER_MAKUHITA",
"level": 25,
"probability": 1538
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -239,37 +239,37 @@
"name": "pokemon_found_out732",
"pokemon": [
{
"species": "SPECIES_MR_MIME",
"species": "MONSTER_MR_MIME",
"level": 15,
"probability": 1667
},
{
"species": "SPECIES_NATU",
"species": "MONSTER_NATU",
"level": 8,
"probability": 1666
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 2223
},
{
"species": "SPECIES_SHIFTRY",
"species": "MONSTER_SHIFTRY",
"level": 20,
"probability": 2222
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 2222
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -279,47 +279,47 @@
"name": "pokemon_found_out733",
"pokemon": [
{
"species": "SPECIES_MR_MIME",
"species": "MONSTER_MR_MIME",
"level": 15,
"probability": 1429
},
{
"species": "SPECIES_NATU",
"species": "MONSTER_NATU",
"level": 8,
"probability": 1428
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 1191
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 238
},
{
"species": "SPECIES_SHIFTRY",
"species": "MONSTER_SHIFTRY",
"level": 20,
"probability": 1904
},
{
"species": "SPECIES_RALTS",
"species": "MONSTER_RALTS",
"level": 8,
"probability": 1905
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 20,
"probability": 1905
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -329,42 +329,42 @@
"name": "pokemon_found_out734",
"pokemon": [
{
"species": "SPECIES_MR_MIME",
"species": "MONSTER_MR_MIME",
"level": 15,
"probability": 1765
},
{
"species": "SPECIES_NATU",
"species": "MONSTER_NATU",
"level": 8,
"probability": 1764
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 1471
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 294
},
{
"species": "SPECIES_RALTS",
"species": "MONSTER_RALTS",
"level": 8,
"probability": 2353
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 20,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -374,37 +374,37 @@
"name": "pokemon_found_out735",
"pokemon": [
{
"species": "SPECIES_NATU",
"species": "MONSTER_NATU",
"level": 8,
"probability": 2143
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 1786
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 357
},
{
"species": "SPECIES_RALTS",
"species": "MONSTER_RALTS",
"level": 8,
"probability": 2857
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 20,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -414,32 +414,32 @@
"name": "pokemon_found_out736",
"pokemon": [
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 2273
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 454
},
{
"species": "SPECIES_RALTS",
"species": "MONSTER_RALTS",
"level": 8,
"probability": 3637
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 20,
"probability": 3636
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -449,32 +449,32 @@
"name": "pokemon_found_out737",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 3200
},
{
"species": "SPECIES_IGGLYBUFF",
"species": "MONSTER_IGGLYBUFF",
"level": 15,
"probability": 1600
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 2000
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -484,37 +484,37 @@
"name": "pokemon_found_out738",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 2424
},
{
"species": "SPECIES_IGGLYBUFF",
"species": "MONSTER_IGGLYBUFF",
"level": 15,
"probability": 1212
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 1516
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2424
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -524,32 +524,32 @@
"name": "pokemon_found_out739",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 2857
},
{
"species": "SPECIES_IGGLYBUFF",
"species": "MONSTER_IGGLYBUFF",
"level": 15,
"probability": 1429
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2857
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -559,37 +559,37 @@
"name": "pokemon_found_out740",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 2424
},
{
"species": "SPECIES_IGGLYBUFF",
"species": "MONSTER_IGGLYBUFF",
"level": 15,
"probability": 1212
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2425
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 1515
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -599,42 +599,42 @@
"name": "pokemon_found_out741",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 2353
},
{
"species": "SPECIES_IGGLYBUFF",
"species": "MONSTER_IGGLYBUFF",
"level": 15,
"probability": 1176
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2353
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 1471
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 294
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -644,42 +644,42 @@
"name": "pokemon_found_out742",
"pokemon": [
{
"species": "SPECIES_KANGASKHAN",
"species": "MONSTER_KANGASKHAN",
"level": 36,
"probability": 2105
},
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2106
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 1315
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 263
},
{
"species": "SPECIES_GARDEVOIR",
"species": "MONSTER_GARDEVOIR",
"level": 18,
"probability": 2106
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2105
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -689,37 +689,37 @@
"name": "pokemon_found_out743",
"pokemon": [
{
"species": "SPECIES_WOBBUFFET",
"species": "MONSTER_WOBBUFFET",
"level": 20,
"probability": 2667
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 1666
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 334
},
{
"species": "SPECIES_GARDEVOIR",
"species": "MONSTER_GARDEVOIR",
"level": 18,
"probability": 2666
},
{
"species": "SPECIES_HARIYAMA",
"species": "MONSTER_HARIYAMA",
"level": 35,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -729,32 +729,32 @@
"name": "pokemon_found_out744",
"pokemon": [
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 2273
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 454
},
{
"species": "SPECIES_GARDEVOIR",
"species": "MONSTER_GARDEVOIR",
"level": 18,
"probability": 3637
},
{
"species": "SPECIES_EXPLOUD",
"species": "MONSTER_EXPLOUD",
"level": 25,
"probability": 3636
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -764,27 +764,27 @@
"name": "pokemon_found_out745",
"pokemon": [
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 3571
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 715
},
{
"species": "SPECIES_GARDEVOIR",
"species": "MONSTER_GARDEVOIR",
"level": 18,
"probability": 5714
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -794,22 +794,22 @@
"name": "pokemon_found_out746",
"pokemon": [
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 8333
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -819,27 +819,27 @@
"name": "pokemon_found_out747",
"pokemon": [
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 5714
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 3572
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 714
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -849,22 +849,22 @@
"name": "pokemon_found_out748",
"pokemon": [
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 8889
},
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 1111
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -874,17 +874,17 @@
"name": "pokemon_found_out749",
"pokemon": [
{
"species": "SPECIES_BLISSEY",
"species": "MONSTER_BLISSEY",
"level": 28,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

70
data/dungeon/DarknightRelic/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out443",
"pokemon": [
{
"species": "SPECIES_GASTLY",
"species": "MONSTER_GASTLY",
"level": 30,
"probability": 2963
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1852
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 370
},
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 2963
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -44,37 +44,37 @@
"name": "pokemon_found_out444",
"pokemon": [
{
"species": "SPECIES_GASTLY",
"species": "MONSTER_GASTLY",
"level": 30,
"probability": 2963
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1852
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 370
},
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BANETTE",
"species": "MONSTER_BANETTE",
"level": 30,
"probability": 2963
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -84,37 +84,37 @@
"name": "pokemon_found_out445",
"pokemon": [
{
"species": "SPECIES_HAUNTER",
"species": "MONSTER_HAUNTER",
"level": 25,
"probability": 2963
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1852
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 370
},
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BANETTE",
"species": "MONSTER_BANETTE",
"level": 30,
"probability": 2963
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -124,37 +124,37 @@
"name": "pokemon_found_out446",
"pokemon": [
{
"species": "SPECIES_HAUNTER",
"species": "MONSTER_HAUNTER",
"level": 25,
"probability": 2963
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1852
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 370
},
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DUSKULL",
"species": "MONSTER_DUSKULL",
"level": 35,
"probability": 2963
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -164,37 +164,37 @@
"name": "pokemon_found_out447",
"pokemon": [
{
"species": "SPECIES_GENGAR",
"species": "MONSTER_GENGAR",
"level": 32,
"probability": 2963
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1852
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 370
},
{
"species": "SPECIES_SABLEYE",
"species": "MONSTER_SABLEYE",
"level": 30,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DUSKULL",
"species": "MONSTER_DUSKULL",
"level": 35,
"probability": 2963
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

64
data/dungeon/DesertRegion/pokemon_found.json
View File

@@ -4,42 +4,42 @@
"name": "pokemon_found_out340",
"pokemon": [
{
"species": "SPECIES_SANDSHREW",
"species": "MONSTER_SANDSHREW",
"level": 30,
"probability": 3077
},
{
"species": "SPECIES_SANDSLASH",
"species": "MONSTER_SANDSLASH",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 1923
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 31,
"probability": 1923
},
{
"species": "SPECIES_TRAPINCH",
"species": "MONSTER_TRAPINCH",
"level": 35,
"probability": 3077
},
{
"species": "SPECIES_VIBRAVA",
"species": "MONSTER_VIBRAVA",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -49,32 +49,32 @@
"name": "pokemon_found_out341",
"pokemon": [
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 33,
"probability": 4000
},
{
"species": "SPECIES_HITMONTOP",
"species": "MONSTER_HITMONTOP",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_TRAPINCH",
"species": "MONSTER_TRAPINCH",
"level": 35,
"probability": 4000
},
{
"species": "SPECIES_VIBRAVA",
"species": "MONSTER_VIBRAVA",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -84,32 +84,32 @@
"name": "pokemon_found_out342",
"pokemon": [
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 33,
"probability": 4000
},
{
"species": "SPECIES_HITMONTOP",
"species": "MONSTER_HITMONTOP",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_BALTOY",
"species": "MONSTER_BALTOY",
"level": 35,
"probability": 4000
},
{
"species": "SPECIES_CLAYDOL",
"species": "MONSTER_CLAYDOL",
"level": 26,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -119,27 +119,27 @@
"name": "pokemon_found_out343",
"pokemon": [
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 33,
"probability": 5000
},
{
"species": "SPECIES_BALTOY",
"species": "MONSTER_BALTOY",
"level": 35,
"probability": 5000
},
{
"species": "SPECIES_CLAYDOL",
"species": "MONSTER_CLAYDOL",
"level": 26,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,37 +149,37 @@
"name": "pokemon_found_out344",
"pokemon": [
{
"species": "SPECIES_SANDSLASH",
"species": "MONSTER_SANDSLASH",
"level": 35,
"probability": 2759
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2758
},
{
"species": "SPECIES_BALTOY",
"species": "MONSTER_BALTOY",
"level": 35,
"probability": 2759
},
{
"species": "SPECIES_CLAYDOL",
"species": "MONSTER_CLAYDOL",
"level": 26,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DUSCLOPS",
"species": "MONSTER_DUSCLOPS",
"level": 33,
"probability": 1724
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

338
data/dungeon/DojoRegistration/pokemon_found.json
View File

File diff suppressed because it is too large Load Diff

192
data/dungeon/FantasyStrait/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out509",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -44,47 +44,47 @@
"name": "pokemon_found_out510",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 1429
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 1428
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 1429
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 1428
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 1429
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 1428
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -94,52 +94,52 @@
"name": "pokemon_found_out511",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 1250
},
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 1250
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 1250
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 1250
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 1250
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 1250
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,47 +149,47 @@
"name": "pokemon_found_out512",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 1429
},
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1428
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 1429
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 1428
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 1429
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 1428
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -199,47 +199,47 @@
"name": "pokemon_found_out513",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 1428
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 1429
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 1428
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 1429
},
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 1428
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 1429
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -249,42 +249,42 @@
"name": "pokemon_found_out514",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 1666
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 1667
},
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 1667
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 1666
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 1667
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -294,42 +294,42 @@
"name": "pokemon_found_out515",
"pokemon": [
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 1667
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 1666
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 1667
},
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 1667
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 1666
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 1667
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -339,47 +339,47 @@
"name": "pokemon_found_out516",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 32,
"probability": 1633
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 1632
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 1633
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 1633
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 204
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 1632
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 1633
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -389,37 +389,37 @@
"name": "pokemon_found_out517",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 32,
"probability": 2000
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 2000
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 2000
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -429,32 +429,32 @@
"name": "pokemon_found_out518",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -464,32 +464,32 @@
"name": "pokemon_found_out519",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -499,42 +499,42 @@
"name": "pokemon_found_out520",
"pokemon": [
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 1951
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 1951
},
{
"species": "SPECIES_SEADRA",
"species": "MONSTER_SEADRA",
"level": 20,
"probability": 1952
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 244
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 1951
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 1951
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

302
data/dungeon/FaroffSea/pokemon_found.json
View File

@@ -4,27 +4,27 @@
"name": "pokemon_found_out689",
"pokemon": [
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 3810
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 2380
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 3810
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -34,37 +34,37 @@
"name": "pokemon_found_out690",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2162
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2162
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 2162
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 1352
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 2162
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -74,32 +74,32 @@
"name": "pokemon_found_out691",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2759
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2758
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 1724
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 2759
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -109,32 +109,32 @@
"name": "pokemon_found_out692",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2759
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2758
},
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 1724
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 2759
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -144,27 +144,27 @@
"name": "pokemon_found_out693",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -174,32 +174,32 @@
"name": "pokemon_found_out694",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2500
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 2500
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -209,22 +209,22 @@
"name": "pokemon_found_out695",
"pokemon": [
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -234,32 +234,32 @@
"name": "pokemon_found_out696",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 3200
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 25,
"probability": 400
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 3200
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -269,27 +269,27 @@
"name": "pokemon_found_out697",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 3334
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -299,22 +299,22 @@
"name": "pokemon_found_out698",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 5000
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -324,27 +324,27 @@
"name": "pokemon_found_out699",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 3334
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -354,32 +354,32 @@
"name": "pokemon_found_out700",
"pokemon": [
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 3200
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 3200
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 25,
"probability": 400
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -389,27 +389,27 @@
"name": "pokemon_found_out701",
"pokemon": [
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 3333
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 3334
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -419,42 +419,42 @@
"name": "pokemon_found_out702",
"pokemon": [
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 1667
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 1666
},
{
"species": "SPECIES_STARMIE",
"species": "MONSTER_STARMIE",
"level": 22,
"probability": 1667
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 1667
},
{
"species": "SPECIES_ARMALDO",
"species": "MONSTER_ARMALDO",
"level": 33,
"probability": 1666
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SEALEO",
"species": "MONSTER_SEALEO",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -464,37 +464,37 @@
"name": "pokemon_found_out703",
"pokemon": [
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_STARMIE",
"species": "MONSTER_STARMIE",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_ARMALDO",
"species": "MONSTER_ARMALDO",
"level": 33,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SEALEO",
"species": "MONSTER_SEALEO",
"level": 24,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -504,32 +504,32 @@
"name": "pokemon_found_out704",
"pokemon": [
{
"species": "SPECIES_STARMIE",
"species": "MONSTER_STARMIE",
"level": 22,
"probability": 2500
},
{
"species": "SPECIES_CARVANHA",
"species": "MONSTER_CARVANHA",
"level": 27,
"probability": 2500
},
{
"species": "SPECIES_ARMALDO",
"species": "MONSTER_ARMALDO",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SEALEO",
"species": "MONSTER_SEALEO",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -539,27 +539,27 @@
"name": "pokemon_found_out705",
"pokemon": [
{
"species": "SPECIES_STARMIE",
"species": "MONSTER_STARMIE",
"level": 22,
"probability": 3333
},
{
"species": "SPECIES_ARMALDO",
"species": "MONSTER_ARMALDO",
"level": 33,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SEALEO",
"species": "MONSTER_SEALEO",
"level": 24,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -569,32 +569,32 @@
"name": "pokemon_found_out706",
"pokemon": [
{
"species": "SPECIES_STARMIE",
"species": "MONSTER_STARMIE",
"level": 22,
"probability": 2500
},
{
"species": "SPECIES_WAILMER",
"species": "MONSTER_WAILMER",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_ARMALDO",
"species": "MONSTER_ARMALDO",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SEALEO",
"species": "MONSTER_SEALEO",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -604,27 +604,27 @@
"name": "pokemon_found_out707",
"pokemon": [
{
"species": "SPECIES_LAPRAS",
"species": "MONSTER_LAPRAS",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_WAILMER",
"species": "MONSTER_WAILMER",
"level": 35,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_LUVDISC",
"species": "MONSTER_LUVDISC",
"level": 30,
"probability": 4000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -634,42 +634,42 @@
"name": "pokemon_found_out708",
"pokemon": [
{
"species": "SPECIES_LAPRAS",
"species": "MONSTER_LAPRAS",
"level": 30,
"probability": 1176
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 25,
"probability": 295
},
{
"species": "SPECIES_DRATINI",
"species": "MONSTER_DRATINI",
"level": 30,
"probability": 1470
},
{
"species": "SPECIES_SLOWKING",
"species": "MONSTER_SLOWKING",
"level": 38,
"probability": 2353
},
{
"species": "SPECIES_WAILMER",
"species": "MONSTER_WAILMER",
"level": 35,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_LUVDISC",
"species": "MONSTER_LUVDISC",
"level": 30,
"probability": 2353
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -679,27 +679,27 @@
"name": "pokemon_found_out709",
"pokemon": [
{
"species": "SPECIES_DRATINI",
"species": "MONSTER_DRATINI",
"level": 30,
"probability": 2381
},
{
"species": "SPECIES_SLOWKING",
"species": "MONSTER_SLOWKING",
"level": 38,
"probability": 3809
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_LUVDISC",
"species": "MONSTER_LUVDISC",
"level": 30,
"probability": 3810
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -709,32 +709,32 @@
"name": "pokemon_found_out710",
"pokemon": [
{
"species": "SPECIES_DEWGONG",
"species": "MONSTER_DEWGONG",
"level": 35,
"probability": 2759
},
{
"species": "SPECIES_DRATINI",
"species": "MONSTER_DRATINI",
"level": 30,
"probability": 1724
},
{
"species": "SPECIES_SLOWKING",
"species": "MONSTER_SLOWKING",
"level": 38,
"probability": 2758
},
{
"species": "SPECIES_OCTILLERY",
"species": "MONSTER_OCTILLERY",
"level": 30,
"probability": 2759
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -744,42 +744,42 @@
"name": "pokemon_found_out711",
"pokemon": [
{
"species": "SPECIES_DEWGONG",
"species": "MONSTER_DEWGONG",
"level": 35,
"probability": 1951
},
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 1951
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 25,
"probability": 244
},
{
"species": "SPECIES_OCTILLERY",
"species": "MONSTER_OCTILLERY",
"level": 30,
"probability": 1952
},
{
"species": "SPECIES_SHARPEDO",
"species": "MONSTER_SHARPEDO",
"level": 35,
"probability": 1951
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_WALREIN",
"species": "MONSTER_WALREIN",
"level": 28,
"probability": 1951
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -789,32 +789,32 @@
"name": "pokemon_found_out712",
"pokemon": [
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 2500
},
{
"species": "SPECIES_SHARPEDO",
"species": "MONSTER_SHARPEDO",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_WALREIN",
"species": "MONSTER_WALREIN",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_CLAMPERL",
"species": "MONSTER_CLAMPERL",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -824,32 +824,32 @@
"name": "pokemon_found_out713",
"pokemon": [
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 25,
"probability": 400
},
{
"species": "SPECIES_KINGDRA",
"species": "MONSTER_KINGDRA",
"level": 40,
"probability": 3200
},
{
"species": "SPECIES_WAILORD",
"species": "MONSTER_WAILORD",
"level": 40,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CLAMPERL",
"species": "MONSTER_CLAMPERL",
"level": 35,
"probability": 3200
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -859,27 +859,27 @@
"name": "pokemon_found_out714",
"pokemon": [
{
"species": "SPECIES_KINGDRA",
"species": "MONSTER_KINGDRA",
"level": 40,
"probability": 3333
},
{
"species": "SPECIES_WAILORD",
"species": "MONSTER_WAILORD",
"level": 40,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CLAMPERL",
"species": "MONSTER_CLAMPERL",
"level": 35,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

174
data/dungeon/FieryField/pokemon_found.json
View File

@@ -4,42 +4,42 @@
"name": "pokemon_found_out381",
"pokemon": [
{
"species": "SPECIES_VULPIX",
"species": "MONSTER_VULPIX",
"level": 32,
"probability": 2759
},
{
"species": "SPECIES_NINETALES",
"species": "MONSTER_NINETALES",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_URSARING",
"species": "MONSTER_URSARING",
"level": 25,
"probability": 2758
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 28,
"probability": 2759
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 35,
"probability": 1724
},
{
"species": "SPECIES_CAMERUPT",
"species": "MONSTER_CAMERUPT",
"level": 37,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -49,47 +49,47 @@
"name": "pokemon_found_out382",
"pokemon": [
{
"species": "SPECIES_VULPIX",
"species": "MONSTER_VULPIX",
"level": 32,
"probability": 2051
},
{
"species": "SPECIES_NINETALES",
"species": "MONSTER_NINETALES",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 33,
"probability": 2564
},
{
"species": "SPECIES_URSARING",
"species": "MONSTER_URSARING",
"level": 25,
"probability": 2052
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 28,
"probability": 2051
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 35,
"probability": 1282
},
{
"species": "SPECIES_CAMERUPT",
"species": "MONSTER_CAMERUPT",
"level": 37,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -99,37 +99,37 @@
"name": "pokemon_found_out383",
"pokemon": [
{
"species": "SPECIES_CHARMANDER",
"species": "MONSTER_CHARMANDER",
"level": 30,
"probability": 1333
},
{
"species": "SPECIES_CHARMELEON",
"species": "MONSTER_CHARMELEON",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 33,
"probability": 3334
},
{
"species": "SPECIES_URSARING",
"species": "MONSTER_URSARING",
"level": 25,
"probability": 2666
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 28,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -139,32 +139,32 @@
"name": "pokemon_found_out384",
"pokemon": [
{
"species": "SPECIES_CHARMANDER",
"species": "MONSTER_CHARMANDER",
"level": 30,
"probability": 1818
},
{
"species": "SPECIES_CHARMELEON",
"species": "MONSTER_CHARMELEON",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 33,
"probability": 4546
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 31,
"probability": 3636
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -174,27 +174,27 @@
"name": "pokemon_found_out385",
"pokemon": [
{
"species": "SPECIES_CHARMANDER",
"species": "MONSTER_CHARMANDER",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_CHARMELEON",
"species": "MONSTER_CHARMELEON",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 31,
"probability": 6667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -204,22 +204,22 @@
"name": "pokemon_found_out386",
"pokemon": [
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 31,
"probability": 6154
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 33,
"probability": 3846
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -229,32 +229,32 @@
"name": "pokemon_found_out387",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 40,
"probability": 666
},
{
"species": "SPECIES_FLAREON",
"species": "MONSTER_FLAREON",
"level": 22,
"probability": 5000
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 33,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -264,37 +264,37 @@
"name": "pokemon_found_out388",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 30,
"probability": 1951
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 40,
"probability": 488
},
{
"species": "SPECIES_FLAREON",
"species": "MONSTER_FLAREON",
"level": 22,
"probability": 3659
},
{
"species": "SPECIES_QUILAVA",
"species": "MONSTER_QUILAVA",
"level": 25,
"probability": 1951
},
{
"species": "SPECIES_CAMERUPT",
"species": "MONSTER_CAMERUPT",
"level": 37,
"probability": 1951
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -304,37 +304,37 @@
"name": "pokemon_found_out389",
"pokemon": [
{
"species": "SPECIES_MACHOKE",
"species": "MONSTER_MACHOKE",
"level": 24,
"probability": 2353
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 40,
"probability": 588
},
{
"species": "SPECIES_QUILAVA",
"species": "MONSTER_QUILAVA",
"level": 25,
"probability": 2353
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 30,
"probability": 2353
},
{
"species": "SPECIES_CAMERUPT",
"species": "MONSTER_CAMERUPT",
"level": 37,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -344,32 +344,32 @@
"name": "pokemon_found_out390",
"pokemon": [
{
"species": "SPECIES_MACHOKE",
"species": "MONSTER_MACHOKE",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_QUILAVA",
"species": "MONSTER_QUILAVA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_CAMERUPT",
"species": "MONSTER_CAMERUPT",
"level": 37,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -379,32 +379,32 @@
"name": "pokemon_found_out391",
"pokemon": [
{
"species": "SPECIES_MACHOKE",
"species": "MONSTER_MACHOKE",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_QUILAVA",
"species": "MONSTER_QUILAVA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_COMBUSKEN",
"species": "MONSTER_COMBUSKEN",
"level": 26,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -414,27 +414,27 @@
"name": "pokemon_found_out392",
"pokemon": [
{
"species": "SPECIES_MACHOKE",
"species": "MONSTER_MACHOKE",
"level": 24,
"probability": 3333
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 30,
"probability": 3334
},
{
"species": "SPECIES_COMBUSKEN",
"species": "MONSTER_COMBUSKEN",
"level": 26,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -444,27 +444,27 @@
"name": "pokemon_found_out393",
"pokemon": [
{
"species": "SPECIES_CHARMELEON",
"species": "MONSTER_CHARMELEON",
"level": 30,
"probability": 5000
},
{
"species": "SPECIES_CHARIZARD",
"species": "MONSTER_CHARIZARD",
"level": 55,
"probability": 0
},
{
"species": "SPECIES_COMBUSKEN",
"species": "MONSTER_COMBUSKEN",
"level": 26,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -474,32 +474,32 @@
"name": "pokemon_found_out394",
"pokemon": [
{
"species": "SPECIES_CHARMELEON",
"species": "MONSTER_CHARMELEON",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_CHARIZARD",
"species": "MONSTER_CHARIZARD",
"level": 55,
"probability": 0
},
{
"species": "SPECIES_ENTEI",
"species": "MONSTER_ENTEI",
"level": 45,
"probability": 10000
},
{
"species": "SPECIES_COMBUSKEN",
"species": "MONSTER_COMBUSKEN",
"level": 26,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

62
data/dungeon/FrostyForest/pokemon_found.json
View File

@@ -2,22 +2,22 @@
"tables": [{
"name": "FrostyForest_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 14,
"probability": 6250
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 11,
"probability": 3750
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -27,27 +27,27 @@
"name": "FrostyForest_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 14,
"probability": 4167
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 11,
"probability": 2500
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 13,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -57,32 +57,32 @@
"name": "FrostyForest_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 14,
"probability": 3571
},
{
"species": "SPECIES_PILOSWINE",
"species": "MONSTER_PILOSWINE",
"level": 14,
"probability": 2143
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -91,27 +91,27 @@
"name": "FrostyForest_5F_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 2222
},
{
"species": "SPECIES_PILOSWINE",
"species": "MONSTER_PILOSWINE",
"level": 14,
"probability": 3334
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 13,
"probability": 4444
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -120,27 +120,27 @@
"name": "FrostyForest_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_LAIRON",
"species": "MONSTER_LAIRON",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,32 +149,32 @@
"name": "FrostyForest_8F_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1600
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 17,
"probability": 3200
},
{
"species": "SPECIES_LAIRON",
"species": "MONSTER_LAIRON",
"level": 17,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

14
data/dungeon/FrostyGrotto/pokemon_found.json
View File

@@ -3,22 +3,22 @@
"name": "FrostyGrotto_1F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RHYHORN",
"species": "MONSTER_RHYHORN",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_METANG",
"species": "MONSTER_METANG",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -27,17 +27,17 @@
"name": "FrostyGrotto_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARTICUNO",
"species": "MONSTER_ARTICUNO",
"level": 33,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

198
data/dungeon/GrandSea/pokemon_found.json
View File

@@ -4,27 +4,27 @@
"name": "pokemon_found_out460",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 3334
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -34,37 +34,37 @@
"name": "pokemon_found_out461",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -74,37 +74,37 @@
"name": "pokemon_found_out462",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_QWILFISH",
"species": "MONSTER_QWILFISH",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -114,37 +114,37 @@
"name": "pokemon_found_out463",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2424
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 2424
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 2425
},
{
"species": "SPECIES_DRAGONITE",
"species": "MONSTER_DRAGONITE",
"level": 24,
"probability": 303
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,32 +154,32 @@
"name": "pokemon_found_out464",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 2500
},
{
"species": "SPECIES_KABUTO",
"species": "MONSTER_KABUTO",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_CORSOLA",
"species": "MONSTER_CORSOLA",
"level": 27,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -189,27 +189,27 @@
"name": "pokemon_found_out465",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 3334
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -219,37 +219,37 @@
"name": "pokemon_found_out466",
"pokemon": [
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 2424
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 2424
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2425
},
{
"species": "SPECIES_DRAGONITE",
"species": "MONSTER_DRAGONITE",
"level": 24,
"probability": 303
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -259,32 +259,32 @@
"name": "pokemon_found_out467",
"pokemon": [
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 2500
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -294,42 +294,42 @@
"name": "pokemon_found_out468",
"pokemon": [
{
"species": "SPECIES_KRABBY",
"species": "MONSTER_KRABBY",
"level": 32,
"probability": 2353
},
{
"species": "SPECIES_HORSEA",
"species": "MONSTER_HORSEA",
"level": 29,
"probability": 2353
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2353
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 294
},
{
"species": "SPECIES_DRAGONITE",
"species": "MONSTER_DRAGONITE",
"level": 24,
"probability": 294
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -339,27 +339,27 @@
"name": "pokemon_found_out469",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 3333
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 3334
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -369,32 +369,32 @@
"name": "pokemon_found_out470",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -404,42 +404,42 @@
"name": "pokemon_found_out471",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 1951
},
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 1951
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 1952
},
{
"species": "SPECIES_STARYU",
"species": "MONSTER_STARYU",
"level": 28,
"probability": 1951
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 1951
},
{
"species": "SPECIES_DRAGONITE",
"species": "MONSTER_DRAGONITE",
"level": 24,
"probability": 244
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -449,32 +449,32 @@
"name": "pokemon_found_out472",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 2500
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 2500
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -484,37 +484,37 @@
"name": "pokemon_found_out473",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 2000
},
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 2000
},
{
"species": "SPECIES_SEADRA",
"species": "MONSTER_SEADRA",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -524,47 +524,47 @@
"name": "pokemon_found_out474",
"pokemon": [
{
"species": "SPECIES_TENTACRUEL",
"species": "MONSTER_TENTACRUEL",
"level": 33,
"probability": 1633
},
{
"species": "SPECIES_SLOWBRO",
"species": "MONSTER_SLOWBRO",
"level": 27,
"probability": 1632
},
{
"species": "SPECIES_KINGLER",
"species": "MONSTER_KINGLER",
"level": 35,
"probability": 1633
},
{
"species": "SPECIES_SEADRA",
"species": "MONSTER_SEADRA",
"level": 20,
"probability": 1633
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 204
},
{
"species": "SPECIES_KABUTOPS",
"species": "MONSTER_KABUTOPS",
"level": 33,
"probability": 1632
},
{
"species": "SPECIES_MANTINE",
"species": "MONSTER_MANTINE",
"level": 15,
"probability": 1633
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

98
data/dungeon/GreatCanyon/pokemon_found.json
View File

@@ -3,32 +3,32 @@
"name": "GreatCanyon_1F_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 14,
"probability": 1429
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_DUNSPARCE",
"species": "MONSTER_DUNSPARCE",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_PHANPY",
"species": "MONSTER_PHANPY",
"level": 14,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -37,27 +37,27 @@
"name": "GreatCanyon_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"species": "MONSTER_VILEPLUME",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_BRELOOM",
"species": "MONSTER_BRELOOM",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -66,32 +66,32 @@
"name": "GreatCanyon_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"species": "MONSTER_VILEPLUME",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_MURKROW",
"species": "MONSTER_MURKROW",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_BRELOOM",
"species": "MONSTER_BRELOOM",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -100,37 +100,37 @@
"name": "GreatCanyon_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"species": "MONSTER_VILEPLUME",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_MURKROW",
"species": "MONSTER_MURKROW",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_BRELOOM",
"species": "MONSTER_BRELOOM",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -139,32 +139,32 @@
"name": "GreatCanyon_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_MURKROW",
"species": "MONSTER_MURKROW",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_HERACROSS",
"species": "MONSTER_HERACROSS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -173,32 +173,32 @@
"name": "GreatCanyon_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_ARIADOS",
"species": "MONSTER_ARIADOS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_HERACROSS",
"species": "MONSTER_HERACROSS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -207,22 +207,22 @@
"name": "GreatCanyon_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARIADOS",
"species": "MONSTER_ARIADOS",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_HERACROSS",
"species": "MONSTER_HERACROSS",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -231,27 +231,27 @@
"name": "GreatCanyon_10F_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_TAUROS",
"species": "MONSTER_TAUROS",
"level": 15,
"probability": 3077
},
{
"species": "SPECIES_ARIADOS",
"species": "MONSTER_ARIADOS",
"level": 14,
"probability": 3077
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 15,
"probability": 3846
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -260,22 +260,22 @@
"name": "GreatCanyon_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_TAUROS",
"species": "MONSTER_TAUROS",
"level": 15,
"probability": 4444
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 15,
"probability": 5556
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

132
data/dungeon/HowlingForest/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out576",
"pokemon": [
{
"species": "SPECIES_HOUNDOUR",
"species": "MONSTER_HOUNDOUR",
"level": 18,
"probability": 2462
},
{
"species": "SPECIES_POOCHYENA",
"species": "MONSTER_POOCHYENA",
"level": 20,
"probability": 2461
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 15,
"probability": 2462
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 11,
"probability": 153
},
{
"species": "SPECIES_SPOINK",
"species": "MONSTER_SPOINK",
"level": 13,
"probability": 2462
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -44,42 +44,42 @@
"name": "pokemon_found_out577",
"pokemon": [
{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 18,
"probability": 845
},
{
"species": "SPECIES_HOUNDOUR",
"species": "MONSTER_HOUNDOUR",
"level": 18,
"probability": 2254
},
{
"species": "SPECIES_POOCHYENA",
"species": "MONSTER_POOCHYENA",
"level": 20,
"probability": 2253
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 15,
"probability": 2254
},
{
"species": "SPECIES_AZURILL",
"species": "MONSTER_AZURILL",
"level": 11,
"probability": 140
},
{
"species": "SPECIES_SPOINK",
"species": "MONSTER_SPOINK",
"level": 13,
"probability": 2254
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -89,37 +89,37 @@
"name": "pokemon_found_out578",
"pokemon": [
{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 18,
"probability": 857
},
{
"species": "SPECIES_HOUNDOUR",
"species": "MONSTER_HOUNDOUR",
"level": 18,
"probability": 2286
},
{
"species": "SPECIES_POOCHYENA",
"species": "MONSTER_POOCHYENA",
"level": 20,
"probability": 2286
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 15,
"probability": 2285
},
{
"species": "SPECIES_SPOINK",
"species": "MONSTER_SPOINK",
"level": 13,
"probability": 2286
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -129,42 +129,42 @@
"name": "pokemon_found_out579",
"pokemon": [
{
"species": "SPECIES_FURRET",
"species": "MONSTER_FURRET",
"level": 18,
"probability": 833
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 278
},
{
"species": "SPECIES_HOUNDOUR",
"species": "MONSTER_HOUNDOUR",
"level": 18,
"probability": 2222
},
{
"species": "SPECIES_POOCHYENA",
"species": "MONSTER_POOCHYENA",
"level": 20,
"probability": 2223
},
{
"species": "SPECIES_WHISMUR",
"species": "MONSTER_WHISMUR",
"level": 15,
"probability": 2222
},
{
"species": "SPECIES_SPOINK",
"species": "MONSTER_SPOINK",
"level": 13,
"probability": 2222
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -174,42 +174,42 @@
"name": "pokemon_found_out580",
"pokemon": [
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 149
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 299
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 20,
"probability": 2388
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 25,
"probability": 2388
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 10,
"probability": 2388
},
{
"species": "SPECIES_GRUMPIG",
"species": "MONSTER_GRUMPIG",
"level": 15,
"probability": 2388
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -219,47 +219,47 @@
"name": "pokemon_found_out581",
"pokemon": [
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 147
},
{
"species": "SPECIES_SNORLAX",
"species": "MONSTER_SNORLAX",
"level": 25,
"probability": 147
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 294
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 20,
"probability": 2353
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 25,
"probability": 2353
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 10,
"probability": 2353
},
{
"species": "SPECIES_GRUMPIG",
"species": "MONSTER_GRUMPIG",
"level": 15,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -269,42 +269,42 @@
"name": "pokemon_found_out582",
"pokemon": [
{
"species": "SPECIES_PIDGEY",
"species": "MONSTER_PIDGEY",
"level": 1,
"probability": 152
},
{
"species": "SPECIES_SNORLAX",
"species": "MONSTER_SNORLAX",
"level": 25,
"probability": 151
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 20,
"probability": 2424
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 25,
"probability": 2425
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 10,
"probability": 2424
},
{
"species": "SPECIES_GRUMPIG",
"species": "MONSTER_GRUMPIG",
"level": 15,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -314,42 +314,42 @@
"name": "pokemon_found_out583",
"pokemon": [
{
"species": "SPECIES_EXEGGCUTE",
"species": "MONSTER_EXEGGCUTE",
"level": 20,
"probability": 61
},
{
"species": "SPECIES_SNORLAX",
"species": "MONSTER_SNORLAX",
"level": 25,
"probability": 153
},
{
"species": "SPECIES_HOUNDOOM",
"species": "MONSTER_HOUNDOOM",
"level": 20,
"probability": 2447
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 25,
"probability": 2446
},
{
"species": "SPECIES_LOUDRED",
"species": "MONSTER_LOUDRED",
"level": 10,
"probability": 2447
},
{
"species": "SPECIES_GRUMPIG",
"species": "MONSTER_GRUMPIG",
"level": 15,
"probability": 2446
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -359,17 +359,17 @@
"name": "pokemon_found_out584",
"pokemon": [
{
"species": "SPECIES_SMEARGLE",
"species": "MONSTER_SMEARGLE",
"level": 25,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

1244
data/dungeon/JoyousTower/pokemon_found.json
View File

File diff suppressed because it is too large Load Diff

60
data/dungeon/LapisCave/pokemon_found.json
View File

@@ -2,22 +2,22 @@
"tables": [{
"name": "LapisCave_1F_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_NINCADA",
"species": "MONSTER_NINCADA",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -25,27 +25,27 @@
}, {
"name": "LapisCave_4F_Pokemon",
"pokemon": [{
"species": "SPECIES_NIDORINA",
"species": "MONSTER_NIDORINA",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_NIDORINO",
"species": "MONSTER_NIDORINO",
"level": 15,
"probability": 3334
},
{
"species": "SPECIES_NINCADA",
"species": "MONSTER_NINCADA",
"level": 14,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -53,27 +53,27 @@
}, {
"name": "LapisCave_5F_8F_Pokemon",
"pokemon": [{
"species": "SPECIES_NIDORINA",
"species": "MONSTER_NIDORINA",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_NIDORINO",
"species": "MONSTER_NIDORINO",
"level": 15,
"probability": 3334
},
{
"species": "SPECIES_ILLIMISE",
"species": "MONSTER_ILLIMISE",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -81,22 +81,22 @@
}, {
"name": "LapisCave_9F_10F_Pokemon",
"pokemon": [{
"species": "SPECIES_TANGELA",
"species": "MONSTER_TANGELA",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"species": "MONSTER_BAGON",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -104,27 +104,27 @@
}, {
"name": "LapisCave_11F_12F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 3333
},
{
"species": "SPECIES_TANGELA",
"species": "MONSTER_TANGELA",
"level": 14,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"species": "MONSTER_BAGON",
"level": 16,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -132,22 +132,22 @@
}, {
"name": "LapisCave_13F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"species": "MONSTER_BAGON",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -155,17 +155,17 @@
}, {
"name": "LapisCave_14F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

226
data/dungeon/LightningField/pokemon_found.json
View File

@@ -4,42 +4,42 @@
"name": "pokemon_found_out427",
"pokemon": [
{
"species": "SPECIES_MAGNEMITE",
"species": "MONSTER_MAGNEMITE",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 0
},
{
"species": "SPECIES_MAREEP",
"species": "MONSTER_MAREEP",
"level": 28,
"probability": 3334
},
{
"species": "SPECIES_FLAAFFY",
"species": "MONSTER_FLAAFFY",
"level": 30,
"probability": 0
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 0
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -49,37 +49,37 @@
"name": "pokemon_found_out428",
"pokemon": [
{
"species": "SPECIES_PIKACHU",
"species": "MONSTER_PIKACHU",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 0
},
{
"species": "SPECIES_MAGNEMITE",
"species": "MONSTER_MAGNEMITE",
"level": 25,
"probability": 3334
},
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 0
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -89,52 +89,52 @@
"name": "pokemon_found_out429",
"pokemon": [
{
"species": "SPECIES_PIKACHU",
"species": "MONSTER_PIKACHU",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 0
},
{
"species": "SPECIES_MAGNEMITE",
"species": "MONSTER_MAGNEMITE",
"level": 25,
"probability": 2666
},
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 0
},
{
"species": "SPECIES_FLAAFFY",
"species": "MONSTER_FLAAFFY",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 0
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -144,47 +144,47 @@
"name": "pokemon_found_out430",
"pokemon": [
{
"species": "SPECIES_PIKACHU",
"species": "MONSTER_PIKACHU",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 0
},
{
"species": "SPECIES_JOLTEON",
"species": "MONSTER_JOLTEON",
"level": 25,
"probability": 2666
},
{
"species": "SPECIES_FLAAFFY",
"species": "MONSTER_FLAAFFY",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 0
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -194,42 +194,42 @@
"name": "pokemon_found_out431",
"pokemon": [
{
"species": "SPECIES_JOLTEON",
"species": "MONSTER_JOLTEON",
"level": 25,
"probability": 2963
},
{
"species": "SPECIES_FLAAFFY",
"species": "MONSTER_FLAAFFY",
"level": 30,
"probability": 2963
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 0
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1111
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1111
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 35,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -239,32 +239,32 @@
"name": "pokemon_found_out432",
"pokemon": [
{
"species": "SPECIES_JOLTEON",
"species": "MONSTER_JOLTEON",
"level": 25,
"probability": 4211
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1578
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1579
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 35,
"probability": 2632
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -274,42 +274,42 @@
"name": "pokemon_found_out433",
"pokemon": [
{
"species": "SPECIES_ELECTRODE",
"species": "MONSTER_ELECTRODE",
"level": 35,
"probability": 2963
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 0
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 34,
"probability": 2963
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1111
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1111
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 35,
"probability": 1852
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -319,47 +319,47 @@
"name": "pokemon_found_out434",
"pokemon": [
{
"species": "SPECIES_ELECTRODE",
"species": "MONSTER_ELECTRODE",
"level": 35,
"probability": 2286
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 0
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 2285
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 34,
"probability": 2286
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 857
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 857
},
{
"species": "SPECIES_CACTURNE",
"species": "MONSTER_CACTURNE",
"level": 35,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -369,42 +369,42 @@
"name": "pokemon_found_out435",
"pokemon": [
{
"species": "SPECIES_ELECTRODE",
"species": "MONSTER_ELECTRODE",
"level": 35,
"probability": 2667
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 0
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 2666
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 34,
"probability": 2667
},
{
"species": "SPECIES_PLUSLE",
"species": "MONSTER_PLUSLE",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_MINUN",
"species": "MONSTER_MINUN",
"level": 30,
"probability": 1000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -414,42 +414,42 @@
"name": "pokemon_found_out436",
"pokemon": [
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 2162
},
{
"species": "SPECIES_ELECTRODE",
"species": "MONSTER_ELECTRODE",
"level": 35,
"probability": 2162
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 0
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 33,
"probability": 2162
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 34,
"probability": 2163
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 1351
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -459,32 +459,32 @@
"name": "pokemon_found_out437",
"pokemon": [
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 3810
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 0
},
{
"species": "SPECIES_ELEKID",
"species": "MONSTER_ELEKID",
"level": 34,
"probability": 3809
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 2381
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -494,22 +494,22 @@
"name": "pokemon_found_out438",
"pokemon": [
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 6154
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 3846
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -519,27 +519,27 @@
"name": "pokemon_found_out439",
"pokemon": [
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 3810
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 35,
"probability": 3809
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 2381
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -549,32 +549,32 @@
"name": "pokemon_found_out440",
"pokemon": [
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 2759
},
{
"species": "SPECIES_MAGNETON",
"species": "MONSTER_MAGNETON",
"level": 28,
"probability": 2758
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 35,
"probability": 2759
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 1724
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -584,27 +584,27 @@
"name": "pokemon_found_out441",
"pokemon": [
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 3810
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 35,
"probability": 3809
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 2381
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -614,32 +614,32 @@
"name": "pokemon_found_out442",
"pokemon": [
{
"species": "SPECIES_RAICHU",
"species": "MONSTER_RAICHU",
"level": 25,
"probability": 0
},
{
"species": "SPECIES_RAIKOU",
"species": "MONSTER_RAIKOU",
"level": 45,
"probability": 10000
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_TROPIUS",
"species": "MONSTER_TROPIUS",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

134
data/dungeon/MagmaCavern/pokemon_found.json
View File

@@ -3,32 +3,32 @@
"name": "MagmaCavern_1F_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 19,
"probability": 2500
},
{
"species": "SPECIES_SANDSHREW",
"species": "MONSTER_SANDSHREW",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_NIDOKING",
"species": "MONSTER_NIDOKING",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -37,27 +37,27 @@
"name": "MagmaCavern_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SANDSHREW",
"species": "MONSTER_SANDSHREW",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 20,
"probability": 3334
},
{
"species": "SPECIES_NIDOKING",
"species": "MONSTER_NIDOKING",
"level": 21,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -66,32 +66,32 @@
"name": "MagmaCavern_5F_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SANDSHREW",
"species": "MONSTER_SANDSHREW",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_NIDOQUEEN",
"species": "MONSTER_NIDOQUEEN",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_NIDOKING",
"species": "MONSTER_NIDOKING",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -100,22 +100,22 @@
"name": "MagmaCavern_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 5000
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 21,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -124,32 +124,32 @@
"name": "MagmaCavern_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 2500
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -158,37 +158,37 @@
"name": "MagmaCavern_9F_10F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 2000
},
{
"species": "SPECIES_GRAVELER",
"species": "MONSTER_GRAVELER",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 21,
"probability": 2000
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 21,
"probability": 2000
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -197,32 +197,32 @@
"name": "MagmaCavern_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_MAGMAR",
"species": "MONSTER_MAGMAR",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 21,
"probability": 2500
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -231,27 +231,27 @@
"name": "MagmaCavern_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 3333
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 21,
"probability": 3334
},
{
"species": "SPECIES_MAWILE",
"species": "MONSTER_MAWILE",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -260,22 +260,22 @@
"name": "MagmaCavern_13F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 5000
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 21,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -284,27 +284,27 @@
"name": "MagmaCavern_14F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARBOK",
"species": "MONSTER_ARBOK",
"level": 21,
"probability": 3333
},
{
"species": "SPECIES_RHYDON",
"species": "MONSTER_RHYDON",
"level": 23,
"probability": 3334
},
{
"species": "SPECIES_MAGCARGO",
"species": "MONSTER_MAGCARGO",
"level": 21,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -313,32 +313,32 @@
"name": "MagmaCavern_15F_20F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SANDSLASH",
"species": "MONSTER_SANDSLASH",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_GOLEM",
"species": "MONSTER_GOLEM",
"level": 15,
"probability": 2500
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_RHYDON",
"species": "MONSTER_RHYDON",
"level": 23,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -347,22 +347,22 @@
"name": "MagmaCavern_21F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 8000
},
{
"species": "SPECIES_ONIX",
"species": "MONSTER_ONIX",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -371,17 +371,17 @@
"name": "MagmaCavern_22F_23F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ONIX",
"species": "MONSTER_ONIX",
"level": 30,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

24
data/dungeon/MagmaCavernPit/pokemon_found.json
View File

@@ -3,22 +3,22 @@
"name": "MagmaCavernPit_1F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ONIX",
"species": "MONSTER_ONIX",
"level": 30,
"probability": 5000
},
{
"species": "SPECIES_STEELIX",
"species": "MONSTER_STEELIX",
"level": 25,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -27,22 +27,22 @@
"name": "MagmaCavernPit_2F_Pokemon",
"pokemon": [
{
"species": "SPECIES_CHARIZARD",
"species": "MONSTER_CHARIZARD",
"level": 55,
"probability": 0
},
{
"species": "SPECIES_TYRANITAR",
"species": "MONSTER_TYRANITAR",
"level": 50,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -51,22 +51,22 @@
"name": "MagmaCavernPit_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ALAKAZAM",
"species": "MONSTER_ALAKAZAM",
"level": 50,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GROUDON",
"species": "MONSTER_GROUDON",
"level": 27,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

84
data/dungeon/MarvelousSea/pokemon_found.json
View File

@@ -4,32 +4,32 @@
"name": "pokemon_found_out502",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 3000
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 3000
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -39,37 +39,37 @@
"name": "pokemon_found_out503",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 1538
},
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1539
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 2308
},
{
"species": "SPECIES_SHELLDER",
"species": "MONSTER_SHELLDER",
"level": 25,
"probability": 2307
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 2308
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -79,32 +79,32 @@
"name": "pokemon_found_out504",
"pokemon": [
{
"species": "SPECIES_TENTACOOL",
"species": "MONSTER_TENTACOOL",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 3000
},
{
"species": "SPECIES_OMANYTE",
"species": "MONSTER_OMANYTE",
"level": 30,
"probability": 3000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -114,32 +114,32 @@
"name": "pokemon_found_out505",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 3000
},
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 3000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,37 +149,37 @@
"name": "pokemon_found_out506",
"pokemon": [
{
"species": "SPECIES_SLOWPOKE",
"species": "MONSTER_SLOWPOKE",
"level": 25,
"probability": 1538
},
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 30,
"probability": 2308
},
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 1539
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 2307
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 2308
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -189,27 +189,27 @@
"name": "pokemon_found_out507",
"pokemon": [
{
"species": "SPECIES_REMORAID",
"species": "MONSTER_REMORAID",
"level": 28,
"probability": 2500
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 3750
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SPHEAL",
"species": "MONSTER_SPHEAL",
"level": 22,
"probability": 3750
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -219,27 +219,27 @@
"name": "pokemon_found_out508",
"pokemon": [
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 32,
"probability": 2857
},
{
"species": "SPECIES_OMASTAR",
"species": "MONSTER_OMASTAR",
"level": 35,
"probability": 2857
},
{
"species": "SPECIES_ANORITH",
"species": "MONSTER_ANORITH",
"level": 26,
"probability": 4286
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

22
data/dungeon/MeteorCave/pokemon_found.json
View File

@@ -4,27 +4,27 @@
"name": "pokemon_found_out161",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DEOXYS_ATTACK",
"species": "MONSTER_DEOXYS_ATTACK",
"level": 35,
"probability": 3333
},
{
"species": "SPECIES_DEOXYS_DEFENSE",
"species": "MONSTER_DEOXYS_DEFENSE",
"level": 35,
"probability": 3334
},
{
"species": "SPECIES_DEOXYS_SPEED",
"species": "MONSTER_DEOXYS_SPEED",
"level": 35,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -34,32 +34,32 @@
"name": "pokemon_found_out162",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DEOXYS_NORMAL",
"species": "MONSTER_DEOXYS_NORMAL",
"level": 35,
"probability": 10000
},
{
"species": "SPECIES_DEOXYS_ATTACK",
"species": "MONSTER_DEOXYS_ATTACK",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_DEOXYS_DEFENSE",
"species": "MONSTER_DEOXYS_DEFENSE",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_DEOXYS_SPEED",
"species": "MONSTER_DEOXYS_SPEED",
"level": 35,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

76
data/dungeon/MtBlaze/pokemon_found.json
View File

@@ -2,32 +2,32 @@
"tables": [{
"name": "MtBlaze_1F_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 2857
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 1429
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 2857
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -37,27 +37,27 @@
"name": "MtBlaze_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2000
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -66,32 +66,32 @@
}, {
"name": "MtBlaze_5F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1304
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 1739
},
{
"species": "SPECIES_MAGBY",
"species": "MONSTER_MAGBY",
"level": 17,
"probability": 3479
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 3478
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -99,27 +99,27 @@
}, {
"name": "MtBlaze_6F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2667
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 5333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -127,27 +127,27 @@
}, {
"name": "MtBlaze_7F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2667
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 5333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -156,32 +156,32 @@
"name": "MtBlaze_8F_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 10,
"probability": 3478
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1305
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 1739
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 3478
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -190,27 +190,27 @@
"name": "MtBlaze_10F_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 10,
"probability": 4000
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2000
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

14
data/dungeon/MtBlazePeak/pokemon_found.json
View File

@@ -2,22 +2,22 @@
"tables": [{
"name": "MtBlazePeak_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_ARCANINE",
"species": "MONSTER_ARCANINE",
"level": 18,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -26,17 +26,17 @@
"name": "MtBlazePeak_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_MOLTRES",
"species": "MONSTER_MOLTRES",
"level": 32,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

138
data/dungeon/MtFaraway/pokemon_found.json
View File

@@ -4,27 +4,27 @@
"name": "pokemon_found_out715",
"pokemon": [
{
"species": "SPECIES_HITMONCHAN",
"species": "MONSTER_HITMONCHAN",
"level": 22,
"probability": 3333
},
{
"species": "SPECIES_LUNATONE",
"species": "MONSTER_LUNATONE",
"level": 24,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -34,27 +34,27 @@
"name": "pokemon_found_out716",
"pokemon": [
{
"species": "SPECIES_HITMONCHAN",
"species": "MONSTER_HITMONCHAN",
"level": 22,
"probability": 3333
},
{
"species": "SPECIES_SOLROCK",
"species": "MONSTER_SOLROCK",
"level": 24,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -64,42 +64,42 @@
"name": "pokemon_found_out717",
"pokemon": [
{
"species": "SPECIES_GOLEM",
"species": "MONSTER_GOLEM",
"level": 15,
"probability": 1333
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 3334
},
{
"species": "SPECIES_MARSHTOMP",
"species": "MONSTER_MARSHTOMP",
"level": 28,
"probability": 1333
},
{
"species": "SPECIES_VIGOROTH",
"species": "MONSTER_VIGOROTH",
"level": 45,
"probability": 1333
},
{
"species": "SPECIES_SOLROCK",
"species": "MONSTER_SOLROCK",
"level": 24,
"probability": 1334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 1333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -109,37 +109,37 @@
"name": "pokemon_found_out718",
"pokemon": [
{
"species": "SPECIES_GOLEM",
"species": "MONSTER_GOLEM",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_MARSHTOMP",
"species": "MONSTER_MARSHTOMP",
"level": 28,
"probability": 2000
},
{
"species": "SPECIES_VIGOROTH",
"species": "MONSTER_VIGOROTH",
"level": 45,
"probability": 2000
},
{
"species": "SPECIES_SOLROCK",
"species": "MONSTER_SOLROCK",
"level": 24,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -149,27 +149,27 @@
"name": "pokemon_found_out719",
"pokemon": [
{
"species": "SPECIES_GOLEM",
"species": "MONSTER_GOLEM",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_MARSHTOMP",
"species": "MONSTER_MARSHTOMP",
"level": 28,
"probability": 3334
},
{
"species": "SPECIES_VIGOROTH",
"species": "MONSTER_VIGOROTH",
"level": 45,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -179,27 +179,27 @@
"name": "pokemon_found_out720",
"pokemon": [
{
"species": "SPECIES_PARASECT",
"species": "MONSTER_PARASECT",
"level": 30,
"probability": 2759
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 6896
},
{
"species": "SPECIES_CASTFORM",
"species": "MONSTER_CASTFORM",
"level": 50,
"probability": 345
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -209,27 +209,27 @@
"name": "pokemon_found_out721",
"pokemon": [
{
"species": "SPECIES_PARASECT",
"species": "MONSTER_PARASECT",
"level": 30,
"probability": 4706
},
{
"species": "SPECIES_GRANBULL",
"species": "MONSTER_GRANBULL",
"level": 23,
"probability": 4706
},
{
"species": "SPECIES_CASTFORM",
"species": "MONSTER_CASTFORM",
"level": 50,
"probability": 588
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -239,42 +239,42 @@
"name": "pokemon_found_out722",
"pokemon": [
{
"species": "SPECIES_DUGTRIO",
"species": "MONSTER_DUGTRIO",
"level": 20,
"probability": 1403
},
{
"species": "SPECIES_WEEZING",
"species": "MONSTER_WEEZING",
"level": 20,
"probability": 878
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 1403
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 3509
},
{
"species": "SPECIES_GRANBULL",
"species": "MONSTER_GRANBULL",
"level": 23,
"probability": 1403
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 45,
"probability": 1404
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -284,32 +284,32 @@
"name": "pokemon_found_out723",
"pokemon": [
{
"species": "SPECIES_DUGTRIO",
"species": "MONSTER_DUGTRIO",
"level": 20,
"probability": 2759
},
{
"species": "SPECIES_WEEZING",
"species": "MONSTER_WEEZING",
"level": 20,
"probability": 1724
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 2758
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 45,
"probability": 2759
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -319,37 +319,37 @@
"name": "pokemon_found_out724",
"pokemon": [
{
"species": "SPECIES_DUGTRIO",
"species": "MONSTER_DUGTRIO",
"level": 20,
"probability": 1633
},
{
"species": "SPECIES_WEEZING",
"species": "MONSTER_WEEZING",
"level": 20,
"probability": 1020
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 1633
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 4081
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 45,
"probability": 1633
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -359,27 +359,27 @@
"name": "pokemon_found_out725",
"pokemon": [
{
"species": "SPECIES_DUGTRIO",
"species": "MONSTER_DUGTRIO",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 45,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -389,17 +389,17 @@
"name": "pokemon_found_out726",
"pokemon": [
{
"species": "SPECIES_HO_OH",
"species": "MONSTER_HO_OH",
"level": 50,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

74
data/dungeon/MtFreeze/pokemon_found.json
View File

@@ -3,27 +3,27 @@
"name": "MtFreeze_1F_2F_Pokemon",
"pokemon": [
{
"species": "SPECIES_PINECO",
"species": "MONSTER_PINECO",
"level": 18,
"probability": 1111
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 18,
"probability": 4445
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"species": "MONSTER_SHELGON",
"level": 19,
"probability": 4444
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -32,37 +32,37 @@
"name": "MtFreeze_3F_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2759
},
{
"species": "SPECIES_PINECO",
"species": "MONSTER_PINECO",
"level": 18,
"probability": 689
},
{
"species": "SPECIES_PUPITAR",
"species": "MONSTER_PUPITAR",
"level": 17,
"probability": 1035
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 18,
"probability": 2758
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"species": "MONSTER_SHELGON",
"level": 19,
"probability": 2759
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -71,27 +71,27 @@
"name": "MtFreeze_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 3333
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 18,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"species": "MONSTER_SHELGON",
"level": 19,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -100,32 +100,32 @@
"name": "MtFreeze_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"species": "MONSTER_SEEL",
"level": 18,
"probability": 2857
},
{
"species": "SPECIES_VIGOROTH",
"species": "MONSTER_VIGOROTH",
"level": 20,
"probability": 2857
},
{
"species": "SPECIES_ZANGOOSE",
"species": "MONSTER_ZANGOOSE",
"level": 18,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"species": "MONSTER_CHIMECHO",
"level": 22,
"probability": 1429
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -134,27 +134,27 @@
"name": "MtFreeze_8F_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VIGOROTH",
"species": "MONSTER_VIGOROTH",
"level": 20,
"probability": 4000
},
{
"species": "SPECIES_ZANGOOSE",
"species": "MONSTER_ZANGOOSE",
"level": 18,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"species": "MONSTER_CHIMECHO",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -163,27 +163,27 @@
"name": "MtFreeze_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLAKING",
"species": "MONSTER_SLAKING",
"level": 15,
"probability": 4000
},
{
"species": "SPECIES_ZANGOOSE",
"species": "MONSTER_ZANGOOSE",
"level": 18,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"species": "MONSTER_CHIMECHO",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -192,22 +192,22 @@
"name": "MtFreeze_13F_15F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLAKING",
"species": "MONSTER_SLAKING",
"level": 15,
"probability": 5000
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 19,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

18
data/dungeon/MtFreezePeak/pokemon_found.json
View File

@@ -3,17 +3,17 @@
"name": "MtFreezePeak_1F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 20,
"probability": 10000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -22,32 +22,32 @@
"name": "MtFreezePeak_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_CHARIZARD",
"species": "MONSTER_CHARIZARD",
"level": 55,
"probability": 0
},
{
"species": "SPECIES_ALAKAZAM",
"species": "MONSTER_ALAKAZAM",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_TYRANITAR",
"species": "MONSTER_TYRANITAR",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"species": "MONSTER_GLALIE",
"level": 20,
"probability": 10000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

68
data/dungeon/MtSteel/pokemon_found.json
View File

@@ -2,32 +2,32 @@
"tables": [{
"name": "MtSteel_1F_4F_Pokemon",
"pokemon": [{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 4,
"probability": 2353
},
{
"species": "SPECIES_ZIGZAGOON",
"species": "MONSTER_ZIGZAGOON",
"level": 5,
"probability": 2353
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 2941
},
{
"species": "SPECIES_BALTOY",
"species": "MONSTER_BALTOY",
"level": 5,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -35,37 +35,37 @@
}, {
"name": "MtSteel_5F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"species": "MONSTER_GEODUDE",
"level": 5,
"probability": 1905
},
{
"species": "SPECIES_TYROGUE",
"species": "MONSTER_TYROGUE",
"level": 6,
"probability": 1905
},
{
"species": "SPECIES_ZIGZAGOON",
"species": "MONSTER_ZIGZAGOON",
"level": 5,
"probability": 1904
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 2381
},
{
"species": "SPECIES_MEDITITE",
"species": "MONSTER_MEDITITE",
"level": 6,
"probability": 1905
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -73,37 +73,37 @@
}, {
"name": "MtSteel_6F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"species": "MONSTER_GEODUDE",
"level": 5,
"probability": 2051
},
{
"species": "SPECIES_TYROGUE",
"species": "MONSTER_TYROGUE",
"level": 6,
"probability": 2052
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 2564
},
{
"species": "SPECIES_MEDITITE",
"species": "MONSTER_MEDITITE",
"level": 6,
"probability": 2051
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"species": "MONSTER_BELDUM",
"level": 5,
"probability": 1282
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -111,42 +111,42 @@
}, {
"name": "MtSteel_7F_8F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"species": "MONSTER_GEODUDE",
"level": 5,
"probability": 1633
},
{
"species": "SPECIES_PINSIR",
"species": "MONSTER_PINSIR",
"level": 6,
"probability": 2040
},
{
"species": "SPECIES_TYROGUE",
"species": "MONSTER_TYROGUE",
"level": 6,
"probability": 1633
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 2041
},
{
"species": "SPECIES_MEDITITE",
"species": "MONSTER_MEDITITE",
"level": 6,
"probability": 1633
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"species": "MONSTER_BELDUM",
"level": 5,
"probability": 1020
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,32 +154,32 @@
}, {
"name": "MtSteel_9F_Pokemon",
"pokemon": [{
"species": "SPECIES_DIGLETT",
"species": "MONSTER_DIGLETT",
"level": 5,
"probability": 0
},
{
"species": "SPECIES_SKARMORY",
"species": "MONSTER_SKARMORY",
"level": 10,
"probability": 0
},
{
"species": "SPECIES_ARON",
"species": "MONSTER_ARON",
"level": 6,
"probability": 6667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"species": "MONSTER_BELDUM",
"level": 5,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

106
data/dungeon/MtThunder/pokemon_found.json
View File

@@ -3,32 +3,32 @@
"name": "MtThunder_1F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"species": "MONSTER_WEEDLE",
"level": 8,
"probability": 1875
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 3125
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 3125
},
{
"species": "SPECIES_CACNEA",
"species": "MONSTER_CACNEA",
"level": 11,
"probability": 1875
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -37,37 +37,37 @@
"name": "MtThunder_2F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"species": "MONSTER_WEEDLE",
"level": 8,
"probability": 1429
},
{
"species": "SPECIES_PIDGEOTTO",
"species": "MONSTER_PIDGEOTTO",
"level": 11,
"probability": 2381
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 2380
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 2381
},
{
"species": "SPECIES_CACNEA",
"species": "MONSTER_CACNEA",
"level": 11,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -76,32 +76,32 @@
"name": "MtThunder_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 1333
},
{
"species": "SPECIES_PIDGEOTTO",
"species": "MONSTER_PIDGEOTTO",
"level": 11,
"probability": 3334
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 2666
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 9,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -110,32 +110,32 @@
"name": "MtThunder_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 1538
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 3077
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 2308
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 9,
"probability": 3077
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -144,37 +144,37 @@
"name": "MtThunder_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 1111
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 2222
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 1667
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2778
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 9,
"probability": 2222
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -183,42 +183,42 @@
"name": "MtThunder_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 870
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 1739
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 1304
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2174
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 9,
"probability": 1739
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 9,
"probability": 2174
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -227,37 +227,37 @@
"name": "MtThunder_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GROWLITHE",
"species": "MONSTER_GROWLITHE",
"level": 10,
"probability": 1905
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 1428
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2381
},
{
"species": "SPECIES_STANTLER",
"species": "MONSTER_STANTLER",
"level": 9,
"probability": 1905
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 9,
"probability": 2381
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -266,32 +266,32 @@
"name": "MtThunder_10F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GROWLITHE",
"species": "MONSTER_GROWLITHE",
"level": 10,
"probability": 2353
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 1765
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2941
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 9,
"probability": 2941
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

20
data/dungeon/MtThunderPeak/pokemon_found.json
View File

@@ -2,37 +2,37 @@
"tables": [{
"name": "MtThunderPeak_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_GROWLITHE",
"species": "MONSTER_GROWLITHE",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_GLIGAR",
"species": "MONSTER_GLIGAR",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_MANECTRIC",
"species": "MONSTER_MANECTRIC",
"level": 9,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -40,17 +40,17 @@
}, {
"name": "MtThunderPeak_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_ZAPDOS",
"species": "MONSTER_ZAPDOS",
"level": 25,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

138
data/dungeon/MurkyCave/pokemon_found.json
View File

@@ -4,32 +4,32 @@
"name": "pokemon_found_out449",
"pokemon": [
{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 3077
},
{
"species": "SPECIES_VENONAT",
"species": "MONSTER_VENONAT",
"level": 17,
"probability": 2308
},
{
"species": "SPECIES_CASCOON",
"species": "MONSTER_CASCOON",
"level": 8,
"probability": 2307
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 19,
"probability": 2308
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -39,37 +39,37 @@
"name": "pokemon_found_out450",
"pokemon": [
{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 2353
},
{
"species": "SPECIES_VENONAT",
"species": "MONSTER_VENONAT",
"level": 17,
"probability": 1765
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 2353
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 1764
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 19,
"probability": 1765
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -79,42 +79,42 @@
"name": "pokemon_found_out451",
"pokemon": [
{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 2000
},
{
"species": "SPECIES_VENONAT",
"species": "MONSTER_VENONAT",
"level": 17,
"probability": 1500
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_CASCOON",
"species": "MONSTER_CASCOON",
"level": 8,
"probability": 1500
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 1500
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 19,
"probability": 1500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -124,27 +124,27 @@
"name": "pokemon_found_out452",
"pokemon": [
{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 3636
},
{
"species": "SPECIES_GRIMER",
"species": "MONSTER_GRIMER",
"level": 20,
"probability": 3637
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 2727
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,27 +154,27 @@
"name": "pokemon_found_out453",
"pokemon": [
{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 4000
},
{
"species": "SPECIES_CASCOON",
"species": "MONSTER_CASCOON",
"level": 8,
"probability": 3000
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 3000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -184,32 +184,32 @@
"name": "pokemon_found_out454",
"pokemon": [
{
"species": "SPECIES_GOLBAT",
"species": "MONSTER_GOLBAT",
"level": 10,
"probability": 3077
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 2308
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 2307
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 2308
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -219,37 +219,37 @@
"name": "pokemon_found_out455",
"pokemon": [
{
"species": "SPECIES_CROBAT",
"species": "MONSTER_CROBAT",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_CASCOON",
"species": "MONSTER_CASCOON",
"level": 8,
"probability": 1875
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 1875
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 1875
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 1875
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -259,32 +259,32 @@
"name": "pokemon_found_out456",
"pokemon": [
{
"species": "SPECIES_CROBAT",
"species": "MONSTER_CROBAT",
"level": 24,
"probability": 3077
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 2308
},
{
"species": "SPECIES_SHEDINJA",
"species": "MONSTER_SHEDINJA",
"level": 5,
"probability": 2307
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 2308
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -294,32 +294,32 @@
"name": "pokemon_found_out457",
"pokemon": [
{
"species": "SPECIES_CROBAT",
"species": "MONSTER_CROBAT",
"level": 24,
"probability": 3077
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 2308
},
{
"species": "SPECIES_DUSTOX",
"species": "MONSTER_DUSTOX",
"level": 10,
"probability": 2307
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 2308
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -329,37 +329,37 @@
"name": "pokemon_found_out458",
"pokemon": [
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 2353
},
{
"species": "SPECIES_CROBAT",
"species": "MONSTER_CROBAT",
"level": 24,
"probability": 2353
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 1765
},
{
"species": "SPECIES_SWALOT",
"species": "MONSTER_SWALOT",
"level": 34,
"probability": 1764
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHUPPET",
"species": "MONSTER_SHUPPET",
"level": 28,
"probability": 1765
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -369,32 +369,32 @@
"name": "pokemon_found_out459",
"pokemon": [
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 2857
},
{
"species": "SPECIES_CROBAT",
"species": "MONSTER_CROBAT",
"level": 24,
"probability": 2857
},
{
"species": "SPECIES_MISDREAVUS",
"species": "MONSTER_MISDREAVUS",
"level": 25,
"probability": 2143
},
{
"species": "SPECIES_SWALOT",
"species": "MONSTER_SWALOT",
"level": 34,
"probability": 2143
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

142
data/dungeon/NorthernRange/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out327",
"pokemon": [
{
"species": "SPECIES_DODRIO",
"species": "MONSTER_DODRIO",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_HOOTHOOT",
"species": "MONSTER_HOOTHOOT",
"level": 36,
"probability": 2000
},
{
"species": "SPECIES_JUMPLUFF",
"species": "MONSTER_JUMPLUFF",
"level": 40,
"probability": 2000
},
{
"species": "SPECIES_BEAUTIFLY",
"species": "MONSTER_BEAUTIFLY",
"level": 36,
"probability": 2000
},
{
"species": "SPECIES_NINJASK",
"species": "MONSTER_NINJASK",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -44,37 +44,37 @@
"name": "pokemon_found_out328",
"pokemon": [
{
"species": "SPECIES_DODRIO",
"species": "MONSTER_DODRIO",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_SPINARAK",
"species": "MONSTER_SPINARAK",
"level": 34,
"probability": 2000
},
{
"species": "SPECIES_JUMPLUFF",
"species": "MONSTER_JUMPLUFF",
"level": 40,
"probability": 2000
},
{
"species": "SPECIES_BEAUTIFLY",
"species": "MONSTER_BEAUTIFLY",
"level": 36,
"probability": 2000
},
{
"species": "SPECIES_NINJASK",
"species": "MONSTER_NINJASK",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -84,37 +84,37 @@
"name": "pokemon_found_out329",
"pokemon": [
{
"species": "SPECIES_DODRIO",
"species": "MONSTER_DODRIO",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_SPINARAK",
"species": "MONSTER_SPINARAK",
"level": 34,
"probability": 2000
},
{
"species": "SPECIES_JUMPLUFF",
"species": "MONSTER_JUMPLUFF",
"level": 40,
"probability": 2000
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_NINJASK",
"species": "MONSTER_NINJASK",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -124,27 +124,27 @@
"name": "pokemon_found_out330",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_SPINARAK",
"species": "MONSTER_SPINARAK",
"level": 34,
"probability": 3334
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,27 +154,27 @@
"name": "pokemon_found_out331",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_LEDIAN",
"species": "MONSTER_LEDIAN",
"level": 31,
"probability": 3334
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -184,27 +184,27 @@
"name": "pokemon_found_out332",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_LEDIAN",
"species": "MONSTER_LEDIAN",
"level": 31,
"probability": 3334
},
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -214,27 +214,27 @@
"name": "pokemon_found_out333",
"pokemon": [
{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 30,
"probability": 3333
},
{
"species": "SPECIES_LEDIAN",
"species": "MONSTER_LEDIAN",
"level": 31,
"probability": 3334
},
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -244,32 +244,32 @@
"name": "pokemon_found_out334",
"pokemon": [
{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_LEDIAN",
"species": "MONSTER_LEDIAN",
"level": 31,
"probability": 2500
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -279,32 +279,32 @@
"name": "pokemon_found_out335",
"pokemon": [
{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -314,37 +314,37 @@
"name": "pokemon_found_out336",
"pokemon": [
{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 30,
"probability": 2000
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_XATU",
"species": "MONSTER_XATU",
"level": 27,
"probability": 2000
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -354,32 +354,32 @@
"name": "pokemon_found_out337",
"pokemon": [
{
"species": "SPECIES_FEAROW",
"species": "MONSTER_FEAROW",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_NOCTOWL",
"species": "MONSTER_NOCTOWL",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -389,27 +389,27 @@
"name": "pokemon_found_out338",
"pokemon": [
{
"species": "SPECIES_SEVIPER",
"species": "MONSTER_SEVIPER",
"level": 25,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_LATIAS",
"species": "MONSTER_LATIAS",
"level": 28,
"probability": 5000
},
{
"species": "SPECIES_LATIOS",
"species": "MONSTER_LATIOS",
"level": 30,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

192
data/dungeon/NorthwindField/pokemon_found.json
View File

@@ -4,27 +4,27 @@
"name": "pokemon_found_out395",
"pokemon": [
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 50,
"probability": 3333
},
{
"species": "SPECIES_JYNX",
"species": "MONSTER_JYNX",
"level": 32,
"probability": 3334
},
{
"species": "SPECIES_VOLBEAT",
"species": "MONSTER_VOLBEAT",
"level": 28,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -34,32 +34,32 @@
"name": "pokemon_found_out396",
"pokemon": [
{
"species": "SPECIES_POLIWAG",
"species": "MONSTER_POLIWAG",
"level": 50,
"probability": 2667
},
{
"species": "SPECIES_JYNX",
"species": "MONSTER_JYNX",
"level": 32,
"probability": 2666
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 2000
},
{
"species": "SPECIES_VOLBEAT",
"species": "MONSTER_VOLBEAT",
"level": 28,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -69,32 +69,32 @@
"name": "pokemon_found_out397",
"pokemon": [
{
"species": "SPECIES_JYNX",
"species": "MONSTER_JYNX",
"level": 32,
"probability": 2667
},
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 2000
},
{
"species": "SPECIES_VOLBEAT",
"species": "MONSTER_VOLBEAT",
"level": 28,
"probability": 2666
},
{
"species": "SPECIES_CRAWDAUNT",
"species": "MONSTER_CRAWDAUNT",
"level": 30,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -104,22 +104,22 @@
"name": "pokemon_found_out398",
"pokemon": [
{
"species": "SPECIES_AZUMARILL",
"species": "MONSTER_AZUMARILL",
"level": 24,
"probability": 4286
},
{
"species": "SPECIES_CRAWDAUNT",
"species": "MONSTER_CRAWDAUNT",
"level": 30,
"probability": 5714
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -129,22 +129,22 @@
"name": "pokemon_found_out399",
"pokemon": [
{
"species": "SPECIES_DELCATTY",
"species": "MONSTER_DELCATTY",
"level": 25,
"probability": 5000
},
{
"species": "SPECIES_CRAWDAUNT",
"species": "MONSTER_CRAWDAUNT",
"level": 30,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,32 +154,32 @@
"name": "pokemon_found_out400",
"pokemon": [
{
"species": "SPECIES_POLIWHIRL",
"species": "MONSTER_POLIWHIRL",
"level": 28,
"probability": 3200
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 400
},
{
"species": "SPECIES_DELCATTY",
"species": "MONSTER_DELCATTY",
"level": 25,
"probability": 3200
},
{
"species": "SPECIES_CRAWDAUNT",
"species": "MONSTER_CRAWDAUNT",
"level": 30,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -189,22 +189,22 @@
"name": "pokemon_found_out401",
"pokemon": [
{
"species": "SPECIES_POLIWHIRL",
"species": "MONSTER_POLIWHIRL",
"level": 28,
"probability": 5000
},
{
"species": "SPECIES_DELCATTY",
"species": "MONSTER_DELCATTY",
"level": 25,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -214,22 +214,22 @@
"name": "pokemon_found_out402",
"pokemon": [
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 3333
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 6667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -239,27 +239,27 @@
"name": "pokemon_found_out403",
"pokemon": [
{
"species": "SPECIES_POLIWRATH",
"species": "MONSTER_POLIWRATH",
"level": 30,
"probability": 4000
},
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 2000
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -269,32 +269,32 @@
"name": "pokemon_found_out404",
"pokemon": [
{
"species": "SPECIES_POLIWRATH",
"species": "MONSTER_POLIWRATH",
"level": 30,
"probability": 3810
},
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 1904
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 476
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 3810
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -304,32 +304,32 @@
"name": "pokemon_found_out405",
"pokemon": [
{
"species": "SPECIES_GOLDUCK",
"species": "MONSTER_GOLDUCK",
"level": 24,
"probability": 2857
},
{
"species": "SPECIES_POLIWRATH",
"species": "MONSTER_POLIWRATH",
"level": 30,
"probability": 2857
},
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 1429
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -339,32 +339,32 @@
"name": "pokemon_found_out406",
"pokemon": [
{
"species": "SPECIES_GOLDUCK",
"species": "MONSTER_GOLDUCK",
"level": 24,
"probability": 2857
},
{
"species": "SPECIES_MUK",
"species": "MONSTER_MUK",
"level": 36,
"probability": 1429
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 2857
},
{
"species": "SPECIES_DELIBIRD",
"species": "MONSTER_DELIBIRD",
"level": 26,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -374,22 +374,22 @@
"name": "pokemon_found_out407",
"pokemon": [
{
"species": "SPECIES_GOLDUCK",
"species": "MONSTER_GOLDUCK",
"level": 24,
"probability": 5000
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -399,42 +399,42 @@
"name": "pokemon_found_out408",
"pokemon": [
{
"species": "SPECIES_WARTORTLE",
"species": "MONSTER_WARTORTLE",
"level": 30,
"probability": 2424
},
{
"species": "SPECIES_GOLDUCK",
"species": "MONSTER_GOLDUCK",
"level": 24,
"probability": 2424
},
{
"species": "SPECIES_VAPOREON",
"species": "MONSTER_VAPOREON",
"level": 22,
"probability": 304
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 2424
},
{
"species": "SPECIES_FERALIGATR",
"species": "MONSTER_FERALIGATR",
"level": 60,
"probability": 0
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -444,42 +444,42 @@
"name": "pokemon_found_out409",
"pokemon": [
{
"species": "SPECIES_WARTORTLE",
"species": "MONSTER_WARTORTLE",
"level": 30,
"probability": 2353
},
{
"species": "SPECIES_GOLDUCK",
"species": "MONSTER_GOLDUCK",
"level": 24,
"probability": 2353
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 2353
},
{
"species": "SPECIES_FERALIGATR",
"species": "MONSTER_FERALIGATR",
"level": 60,
"probability": 0
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_ABSOL",
"species": "MONSTER_ABSOL",
"level": 45,
"probability": 588
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -489,37 +489,37 @@
"name": "pokemon_found_out410",
"pokemon": [
{
"species": "SPECIES_WARTORTLE",
"species": "MONSTER_WARTORTLE",
"level": 30,
"probability": 3077
},
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 3077
},
{
"species": "SPECIES_FERALIGATR",
"species": "MONSTER_FERALIGATR",
"level": 60,
"probability": 0
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 3077
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_ABSOL",
"species": "MONSTER_ABSOL",
"level": 45,
"probability": 769
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -529,37 +529,37 @@
"name": "pokemon_found_out411",
"pokemon": [
{
"species": "SPECIES_CROCONAW",
"species": "MONSTER_CROCONAW",
"level": 28,
"probability": 0
},
{
"species": "SPECIES_FERALIGATR",
"species": "MONSTER_FERALIGATR",
"level": 60,
"probability": 0
},
{
"species": "SPECIES_POLITOED",
"species": "MONSTER_POLITOED",
"level": 28,
"probability": 0
},
{
"species": "SPECIES_SUICUNE",
"species": "MONSTER_SUICUNE",
"level": 45,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_ABSOL",
"species": "MONSTER_ABSOL",
"level": 45,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

128
data/dungeon/OddityCave/pokemon_found.json
View File

@@ -4,42 +4,42 @@
"name": "pokemon_found_out481",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"species": "MONSTER_WEEDLE",
"level": 8,
"probability": 1111
},
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 2222
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 2223
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 555
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 2222
},
{
"species": "SPECIES_CACNEA",
"species": "MONSTER_CACNEA",
"level": 13,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -49,47 +49,47 @@
"name": "pokemon_found_out482",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"species": "MONSTER_WEEDLE",
"level": 8,
"probability": 909
},
{
"species": "SPECIES_BEEDRILL",
"species": "MONSTER_BEEDRILL",
"level": 10,
"probability": 1818
},
{
"species": "SPECIES_NIDORAN_M",
"species": "MONSTER_NIDORAN_M",
"level": 12,
"probability": 1818
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 1819
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 454
},
{
"species": "SPECIES_ELECTRIKE",
"species": "MONSTER_ELECTRIKE",
"level": 12,
"probability": 1818
},
{
"species": "SPECIES_CACNEA",
"species": "MONSTER_CACNEA",
"level": 13,
"probability": 1364
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -99,32 +99,32 @@
"name": "pokemon_found_out483",
"pokemon": [
{
"species": "SPECIES_PIDGEOTTO",
"species": "MONSTER_PIDGEOTTO",
"level": 11,
"probability": 3077
},
{
"species": "SPECIES_ELECTABUZZ",
"species": "MONSTER_ELECTABUZZ",
"level": 12,
"probability": 3077
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 769
},
{
"species": "SPECIES_AMPHAROS",
"species": "MONSTER_AMPHAROS",
"level": 13,
"probability": 3077
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -134,32 +134,32 @@
"name": "pokemon_found_out484",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1176
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1765
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2353
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 4706
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -169,32 +169,32 @@
"name": "pokemon_found_out485",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1176
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1765
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 2353
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 4706
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -204,37 +204,37 @@
"name": "pokemon_found_out486",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 16,
"probability": 3200
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 800
},
{
"species": "SPECIES_SHUCKLE",
"species": "MONSTER_SHUCKLE",
"level": 15,
"probability": 1200
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 1600
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -244,32 +244,32 @@
"name": "pokemon_found_out487",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"species": "MONSTER_RAPIDASH",
"level": 16,
"probability": 3636
},
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 909
},
{
"species": "SPECIES_SLUGMA",
"species": "MONSTER_SLUGMA",
"level": 16,
"probability": 1819
},
{
"species": "SPECIES_TORKOAL",
"species": "MONSTER_TORKOAL",
"level": 15,
"probability": 3636
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -279,27 +279,27 @@
"name": "pokemon_found_out488",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_PILOSWINE",
"species": "MONSTER_PILOSWINE",
"level": 16,
"probability": 3750
},
{
"species": "SPECIES_NOSEPASS",
"species": "MONSTER_NOSEPASS",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -309,27 +309,27 @@
"name": "pokemon_found_out489",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 1111
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 17,
"probability": 4445
},
{
"species": "SPECIES_LAIRON",
"species": "MONSTER_LAIRON",
"level": 17,
"probability": 4444
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -339,32 +339,32 @@
"name": "pokemon_found_out490",
"pokemon": [
{
"species": "SPECIES_DITTO",
"species": "MONSTER_DITTO",
"level": 25,
"probability": 870
},
{
"species": "SPECIES_MIGHTYENA",
"species": "MONSTER_MIGHTYENA",
"level": 17,
"probability": 3478
},
{
"species": "SPECIES_LAIRON",
"species": "MONSTER_LAIRON",
"level": 17,
"probability": 3478
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"species": "MONSTER_SNORUNT",
"level": 20,
"probability": 2174
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

122
data/dungeon/PitfallValley/pokemon_found.json
View File

@@ -4,32 +4,32 @@
"name": "pokemon_found_out317",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 2500
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 30,
"probability": 2500
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -39,52 +39,52 @@
"name": "pokemon_found_out318",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1250
},
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 1250
},
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 1250
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 30,
"probability": 1250
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 25,
"probability": 1250
},
{
"species": "SPECIES_HOPPIP",
"species": "MONSTER_HOPPIP",
"level": 8,
"probability": 1250
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 1250
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -94,42 +94,42 @@
"name": "pokemon_found_out319",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1667
},
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 25,
"probability": 1666
},
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 1667
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_HOPPIP",
"species": "MONSTER_HOPPIP",
"level": 8,
"probability": 1666
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -139,42 +139,42 @@
"name": "pokemon_found_out320",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1667
},
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 25,
"probability": 1666
},
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 1667
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 1666
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -184,32 +184,32 @@
"name": "pokemon_found_out321",
"pokemon": [
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_MASQUERAIN",
"species": "MONSTER_MASQUERAIN",
"level": 40,
"probability": 2500
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -219,27 +219,27 @@
"name": "pokemon_found_out322",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 3333
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 3334
},
{
"species": "SPECIES_MASQUERAIN",
"species": "MONSTER_MASQUERAIN",
"level": 40,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -249,32 +249,32 @@
"name": "pokemon_found_out323",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_AERODACTYL",
"species": "MONSTER_AERODACTYL",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -284,27 +284,27 @@
"name": "pokemon_found_out324",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 3333
},
{
"species": "SPECIES_AERODACTYL",
"species": "MONSTER_AERODACTYL",
"level": 25,
"probability": 3334
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -314,22 +314,22 @@
"name": "pokemon_found_out325",
"pokemon": [
{
"species": "SPECIES_AERODACTYL",
"species": "MONSTER_AERODACTYL",
"level": 25,
"probability": 5000
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -339,17 +339,17 @@
"name": "pokemon_found_out326",
"pokemon": [
{
"species": "SPECIES_AERODACTYL",
"species": "MONSTER_AERODACTYL",
"level": 25,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

1520
data/dungeon/PurityForest/pokemon_found.json
View File

File diff suppressed because it is too large Load Diff

162
data/dungeon/RemainsIsland/pokemon_found.json
View File

@@ -4,47 +4,47 @@
"name": "pokemon_found_out491",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 1429
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 30,
"probability": 1428
},
{
"species": "SPECIES_HOOTHOOT",
"species": "MONSTER_HOOTHOOT",
"level": 6,
"probability": 1429
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 25,
"probability": 1428
},
{
"species": "SPECIES_BEAUTIFLY",
"species": "MONSTER_BEAUTIFLY",
"level": 36,
"probability": 1429
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 1428
},
{
"species": "SPECIES_NINJASK",
"species": "MONSTER_NINJASK",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -54,47 +54,47 @@
"name": "pokemon_found_out492",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1429
},
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 1428
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 30,
"probability": 1429
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 25,
"probability": 1428
},
{
"species": "SPECIES_BEAUTIFLY",
"species": "MONSTER_BEAUTIFLY",
"level": 36,
"probability": 1429
},
{
"species": "SPECIES_SWELLOW",
"species": "MONSTER_SWELLOW",
"level": 20,
"probability": 1428
},
{
"species": "SPECIES_NINJASK",
"species": "MONSTER_NINJASK",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -104,47 +104,47 @@
"name": "pokemon_found_out493",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1429
},
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 1428
},
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_FARFETCHD",
"species": "MONSTER_FARFETCHD",
"level": 30,
"probability": 1428
},
{
"species": "SPECIES_LEDYBA",
"species": "MONSTER_LEDYBA",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_HOPPIP",
"species": "MONSTER_HOPPIP",
"level": 8,
"probability": 1428
},
{
"species": "SPECIES_BEAUTIFLY",
"species": "MONSTER_BEAUTIFLY",
"level": 36,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -154,42 +154,42 @@
"name": "pokemon_found_out494",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1667
},
{
"species": "SPECIES_RATICATE",
"species": "MONSTER_RATICATE",
"level": 25,
"probability": 1666
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_HOPPIP",
"species": "MONSTER_HOPPIP",
"level": 8,
"probability": 1667
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 1666
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -199,42 +199,42 @@
"name": "pokemon_found_out495",
"pokemon": [
{
"species": "SPECIES_BUTTERFREE",
"species": "MONSTER_BUTTERFREE",
"level": 35,
"probability": 1667
},
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 1666
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 1666
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -244,42 +244,42 @@
"name": "pokemon_found_out496",
"pokemon": [
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 1667
},
{
"species": "SPECIES_DODUO",
"species": "MONSTER_DODUO",
"level": 25,
"probability": 1666
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 1667
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 1667
},
{
"species": "SPECIES_MASQUERAIN",
"species": "MONSTER_MASQUERAIN",
"level": 40,
"probability": 1666
},
{
"species": "SPECIES_SWABLU",
"species": "MONSTER_SWABLU",
"level": 24,
"probability": 1667
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -289,37 +289,37 @@
"name": "pokemon_found_out497",
"pokemon": [
{
"species": "SPECIES_SPEAROW",
"species": "MONSTER_SPEAROW",
"level": 34,
"probability": 2000
},
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 2000
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 2000
},
{
"species": "SPECIES_MASQUERAIN",
"species": "MONSTER_MASQUERAIN",
"level": 40,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -329,32 +329,32 @@
"name": "pokemon_found_out498",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_WINGULL",
"species": "MONSTER_WINGULL",
"level": 23,
"probability": 2500
},
{
"species": "SPECIES_MASQUERAIN",
"species": "MONSTER_MASQUERAIN",
"level": 40,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -364,27 +364,27 @@
"name": "pokemon_found_out499",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 3333
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 3334
},
{
"species": "SPECIES_YANMA",
"species": "MONSTER_YANMA",
"level": 25,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -394,32 +394,32 @@
"name": "pokemon_found_out500",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"species": "MONSTER_SCYTHER",
"level": 32,
"probability": 2500
},
{
"species": "SPECIES_SPINARAK",
"species": "MONSTER_SPINARAK",
"level": 11,
"probability": 2500
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}
@@ -429,32 +429,32 @@
"name": "pokemon_found_out501",
"pokemon": [
{
"species": "SPECIES_DODRIO",
"species": "MONSTER_DODRIO",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SPINARAK",
"species": "MONSTER_SPINARAK",
"level": 11,
"probability": 2500
},
{
"species": "SPECIES_TOGETIC",
"species": "MONSTER_TOGETIC",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_SKIPLOOM",
"species": "MONSTER_SKIPLOOM",
"level": 25,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

14
data/dungeon/RockPath/pokemon_found.json
View File

@@ -4,37 +4,37 @@
"name": "pokemon_found_out521",
"pokemon": [
{
"species": "SPECIES_PIDGEOT",
"species": "MONSTER_PIDGEOT",
"level": 16,
"probability": 2857
},
{
"species": "SPECIES_NIDORINA",
"species": "MONSTER_NIDORINA",
"level": 15,
"probability": 1429
},
{
"species": "SPECIES_NIDORINO",
"species": "MONSTER_NIDORINO",
"level": 15,
"probability": 1428
},
{
"species": "SPECIES_ZUBAT",
"species": "MONSTER_ZUBAT",
"level": 17,
"probability": 2857
},
{
"species": "SPECIES_NUMEL",
"species": "MONSTER_NUMEL",
"level": 14,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"species": "MONSTER_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"species": "MONSTER_DECOY",
"level": 1,
"probability": 0
}

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