Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-03-21 17:46:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dungeon pokemon/Floor ID JSON Part 1 (#39)

Browse Source 
* move Thunderwave and Tiny Woods pokemon to json

* rule tweaking to actually build tool before parsing JSON

* delete .inc pokemon for tiny Woods and Thunderwave

* silence git complaining about br_ips and ips_patch

* use defines for species and pass the header file for species

* convert sinister woods

* convert MtThunderPeak

* convert silent chasm

* add trial floor_id w/ tiny woods

* change make rule name to fix compile

* MtSteel converted and bugfix

* convert few floor headers and great canyon pokemon

* code cleanup

* unify unkData into UnkTextStruct2

* more code cleanup and some text decomp

* doc more funcs and decomp/split some stuff

* document more save stuff

* more save work and move some data

* pika sniped UpdateNatureTotal

* decomp a litle and convert a few more dungeons

* better scanning for json files

* mt freeze and peak
This commit is contained in:
Seth Barberee 2021-06-09 22:54:21 -05:00 committed by GitHub
parent eaa141c612
commit 377bd14ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
152 changed files with 55612 additions and 52652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -55,6 +55,7 @@ MID2AGB := tools/mid2agb/mid2agb
PREPROC := tools/preproc/preproc
SCANINC := tools/scaninc/scaninc
RAMSCRGEN := tools/ramscrgen/ramscrgen
DUNGEONJSON := tools/dungeonjson/dungeonjson
TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
TOOLBASE = $(TOOLDIRS:tools/%=%)
@ -103,6 +104,7 @@ SUBDIRS := $(sort $(dir $(ALL_OBJECTS)))
LD_SCRIPT := $(BUILD_DIR)/ld_script.ld
# Special configurations required for lib files
$(C_BUILDDIR)/agb_flash.o : CC1FLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/agb_flash_1m.o: CC1FLAGS := -O -mthumb-interwork
@ -146,6 +148,9 @@ all: $(ROM)
tools: $(TOOLDIRS)
include dungeon_pokemon.mk
include dungeon_floor.mk
$(TOOLDIRS):
@$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX)
@ -169,7 +174,7 @@ $(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c $$(C_DEP)
@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(ASM_DEP)
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(ASM_DEP) dungeon_pokemon dungeon_floor
$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(ASM_DEP)
@ -183,10 +188,10 @@ $(LD_SCRIPT): ld_script.txt $(BUILD_DIR)/sym_ewram.ld $(BUILD_DIR)/sym_ewram2.ld
$(BUILD_DIR)/sym_%.ld: sym_%.txt
$(CPP) -P $(CPPFLAGS) $< | sed -e "s#tools/#../../tools/#g" > $@
$(ELF): $(LD_SCRIPT) $(ALL_OBJECTS) $(LIBC) libagbsyscall
$(ELF): $(LD_SCRIPT) $(ALL_OBJECTS) $(LIBC) libagbsyscall tools
cd $(BUILD_DIR) && $(LD) -T ld_script.ld -Map ../../$(MAP) -o ../../$@ $(LIB)
$(ROM): %.gba: $(ELF) tools
$(ROM): %.gba: $(ELF)
$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0xA000000 $< $@
$(GBAFIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

18
asm/code_2.s
View File

@ -923,7 +923,7 @@ _08000DAC:
bl sub_8001170
lsls r0, 24
lsrs r6, r0, 24
bl sub_8097758
bl IncrementNumAdventures
cmp r5, 0x9
bne _08000E00
ldr r4, _08000DF4
@ -1086,7 +1086,7 @@ sub_8000EDC:
beq _08000F68
ldr r0, [r4, 0x74]
ldr r1, [sp]
bl sub_801277C
bl PrepareQuickSaveRead
adds r7, r4, 0
adds r7, 0x7C
b _08000F2E
@ -1096,14 +1096,14 @@ _08000F28:
movs r0, 0
bl xxx_update_stuff
_08000F2E:
bl sub_80127A8
bl ReadQuickSave
lsls r0, 24
cmp r0, 0
bne _08000F28
bl sub_8012828
bl IsQuickSaveValid
lsls r0, 24
lsrs r5, r0, 24
bl sub_8012834
bl FinishQuickSaveRead
bl sub_8011830
cmp r5, 0
beq _08000F58
@ -1169,13 +1169,13 @@ _08000FB8:
ldr r0, [r4, 0x74]
ldr r1, [sp]
movs r2, 0x1
bl sub_8012850
bl PrepareQuickSaveWrite
b _08000FFA
_08000FD8:
ldr r0, [r4, 0x74]
ldr r1, [sp]
movs r2, 0
bl sub_8012850
bl PrepareQuickSaveWrite
b _08000FFA
_08000FE4:
cmp r0, 0x1
@ -1188,13 +1188,13 @@ _08000FF4:
movs r0, 0
bl xxx_update_stuff
_08000FFA:
bl sub_80128B0
bl WriteQuickSave
cmp r0, 0x2
beq _08001006
cmp r0, 0x3
bne _08000FE4
_08001006:
bl sub_80129FC
bl FinishQuickSaveWrite
b _0800101C
_0800100C:
bl sub_808ED00

2
asm/code_800D090.s
View File

@ -8732,7 +8732,7 @@ _08011406:
ldr r1, _0801147C
ldr r2, [r6]
add r0, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
_08014E78:
mov r4, sp
b _08014F0E
@ -4525,7 +4525,7 @@ _08014E84:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
mov r0, sp
ldrb r1, [r0]
cmp r1, 0
@ -4558,7 +4558,7 @@ _08014EC4:
subs r2, 0x30
adds r5, 0x1
mov r0, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
_08015DEE:
movs r0, 0
str r0, [sp]

2
asm/code_802B640.s
View File

@ -1297,7 +1297,7 @@ _0802BFE8:
adds r1, r0, 0
mov r0, r8
mov r2, r9
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x38]
movs r0, 0

34
asm/code_803B050.s
View File

@ -1059,7 +1059,7 @@ _0803B818:
add r0, sp, 0x4
adds r2, r6, 0
_0803B84C:
bl sub_800D158
bl ExpandPlaceholdersBuffer
_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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
_0803BACC:
ldr r3, [r7]
movs r0, 0
@ -1408,7 +1408,7 @@ _0803BB10:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
ldr r3, [r7]
str r4, [sp]
b _0803BD32
@ -1508,7 +1508,7 @@ _0803BBF0:
ldr r1, [r0]
add r0, sp, 0x4
mov r2, r8
bl sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
ldr r3, [r7]
mov r1, r8
str r1, [sp]
@ -1783,7 +1783,7 @@ _0803BE80:
_0803BE94:
add r0, sp, 0x4
adds r2, r4, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
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 sub_800D158
bl ExpandPlaceholdersBuffer
b _0803BF0C
.align 2, 0
_0803BEF8: .4byte gSpecialMissionText
@ -1940,7 +1940,7 @@ _0803BFD0:
add r0, sp, 0x4
adds r2, r4, 0
_0803BFEE:
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r3, [r7]
movs r0, 0
str r0, [sp]

4
asm/code_803D110.s
View File

@ -1388,7 +1388,7 @@ _0803DB54:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _0803DBCA
.align 2, 0
_0803DB84: .4byte gUnknown_80F60F8
@ -1411,7 +1411,7 @@ _0803DBBC:
adds r3, 0x30
add r0, sp, 0x4
adds r2, r6, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
_0803DBCA:
add r0, sp, 0x4
bl CalcStringWidth

4
asm/code_80521D0.s
View File

@ -785,7 +785,7 @@ _080529D4:
ldr r0, _080529E4
ldr r1, _080529E8
ldr r2, _080529EC
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08052A28
.align 2, 0
_080529E4: .4byte gUnknown_202E5D8
@ -795,7 +795,7 @@ _080529F0:
ldr r0, _080529FC
ldr r1, _08052A00
ldr r2, _08052A04
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08052A28
.align 2, 0
_080529FC: .4byte gUnknown_202E5D8

47019
asm/code_8057824.s
View File

File diff suppressed because it is too large Load Diff

47020
asm/code_807001C.s Normal file
View File

File diff suppressed because it is too large Load Diff

14
asm/code_808EAB0.s
View File

@ -70,8 +70,8 @@ _0808ED70: .4byte gRecruitedPokemonRef
_0808ED74: .4byte 0x00008f88
thumb_func_end sub_808ED00
thumb_func_start sub_808ED78
sub_808ED78:
thumb_func_start SaveRecruitedPokemon
SaveRecruitedPokemon:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@ -215,10 +215,10 @@ _0808EE64:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_808ED78
thumb_func_end SaveRecruitedPokemon
thumb_func_start sub_808EE9C
sub_808EE9C:
thumb_func_start ReadRecruitedPokemon
ReadRecruitedPokemon:
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -346,7 +346,7 @@ _0808EF84:
.align 2, 0
_0808EF98: .4byte 0x00008f88
_0808EF9C: .4byte gRecruitedPokemonRef
thumb_func_end sub_808EE9C
thumb_func_end ReadRecruitedPokemon
thumb_func_start sub_808EFA0
sub_808EFA0:
@ -2232,7 +2232,7 @@ _0808FF0C: .4byte gUnknown_810DFC8
_0808FF10: .4byte gUnknown_810DEF4
_0808FF14: .4byte gUnknown_810E02C
_0808FF18: .4byte gUnknown_810DF98
_0808FF1C: .4byte gUnknown_810DFCC
_0808FF1C: .4byte gEvolutionStrings
thumb_func_end sub_808F844
thumb_func_start sub_808FF20

8
asm/code_809017C.s
View File

@ -96,7 +96,7 @@ sub_8090208:
adds r1, r2
ldr r2, [r1]
adds r1, r3, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
pop {r0}
bx r0
.align 2, 0
@ -123,7 +123,7 @@ sub_8090228:
ldr r2, [r0]
ldrb r3, [r4, 0x1]
adds r0, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _0809026E
.align 2, 0
_08090250: .4byte gDungeons
@ -137,7 +137,7 @@ _0809025C:
ldr r2, [r0]
ldrb r3, [r4, 0x1]
adds r0, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
_0809026E:
pop {r4,r5}
pop {r0}
@ -834,7 +834,7 @@ _080907DA:
bne _0809080C
ldr r1, _08090808
adds r0, r7, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
movs r0, 0
b _0809080E
.align 2, 0

10
asm/code_8092334.s
View File

@ -95,7 +95,7 @@ _080928DE:
ldr r1, _080928F4
ldrb r2, [r4, 0x5]
add r0, sp, 0x14
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _080928FC
.align 2, 0
_080928F0: .4byte gUnknown_81098C4
@ -152,7 +152,7 @@ _08092944:
str r0, [sp]
adds r0, r7, 0
adds r2, r6, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08092A6A
.align 2, 0
_08092964: .4byte gUnknown_81098E0
@ -232,7 +232,7 @@ _080929E2:
mov r1, r8
adds r2, r6, 0
mov r3, r12
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08092A6A
.align 2, 0
_08092A10: .4byte gUnknown_81098EC
@ -275,7 +275,7 @@ _08092A3E:
mov r1, r8
adds r2, r6, 0
mov r3, r12
bl sub_800D158
bl ExpandPlaceholdersBuffer
_08092A6A:
add sp, 0x20
pop {r3}
@ -737,7 +737,7 @@ sub_8092D54:
ldr r2, [r0]
adds r0, r6, 0
adds r1, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
pop {r4-r6}
pop {r0}
bx r0

1239
asm/code_809747C.s
View File

File diff suppressed because it is too large Load Diff

857
asm/code_8097670.s Normal file
View File

@ -0,0 +1,857 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_80978C8
sub_80978C8:
push {lr}
lsls r0, 16
asrs r0, 16
bl sub_808E858
lsls r0, 16
asrs r3, r0, 16
ldr r0, _080978FC
ldr r2, [r0]
adds r0, r3, 0
cmp r3, 0
bge _080978E2
adds r0, 0x1F
_080978E2:
asrs r0, 5
lsls r1, r0, 2
adds r2, 0x54
adds r2, r1
lsls r0, 5
subs r0, r3, r0
movs r1, 0x1
lsls r1, r0
ldr r0, [r2]
orrs r0, r1
str r0, [r2]
pop {r0}
bx r0
.align 2, 0
_080978FC: .4byte gUnknown_203B494
thumb_func_end sub_80978C8
thumb_func_start sub_8097900
sub_8097900:
push {lr}
lsls r0, 16
asrs r0, 16
bl sub_808E858
lsls r0, 16
asrs r3, r0, 16
ldr r0, _08097938
ldr r2, [r0]
adds r0, r3, 0
cmp r3, 0
bge _0809791A
adds r0, 0x1F
_0809791A:
asrs r0, 5
lsls r1, r0, 2
adds r2, 0x1C
adds r2, r1
lsls r0, 5
subs r0, r3, r0
movs r1, 0x1
lsls r1, r0
ldr r0, [r2]
ands r0, r1
cmp r0, 0
bne _0809793C
movs r0, 0
b _0809793E
.align 2, 0
_08097938: .4byte gUnknown_203B494
_0809793C:
movs r0, 0x1
_0809793E:
pop {r1}
bx r1
thumb_func_end sub_8097900
thumb_func_start sub_8097944
sub_8097944:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x8
movs r0, 0x1
str r0, [sp]
movs r1, 0x1
str r1, [sp, 0x4]
movs r0, 0xD
bl sub_8097710
lsls r0, 24
cmp r0, 0
bne _08097974
bl HasAllFriendAreas
lsls r0, 24
cmp r0, 0
beq _08097974
movs r0, 0xD
bl sub_80976F8
_08097974:
movs r4, 0
ldr r0, _08097B5C
mov r10, r0
mov r8, r4
_0809797C:
ldr r1, _08097B60
ldr r0, [r1]
mov r1, r8
adds r2, r1, r0
ldrb r1, [r2]
movs r0, 0x1
ands r0, r1
cmp r0, 0
beq _080979F6
movs r0, 0x8
ldrsh r3, [r2, r0]
mov r1, r10
ldr r2, [r1]
adds r0, r3, 0
cmp r3, 0
bge _0809799E
adds r0, 0x1F
_0809799E:
asrs r0, 5
lsls r1, r0, 2
adds r2, 0x1C
adds r2, r1
lsls r0, 5
subs r0, r3, r0
movs r1, 0x1
lsls r1, r0
ldr r0, [r2]
orrs r0, r1
str r0, [r2]
ldr r0, _08097B60
mov r9, r0
mov r12, r8
movs r7, 0x1
movs r6, 0x2C
movs r5, 0x3
_080979C0:
mov r1, r9
ldr r0, [r1]
add r0, r12
adds r3, r0, r6
ldrb r1, [r3]
adds r0, r7, 0
ands r0, r1
cmp r0, 0
beq _080979EE
mov r0, r10
ldr r2, [r0]
ldrh r3, [r3, 0x2]
lsrs r0, r3, 5
lsls r0, 2
adds r2, 0x8C
adds r2, r0
movs r0, 0x1F
ands r3, r0
adds r1, r7, 0
lsls r1, r3
ldr r0, [r2]
orrs r0, r1
str r0, [r2]
_080979EE:
adds r6, 0x8
subs r5, 0x1
cmp r5, 0
bge _080979C0
_080979F6:
movs r1, 0x58
add r8, r1
adds r4, 0x1
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
ble _0809797C
movs r4, 0
ldr r1, _08097B64
_08097A08:
cmp r4, 0
bne _08097A0E
b _08097B80
_08097A0E:
ldr r0, _08097B68
cmp r4, r0
bne _08097A16
b _08097B80
_08097A16:
adds r0, 0x1
cmp r4, r0
bne _08097A1E
b _08097B80
_08097A1E:
adds r0, 0x1
cmp r4, r0
bne _08097A26
b _08097B80
_08097A26:
adds r0, 0x26
cmp r4, r0
bne _08097A2E
b _08097B80
_08097A2E:
adds r0, 0x1
cmp r4, r0
bne _08097A36
b _08097B80
_08097A36:
adds r0, 0x1
cmp r4, r0
bne _08097A3E
b _08097B80
_08097A3E:
adds r0, 0x1
cmp r4, r0
bne _08097A46
b _08097B80
_08097A46:
adds r0, 0x1
cmp r4, r0
bne _08097A4E
b _08097B80
_08097A4E:
adds r0, 0x1
cmp r4, r0
bne _08097A56
b _08097B80
_08097A56:
cmp r4, r1
bne _08097A5C
b _08097B80
_08097A5C:
ldr r0, _08097B5C
ldr r5, [r0]
adds r0, r4, 0
cmp r4, 0
bge _08097A68
adds r0, 0x1F
_08097A68:
asrs r0, 5
lsls r3, r0, 2
adds r1, r5, 0
adds r1, 0x54
adds r1, r3
lsls r0, 5
subs r0, r4, r0
movs r2, 0x1
lsls r2, r0
ldr r0, [r1]
ands r0, r2
cmp r0, 0
bne _08097A86
movs r0, 0
str r0, [sp, 0x4]
_08097A86:
adds r0, r5, 0
adds r0, 0x1C
adds r0, r3
ldr r0, [r0]
ands r0, r2
cmp r0, 0
beq _08097B7C
cmp r4, 0x92
bne _08097A9E
movs r0, 0x10
bl sub_80976F8
_08097A9E:
cmp r4, 0x91
bne _08097AA8
movs r0, 0x11
bl sub_80976F8
_08097AA8:
cmp r4, 0x90
bne _08097AB2
movs r0, 0x12
bl sub_80976F8
_08097AB2:
movs r0, 0xCF
lsls r0, 1
cmp r4, r0
bne _08097AC0
movs r0, 0x13
bl sub_80976F8
_08097AC0:
ldr r0, _08097B6C
cmp r4, r0
bne _08097ACC
movs r0, 0x14
bl sub_80976F8
_08097ACC:
movs r0, 0x86
lsls r0, 1
cmp r4, r0
bne _08097ADA
movs r0, 0x15
bl sub_80976F8
_08097ADA:
movs r0, 0x87
lsls r0, 1
cmp r4, r0
bne _08097AE8
movs r0, 0x16
bl sub_80976F8
_08097AE8:
ldr r0, _08097B70
cmp r4, r0
bne _08097AF4
movs r0, 0x17
bl sub_80976F8
_08097AF4:
movs r0, 0xCD
lsls r0, 1
cmp r4, r0
bne _08097B02
movs r0, 0x18
bl sub_80976F8
_08097B02:
ldr r0, _08097B74
cmp r4, r0
bne _08097B0E
movs r0, 0x19
bl sub_80976F8
_08097B0E:
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
bne _08097B1C
movs r0, 0x1A
bl sub_80976F8
_08097B1C:
movs r0, 0x89
lsls r0, 1
cmp r4, r0
bne _08097B2A
movs r0, 0x1B
bl sub_80976F8
_08097B2A:
movs r0, 0x8A
lsls r0, 1
cmp r4, r0
bne _08097B38
movs r0, 0x1C
bl sub_80976F8
_08097B38:
cmp r4, 0x97
bne _08097B42
movs r0, 0x1D
bl sub_80976F8
_08097B42:
cmp r4, 0x96
bne _08097B4C
movs r0, 0x1E
bl sub_80976F8
_08097B4C:
ldr r0, _08097B78
cmp r4, r0
bne _08097B80
movs r0, 0x1F
bl sub_80976F8
b _08097B80
.align 2, 0
_08097B5C: .4byte gUnknown_203B494
_08097B60: .4byte gRecruitedPokemonRef
_08097B64: .4byte 0x000001a7
_08097B68: .4byte 0x00000179
_08097B6C: .4byte 0x0000010d
_08097B70: .4byte 0x00000113
_08097B74: .4byte 0x0000019b
_08097B78: .4byte 0x0000019d
_08097B7C:
movs r1, 0
str r1, [sp]
_08097B80:
adds r4, 0x1
ldr r1, _08097C0C
cmp r4, r1
bgt _08097B8A
b _08097A08
_08097B8A:
ldr r0, [sp]
cmp r0, 0
beq _08097B96
movs r0, 0xF
bl sub_80976F8
_08097B96:
ldr r1, [sp, 0x4]
cmp r1, 0
beq _08097BA2
movs r0, 0xE
bl sub_80976F8
_08097BA2:
movs r3, 0
movs r4, 0
_08097BA6:
cmp r4, 0
beq _08097BE2
ldr r0, _08097C10
cmp r4, r0
beq _08097BE2
adds r0, 0x1
cmp r4, r0
beq _08097BE2
adds r0, 0x1
cmp r4, r0
beq _08097BE2
ldr r0, _08097C14
ldr r2, [r0]
adds r0, r4, 0
cmp r4, 0
bge _08097BC8
adds r0, 0x1F
_08097BC8:
asrs r0, 5
lsls r1, r0, 2
adds r2, 0x8C
adds r2, r1
lsls r0, 5
subs r0, r4, r0
movs r1, 0x1
lsls r1, r0
ldr r0, [r2]
ands r0, r1
cmp r0, 0
beq _08097BE2
adds r3, 0x1
_08097BE2:
adds r4, 0x1
movs r0, 0xCE
lsls r0, 1
cmp r4, r0
ble _08097BA6
cmp r3, 0
beq _08097BFC
ldr r0, _08097C14
ldr r0, [r0]
strh r3, [r0, 0x18]
movs r0, 0x7
bl sub_80976F8
_08097BFC:
add sp, 0x8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08097C0C: .4byte 0x000001a7
_08097C10: .4byte 0x00000163
_08097C14: .4byte gUnknown_203B494
thumb_func_end sub_8097944
thumb_func_start sub_8097C18
sub_8097C18:
push {r4-r6,lr}
adds r5, r0, 0
bl sub_8097944
ldr r4, _08097CBC
ldr r1, [r4]
adds r1, 0x4
adds r0, r5, 0
movs r2, 0x11
bl sub_809488C
ldr r1, [r4]
adds r1, 0x8
adds r0, r5, 0
movs r2, 0x11
bl sub_809488C
ldr r1, [r4]
adds r1, 0xC
adds r0, r5, 0
movs r2, 0x11
bl sub_809488C
ldr r1, [r4]
adds r0, r5, 0
movs r2, 0x20
bl sub_809488C
ldr r1, [r4]
adds r1, 0x14
adds r0, r5, 0
movs r2, 0xE
bl sub_809488C
ldr r1, [r4]
adds r1, 0x16
adds r0, r5, 0
movs r2, 0xE
bl sub_809488C
ldr r1, [r4]
adds r1, 0x18
adds r0, r5, 0
movs r2, 0x9
bl sub_809488C
ldr r1, [r4]
adds r1, 0xC0
adds r0, r5, 0
movs r2, 0x11
bl sub_809488C
ldr r1, [r4]
adds r1, 0x1C
movs r6, 0xE0
lsls r6, 1
adds r0, r5, 0
adds r2, r6, 0
bl sub_809488C
ldr r1, [r4]
adds r1, 0x54
adds r0, r5, 0
adds r2, r6, 0
bl sub_809488C
ldr r1, [r4]
adds r1, 0x8C
movs r2, 0xD0
lsls r2, 1
adds r0, r5, 0
bl sub_809488C
ldr r1, [r4]
adds r1, 0x10
adds r0, r5, 0
bl sub_80902F4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08097CBC: .4byte gUnknown_203B494
thumb_func_end sub_8097C18
thumb_func_start sub_8097CC0
sub_8097CC0:
push {r4-r6,lr}
adds r5, r0, 0
ldr r4, _08097D5C
ldr r1, [r4]
adds r1, 0x4
movs r2, 0x11
bl sub_8094924
ldr r1, [r4]
adds r1, 0x8
adds r0, r5, 0
movs r2, 0x11
bl sub_8094924
ldr r1, [r4]
adds r1, 0xC
adds r0, r5, 0
movs r2, 0x11
bl sub_8094924
ldr r1, [r4]
adds r0, r5, 0
movs r2, 0x20
bl sub_8094924
ldr r1, [r4]
adds r1, 0x14
adds r0, r5, 0
movs r2, 0xE
bl sub_8094924
ldr r1, [r4]
adds r1, 0x16
adds r0, r5, 0
movs r2, 0xE
bl sub_8094924
ldr r1, [r4]
adds r1, 0x18
adds r0, r5, 0
movs r2, 0x9
bl sub_8094924
ldr r1, [r4]
adds r1, 0xC0
adds r0, r5, 0
movs r2, 0x11
bl sub_8094924
ldr r1, [r4]
adds r1, 0x1C
movs r6, 0xE0
lsls r6, 1
adds r0, r5, 0
adds r2, r6, 0
bl sub_8094924
ldr r1, [r4]
adds r1, 0x54
adds r0, r5, 0
adds r2, r6, 0
bl sub_8094924
ldr r1, [r4]
adds r1, 0x8C
movs r2, 0xD0
lsls r2, 1
adds r0, r5, 0
bl sub_8094924
ldr r1, [r4]
adds r1, 0x10
adds r0, r5, 0
bl sub_8090314
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08097D5C: .4byte gUnknown_203B494
thumb_func_end sub_8097CC0
thumb_func_start sub_8097D60
sub_8097D60:
push {lr}
sub sp, 0x10
adds r3, r0, 0
adds r2, r1, 0
mov r0, sp
adds r1, r3, 0
bl sub_809486C
mov r0, sp
bl WriteSaveOptions
mov r0, sp
bl WritePlayTime
mov r0, sp
bl sub_8097C18
mov r0, sp
bl WriteExclusivePokemon
mov r0, sp
bl nullsub_102
ldr r0, [sp, 0x8]
add sp, 0x10
pop {r1}
bx r1
thumb_func_end sub_8097D60
thumb_func_start sub_8097D98
sub_8097D98:
push {lr}
sub sp, 0x10
adds r3, r0, 0
adds r2, r1, 0
mov r0, sp
adds r1, r3, 0
bl sub_809485C
mov r0, sp
bl ReadSaveOptions
mov r0, sp
bl ReadPlayTime
mov r0, sp
bl sub_8097CC0
mov r0, sp
bl ReadExclusivePokemon
mov r0, sp
bl nullsub_102
ldr r0, [sp, 0x8]
add sp, 0x10
pop {r1}
bx r1
thumb_func_end sub_8097D98
thumb_func_start sub_8097DD0
sub_8097DD0:
push {lr}
adds r2, r0, 0
adds r3, r1, 0
ldr r1, [r2]
ldr r0, [r3]
cmp r1, r0
bne _08097DEA
ldr r1, [r2, 0x4]
ldr r0, [r3, 0x4]
cmp r1, r0
bne _08097DEA
movs r0, 0x1
b _08097DEC
_08097DEA:
movs r0, 0
_08097DEC:
pop {r1}
bx r1
thumb_func_end sub_8097DD0
thumb_func_start sub_8097DF0
sub_8097DF0:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0x1F8
mov r8, r0
str r1, [sp, 0x1F0]
movs r0, 0
mov r9, r0
movs r7, 0
ldr r1, _08097E3C
ldr r0, [r1]
cmp r0, 0
beq _08097E6E
_08097E0E:
movs r4, 0
lsls r5, r7, 3
lsls r1, r7, 2
mov r10, r1
adds r6, r7, 0x1
ldr r2, _08097E3C
adds r3, r5, r2
add r1, sp, 0x18C
_08097E1E:
ldr r0, [r3]
adds r0, r4
ldrb r2, [r0]
cmp r2, 0x23
bne _08097E40
ldrb r0, [r0, 0x1]
cmp r0, 0x72
bne _08097E40
strb r2, [r1]
adds r1, 0x1
strb r0, [r1]
adds r1, 0x1
movs r0, 0
strb r0, [r1]
b _08097E50
.align 2, 0
_08097E3C: .4byte gStatusDescriptions
_08097E40:
ldr r0, [r3]
adds r0, r4
ldrb r0, [r0]
strb r0, [r1]
adds r1, 0x1
adds r4, 0x1
cmp r4, 0x63
ble _08097E1E
_08097E50:
add r0, sp, 0x18C
bl strlen
mov r1, sp
add r1, r10
str r0, [r1]
adds r7, r6, 0
cmp r6, 0x62
bgt _08097E6E
lsls r0, r6, 3
ldr r1, _08097EB4
adds r0, r1
ldr r0, [r0]
cmp r0, 0
bne _08097E0E
_08097E6E:
mov r2, r8
ldrb r0, [r2]
cmp r0, 0
beq _08097F2C
ldr r3, _08097EB4
_08097E78:
cmp r0, 0x23
bne _08097F08
movs r7, 0
adds r1, r3, 0
ldr r0, [r1]
cmp r0, 0
beq _08097F20
mov r2, r9
lsls r0, r2, 2
ldr r2, [sp, 0x1F0]
adds r0, r2
mov r10, r0
_08097E90:
lsls r4, r7, 3
adds r0, r4, r1
ldr r0, [r0]
lsls r1, r7, 2
add r1, sp
ldr r2, [r1]
mov r1, r8
str r3, [sp, 0x1F4]
bl sub_800B2D4
lsls r0, 24
adds r5, r4, 0
adds r6, r7, 0x1
ldr r3, [sp, 0x1F4]
cmp r0, 0
bne _08097EF0
movs r4, 0
b _08097EBA
.align 2, 0
_08097EB4: .4byte gStatusDescriptions
_08097EB8:
adds r4, 0x1
_08097EBA:
cmp r4, r9
bge _08097ED6
adds r0, r5, r3
lsls r1, r4, 2
ldr r2, [sp, 0x1F0]
adds r1, r2
ldr r1, [r1]
str r3, [sp, 0x1F4]
bl sub_8097DD0
lsls r0, 24
ldr r3, [sp, 0x1F4]
cmp r0, 0
beq _08097EB8
_08097ED6:
cmp r4, r9
bne _08097EF0
mov r0, r9
cmp r0, 0x3
bgt _08097EF0
adds r0, r5, r3
mov r1, r10
adds r1, 0x4
mov r10, r1
subs r1, 0x4
stm r1!, {r0}
movs r2, 0x1
add r9, r2
_08097EF0:
adds r7, r6, 0
cmp r6, 0x62
bgt _08097F20
ldr r1, _08097F04
lsls r0, r6, 3
adds r0, r1
ldr r0, [r0]
cmp r0, 0
bne _08097E90
b _08097F20
.align 2, 0
_08097F04: .4byte gStatusDescriptions
_08097F08:
mov r0, r8
ldrb r1, [r0]
adds r0, r1, 0
adds r0, 0x7F
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bls _08097F1C
cmp r1, 0x87
bne _08097F20
_08097F1C:
movs r1, 0x1
add r8, r1
_08097F20:
movs r2, 0x1
add r8, r2
mov r1, r8
ldrb r0, [r1]
cmp r0, 0
bne _08097E78
_08097F2C:
mov r0, r9
add sp, 0x1F8
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8097DF0
.align 2,0

18
asm/code_8098BDC.s
View File

@ -3247,7 +3247,7 @@ _0809A8A0: .4byte gUnknown_3001B64
_0809A8A4: .4byte 0x0000043c
_0809A8A8: .4byte 0x0000ffff
_0809A8AC: .4byte gAvailablePokemonNames
_0809A8B0: .4byte gUnknown_811615C
_0809A8B0: .4byte gInvalidityText
_0809A8B4: .4byte gPlayerName
thumb_func_end sub_809A83C
@ -3536,7 +3536,7 @@ _0809AAE6:
b _0809AB3C
.align 2, 0
_0809AB28: .4byte gAvailablePokemonNames
_0809AB2C: .4byte gUnknown_811616C
_0809AB2C: .4byte gUndefineText
_0809AB30: .4byte gPlayerName
_0809AB34:
mov r0, r9
@ -4305,7 +4305,7 @@ _0809B0E4:
lsls r2, 4
ldr r3, _0809B13C
adds r2, r3
bl sub_800D158
bl ExpandPlaceholdersBuffer
_0809B0F6:
adds r0, r4, 0
bl sub_809AE3C
@ -4602,7 +4602,7 @@ _0809B318:
lsls r2, 4
ldr r3, _0809B3D8
adds r2, r3
bl sub_800D158
bl ExpandPlaceholdersBuffer
_0809B32A:
ldr r0, _0809B3DC
mov r8, r0
@ -4614,7 +4614,7 @@ _0809B32A:
ldr r1, _0809B3E0
adds r0, r4, 0
adds r2, r7, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
adds r7, r4, 0
_0809B344:
adds r0, r6, 0
@ -5681,18 +5681,18 @@ _0809BC02:
movs r0, 0x1
bl sub_8011C28
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
b _0809B784
.align 2, 0
_0809BC10: .4byte 0x00000414
_0809BC14:
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
beq _0809BC20
b _0809B784
_0809BC20:
bl sub_8012750
bl FinishWriteSavePak
b _0809C392
_0809BC26:
movs r0, 0x4
@ -7670,7 +7670,7 @@ sub_809CBBC:
adds r0, r3
ldr r3, [r0]
mov r0, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, _0809CC14
ldr r0, [r0]
movs r1, 0x98

2
asm/code_80A7714.s
View File

@ -3115,7 +3115,7 @@ _080A8F44:
pop {r0}
bx r0
.align 2, 0
_080A8F4C: .4byte gUnknown_811825C
_080A8F4C: .4byte gGroundLives_InvalidityText
thumb_func_end sub_80A8EC0
thumb_func_start sub_80A8F50

426
asm/debug_menu_1.s
View File

@ -257,430 +257,4 @@ _0803AC1C:
bx r1
thumb_func_end sub_803ABC8
thumb_func_start sub_803AC24
sub_803AC24:
push {r4,lr}
ldr r4, _0803AC44
movs r0, 0xA0
lsls r0, 1
movs r1, 0x8
bl MemoryAlloc
str r0, [r4]
movs r0, 0
bl sub_803ACD0
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0803AC44: .4byte gUnknown_203B3F8
thumb_func_end sub_803AC24
thumb_func_start sub_803AC48
sub_803AC48:
push {lr}
ldr r0, _0803AC60
ldr r0, [r0]
ldr r0, [r0]
cmp r0, 0x7
bhi _0803ACA8
lsls r0, 2
ldr r1, _0803AC64
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0803AC60: .4byte gUnknown_203B3F8
_0803AC64: .4byte _0803AC68
.align 2, 0
_0803AC68:
.4byte _0803AC88
.4byte _0803AC90
.4byte _0803AC90
.4byte _0803AC96
.4byte _0803ACA8
.4byte _0803AC9C
.4byte _0803ACA2
.4byte _0803ACA8
_0803AC88:
movs r0, 0x1
bl sub_803ACD0
b _0803ACAC
_0803AC90:
bl sub_803AF38
b _0803ACAC
_0803AC96:
bl sub_803AF88
b _0803ACAC
_0803AC9C:
bl sub_803AFE8
b _0803ACAC
_0803ACA2:
bl sub_803B034
b _0803ACAC
_0803ACA8:
movs r0, 0x3
b _0803ACAE
_0803ACAC:
movs r0, 0
_0803ACAE:
pop {r1}
bx r1
thumb_func_end sub_803AC48
thumb_func_start sub_803ACB4
sub_803ACB4:
push {r4,lr}
ldr r4, _0803ACCC
ldr r0, [r4]
cmp r0, 0
beq _0803ACC6
bl MemoryFree
movs r0, 0
str r0, [r4]
_0803ACC6:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0803ACCC: .4byte gUnknown_203B3F8
thumb_func_end sub_803ACB4
thumb_func_start sub_803ACD0
sub_803ACD0:
push {lr}
ldr r1, _0803ACE4
ldr r1, [r1]
str r0, [r1]
bl sub_803ACE8
bl sub_803AD88
pop {r0}
bx r0
.align 2, 0
_0803ACE4: .4byte gUnknown_203B3F8
thumb_func_end sub_803ACD0
thumb_func_start sub_803ACE8
sub_803ACE8:
push {r4-r7,lr}
ldr r4, _0803AD08
ldr r0, [r4]
adds r0, 0xE0
bl sub_8006518
ldr r1, [r4]
ldr r0, [r1]
cmp r0, 0x3
beq _0803AD10
cmp r0, 0x5
beq _0803AD38
movs r2, 0
ldr r3, _0803AD0C
b _0803AD50
.align 2, 0
_0803AD08: .4byte gUnknown_203B3F8
_0803AD0C: .4byte gUnknown_80E7ED4
_0803AD10:
bl sub_803AEB0
ldr r2, [r4]
movs r0, 0x88
lsls r0, 1
adds r2, r0
ldr r1, _0803AD34
ldm r1!, {r3,r5,r6}
stm r2!, {r3,r5,r6}
ldm r1!, {r3,r5,r7}
stm r2!, {r3,r5,r7}
ldr r1, [r4]
adds r0, r1, r0
adds r1, 0x90
bl sub_8012CAC
b _0803AD6C
.align 2, 0
_0803AD34: .4byte gUnknown_80E7EEC
_0803AD38:
movs r6, 0x94
lsls r6, 1
adds r1, r6
ldr r0, _0803AD4C
ldm r0!, {r2,r3,r7}
stm r1!, {r2,r3,r7}
ldm r0!, {r4-r6}
stm r1!, {r4-r6}
b _0803AD6C
.align 2, 0
_0803AD4C: .4byte gUnknown_80E7F04
_0803AD50:
ldr r0, [r4]
lsls r1, r2, 1
adds r1, r2
lsls r1, 3
adds r0, r1
adds r0, 0xE0
adds r1, r3, 0
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
ldm r1!, {r5-r7}
stm r0!, {r5-r7}
adds r2, 0x1
cmp r2, 0x3
ble _0803AD50
_0803AD6C:
bl ResetUnusedInputStruct
ldr r0, _0803AD84
ldr r0, [r0]
adds r0, 0xE0
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0803AD84: .4byte gUnknown_203B3F8
thumb_func_end sub_803ACE8
thumb_func_start sub_803AD88
sub_803AD88:
push {lr}
sub sp, 0x8
ldr r1, _0803ADA4
ldr r0, [r1]
ldr r0, [r0]
adds r2, r1, 0
cmp r0, 0x7
bhi _0803AE50
lsls r0, 2
ldr r1, _0803ADA8
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_0803ADA4: .4byte gUnknown_203B3F8
_0803ADA8: .4byte _0803ADAC
.align 2, 0
_0803ADAC:
.4byte _0803AE50
.4byte _0803ADCC
.4byte _0803ADDA
.4byte _0803ADE2
.4byte _0803AE50
.4byte _0803AE0C
.4byte _0803AE44
.4byte _0803AE50
_0803ADCC:
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0xA
bl sub_8023868
b _0803AE50
_0803ADDA:
movs r0, 0x1
bl sub_8023B7C
b _0803AE50
_0803ADE2:
bl sub_8023DA4
ldr r0, _0803AE08
ldr r2, [r0]
adds r0, r2, 0
adds r0, 0x10
adds r1, r2, 0
adds r1, 0x90
adds r3, r2, 0
adds r3, 0xD0
ldr r2, [r2, 0xC]
str r2, [sp]
movs r2, 0x2
str r2, [sp, 0x4]
movs r2, 0
bl sub_8012D60
b _0803AE50
.align 2, 0
_0803AE08: .4byte gUnknown_203B3F8
_0803AE0C:
ldr r2, [r2]
movs r1, 0x3
str r1, [r2, 0x70]
movs r0, 0x1
str r0, [r2, 0x68]
movs r0, 0x64
str r0, [r2, 0x6C]
ldr r0, [r2, 0x8]
ldrb r0, [r0, 0x3]
str r0, [r2, 0x64]
str r1, [r2, 0x74]
movs r1, 0x94
lsls r1, 1
adds r0, r2, r1
str r0, [r2, 0x78]
movs r0, 0x2C
str r0, [r2, 0x7C]
adds r1, r2, 0
adds r1, 0x80
movs r0, 0x12
str r0, [r1]
adds r0, r2, 0
adds r0, 0x60
bl sub_8013AA0
bl sub_803AE58
b _0803AE50
_0803AE44:
ldr r0, [r2]
ldr r1, [r0, 0x8]
adds r1, 0x4C
movs r0, 0x2
bl sub_801602C
_0803AE50:
add sp, 0x8
pop {r0}
bx r0
thumb_func_end sub_803AD88
thumb_func_start sub_803AE58
sub_803AE58:
push {r4,lr}
sub sp, 0x4
ldr r4, _0803AEA8
ldr r0, [r4]
ldr r0, [r0, 0x74]
bl sub_8008C54
ldr r0, [r4]
ldr r0, [r0, 0x74]
bl sub_80073B8
ldr r2, _0803AEAC
ldr r0, [r4]
ldr r3, [r0, 0x74]
movs r0, 0
str r0, [sp]
movs r0, 0x4
movs r1, 0
bl xxx_call_draw_string
ldr r0, [r4]
adds r0, 0x60
bl sub_8013C68
ldr r0, [r4]
ldr r0, [r0, 0x74]
bl sub_80073E0
bl sub_8023DA4
ldr r0, [r4]
adds r0, 0x10
movs r1, 0
bl sub_8012EA4
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0803AEA8: .4byte gUnknown_203B3F8
_0803AEAC: .4byte gDebug_NumberText2
thumb_func_end sub_803AE58
thumb_func_start sub_803AEB0
sub_803AEB0:
push {r4-r6,lr}
ldr r4, _0803AEFC
ldr r0, [r4]
adds r0, 0xD0
movs r1, 0
movs r2, 0x10
bl MemoryFill16
ldr r4, [r4]
movs r3, 0
adds r1, r4, 0
adds r1, 0x90
ldr r0, _0803AF00
str r0, [r1]
adds r5, r4, 0
adds r5, 0x94
movs r0, 0x4
str r0, [r5]
movs r2, 0x1
adds r1, 0x8
ldr r0, _0803AF04
str r0, [r1]
adds r1, 0x4
movs r0, 0x5
str r0, [r1]
movs r6, 0x2
adds r0, r4, 0
adds r0, 0xA0
str r3, [r0]
adds r0, 0x4
str r2, [r0]
adds r0, 0x2C
ldrh r0, [r0]
cmp r0, 0
bne _0803AF08
ldr r0, [r5]
str r0, [r4, 0xC]
b _0803AF2C
.align 2, 0
_0803AEFC: .4byte gUnknown_203B3F8
_0803AF00: .4byte gDebug_LevelText
_0803AF04: .4byte gUnknown_80E7F2C
_0803AF08:
adds r3, 0x1
cmp r3, r6
bge _0803AF2C
ldr r0, _0803AF34
ldr r2, [r0]
lsls r1, r3, 1
adds r0, r2, 0
adds r0, 0xD0
adds r0, r1
ldrh r0, [r0]
cmp r0, 0
bne _0803AF08
lsls r0, r3, 3
adds r1, r2, 0
adds r1, 0x94
adds r1, r0
ldr r0, [r1]
str r0, [r2, 0xC]
_0803AF2C:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0803AF34: .4byte gUnknown_203B3F8
thumb_func_end sub_803AEB0
thumb_func_start sub_803AF38
sub_803AF38:
push {lr}
movs r0, 0x1
bl sub_8023A94
cmp r0, 0x2
beq _0803AF78
cmp r0, 0x2
bcc _0803AF82
cmp r0, 0x3
bne _0803AF82
bl sub_8023B44
ldr r1, _0803AF70
ldr r1, [r1]
strh r0, [r1, 0x4]
ldr r3, _0803AF74
movs r0, 0x4
ldrsh r2, [r1, r0]
movs r0, 0x58
muls r2, r0
ldr r0, [r3]
adds r0, r2
str r0, [r1, 0x8]
movs r0, 0x3
bl sub_803ACD0
b _0803AF82
.align 2, 0
_0803AF70: .4byte gUnknown_203B3F8
_0803AF74: .4byte gRecruitedPokemonRef
_0803AF78:
bl sub_8023C60
movs r0, 0x7
bl sub_803ACD0
_0803AF82:
pop {r0}
bx r0
thumb_func_end sub_803AF38
.align 2,0

116
asm/debug_menu_2.s Normal file
View File

@ -0,0 +1,116 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
thumb_func_start sub_803AEB0
sub_803AEB0:
push {r4-r6,lr}
ldr r4, _0803AEFC
ldr r0, [r4]
adds r0, 0xD0
movs r1, 0
movs r2, 0x10
bl MemoryFill16
ldr r4, [r4]
movs r3, 0
adds r1, r4, 0
adds r1, 0x90
ldr r0, _0803AF00
str r0, [r1]
adds r5, r4, 0
adds r5, 0x94
movs r0, 0x4
str r0, [r5]
movs r2, 0x1
adds r1, 0x8
ldr r0, _0803AF04
str r0, [r1]
adds r1, 0x4
movs r0, 0x5
str r0, [r1]
movs r6, 0x2
adds r0, r4, 0
adds r0, 0xA0
str r3, [r0]
adds r0, 0x4
str r2, [r0]
adds r0, 0x2C
ldrh r0, [r0]
cmp r0, 0
bne _0803AF08
ldr r0, [r5]
str r0, [r4, 0xC]
b _0803AF2C
.align 2, 0
_0803AEFC: .4byte gUnknown_203B3F8
_0803AF00: .4byte gDebug_LevelText
_0803AF04: .4byte gUnknown_80E7F2C
_0803AF08:
adds r3, 0x1
cmp r3, r6
bge _0803AF2C
ldr r0, _0803AF34
ldr r2, [r0]
lsls r1, r3, 1
adds r0, r2, 0
adds r0, 0xD0
adds r0, r1
ldrh r0, [r0]
cmp r0, 0
bne _0803AF08
lsls r0, r3, 3
adds r1, r2, 0
adds r1, 0x94
adds r1, r0
ldr r0, [r1]
str r0, [r2, 0xC]
_0803AF2C:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0803AF34: .4byte gUnknown_203B3F8
thumb_func_end sub_803AEB0
thumb_func_start sub_803AF38
sub_803AF38:
push {lr}
movs r0, 0x1
bl sub_8023A94
cmp r0, 0x2
beq _0803AF78
cmp r0, 0x2
bcc _0803AF82
cmp r0, 0x3
bne _0803AF82
bl sub_8023B44
ldr r1, _0803AF70
ldr r1, [r1]
strh r0, [r1, 0x4]
ldr r3, _0803AF74
movs r0, 0x4
ldrsh r2, [r1, r0]
movs r0, 0x58
muls r2, r0
ldr r0, [r3]
adds r0, r2
str r0, [r1, 0x8]
movs r0, 0x3
bl sub_803ACD0
b _0803AF82
.align 2, 0
_0803AF70: .4byte gUnknown_203B3F8
_0803AF74: .4byte gRecruitedPokemonRef
_0803AF78:
bl sub_8023C60
movs r0, 0x7
bl sub_803ACD0
_0803AF82:
pop {r0}
bx r0
thumb_func_end sub_803AF38
.align 2,0

12
asm/exclusive_pokemon.s
View File

@ -402,8 +402,8 @@ _08098240: .4byte gUnknown_203B498
_08098244: .4byte gExclusivePokemon
thumb_func_end UnlockExclusivePokemon
thumb_func_start sub_8098248
sub_8098248:
thumb_func_start WriteExclusivePokemon
WriteExclusivePokemon:
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@ -496,10 +496,10 @@ _080982E4:
.align 2, 0
_08098300: .4byte gUnknown_203B498
_08098304: .4byte 0x000001a7
thumb_func_end sub_8098248
thumb_func_end WriteExclusivePokemon
thumb_func_start sub_8098308
sub_8098308:
thumb_func_start ReadExclusivePokemon
ReadExclusivePokemon:
push {r4-r7,lr}
mov r7, r8
push {r7}
@ -600,7 +600,7 @@ _0809839C:
.align 2, 0
_080983D0: .4byte gUnknown_203B498
_080983D4: .4byte 0x000001a7
thumb_func_end sub_8098308
thumb_func_end ReadExclusivePokemon
.align 2,0

828
asm/friend_area_action_menu.s Normal file
View File

@ -0,0 +1,828 @@
.include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
.text
@ Menu that gets created when you talk to friend
thumb_func_start CreateFriendActionMenu
CreateFriendActionMenu:
push {r4-r7,lr}
ldr r3, _080274E4
ldr r4, _080274E8
ldr r0, [r4]
movs r1, 0x8
ldrsh r2, [r0, r1]
movs r1, 0x58
muls r2, r1
ldr r1, [r3]
adds r5, r1, r2
movs r2, 0xB6
lsls r2, 1
adds r0, r2
movs r1, 0
movs r2, 0x14
bl MemoryFill16
ldrh r0, [r5]
lsrs r0, 1
movs r6, 0x1
ands r0, r6
cmp r0, 0
beq _080274F4
ldr r2, [r4]
movs r3, 0x8E
lsls r3, 1
adds r1, r2, r3
ldr r0, _080274EC
str r0, [r1]
movs r0, 0x90
lsls r0, 1
adds r1, r2, r0
movs r0, 0x7
str r0, [r1]
adds r0, r5, 0
bl sub_8027D9C
lsls r0, 24
cmp r0, 0
bne _080274B6
ldr r0, [r4]
movs r1, 0xB6
lsls r1, 1
adds r0, r1
strh r6, [r0]
_080274B6:
movs r7, 0x1
movs r0, 0x8
bl sub_80023E4
lsls r0, 24
cmp r0, 0
beq _08027552
ldrb r0, [r5, 0x2]
cmp r0, 0
bne _08027552
ldr r3, [r4]
movs r2, 0x8
movs r4, 0x92
lsls r4, 1
adds r1, r3, r4
ldr r0, _080274F0
str r0, [r1]
movs r1, 0x94
lsls r1, 1
adds r0, r3, r1
str r2, [r0]
b _08027550
.align 2, 0
_080274E4: .4byte gRecruitedPokemonRef
_080274E8: .4byte gUnknown_203B2BC
_080274EC: .4byte gFriendActionStandby
_080274F0: .4byte gFriendActionMakeLeader
_080274F4:
ldr r2, [r4]
movs r3, 0x8E
lsls r3, 1
adds r1, r2, r3
ldr r0, _08027658
str r0, [r1]
movs r0, 0x90
lsls r0, 1
adds r1, r2, r0
movs r0, 0x6
str r0, [r1]
movs r1, 0x8
ldrsh r0, [r2, r1]
bl sub_808D750
lsls r0, 24
cmp r0, 0
bne _08027522
ldr r0, [r4]
movs r2, 0xB6
lsls r2, 1
adds r0, r2
strh r6, [r0]
_08027522:
movs r7, 0x1
ldr r2, [r4]
movs r3, 0x92
lsls r3, 1
adds r1, r2, r3
ldr r0, _0802765C
str r0, [r1]
movs r0, 0x94
lsls r0, 1
adds r1, r2, r0
movs r0, 0x9
str r0, [r1]
adds r0, r5, 0
bl sub_8027DCC
lsls r0, 24
cmp r0, 0
bne _08027550
ldr r0, [r4]
movs r1, 0xB7
lsls r1, 1
adds r0, r1
strh r7, [r0]
_08027550:
movs r7, 0x2
_08027552:
ldr r4, _08027660
ldr r2, [r4]
lsls r3, r7, 3
movs r6, 0x8E
lsls r6, 1
adds r0, r2, r6
adds r0, r3
ldr r1, _08027664
str r1, [r0]
movs r5, 0x90
lsls r5, 1
adds r2, r5
adds r2, r3
movs r0, 0xA
str r0, [r2]
bl sub_8090A34
cmp r0, 0
bne _08027588
ldr r0, [r4]
lsls r1, r7, 1
movs r2, 0xB6
lsls r2, 1
adds r0, r2
adds r0, r1
movs r1, 0x1
strh r1, [r0]
_08027588:
adds r7, 0x1
ldr r2, [r4]
lsls r3, r7, 3
adds r0, r2, r6
adds r0, r3
ldr r1, _08027668
str r1, [r0]
adds r2, r5
adds r2, r3
movs r0, 0xB
str r0, [r2]
bl sub_8090A34
cmp r0, 0x13
bgt _080275AE
ldr r0, [r4]
ldrb r0, [r0, 0x14]
cmp r0, 0
bne _080275BE
_080275AE:
ldr r0, [r4]
lsls r1, r7, 1
movs r3, 0xB6
lsls r3, 1
adds r0, r3
adds r0, r1
movs r1, 0x1
strh r1, [r0]
_080275BE:
adds r7, 0x1
ldr r4, _08027660
ldr r5, [r4]
lsls r1, r7, 3
movs r0, 0x8E
lsls r0, 1
adds r3, r5, r0
adds r2, r3, r1
ldr r0, _0802766C
str r0, [r2]
movs r2, 0x90
lsls r2, 1
adds r6, r5, r2
adds r1, r6, r1
movs r0, 0x4
str r0, [r1]
adds r7, 0x1
lsls r1, r7, 3
adds r2, r3, r1
ldr r0, _08027670
str r0, [r2]
adds r1, r6, r1
movs r0, 0xC
str r0, [r1]
adds r7, 0x1
lsls r1, r7, 3
adds r2, r3, r1
ldr r0, _08027674
str r0, [r2]
adds r1, r6, r1
movs r0, 0x5
str r0, [r1]
adds r7, 0x1
lsls r1, r7, 3
adds r3, r1
movs r0, 0
str r0, [r3]
adds r1, r6, r1
movs r0, 0x1
str r0, [r1]
movs r3, 0
mov r12, r4
cmp r3, r7
bge _08027636
adds r4, r6, 0
movs r0, 0xB6
lsls r0, 1
adds r2, r5, r0
_0802761E:
ldrh r0, [r2]
cmp r0, 0
bne _0802762C
ldr r1, [r4]
ldr r0, [r5, 0x70]
cmp r1, r0
beq _080276A0
_0802762C:
adds r4, 0x8
adds r2, 0x2
adds r3, 0x1
cmp r3, r7
blt _0802761E
_08027636:
movs r3, 0
cmp r3, r7
bge _080276A0
mov r2, r12
ldr r1, [r2]
movs r4, 0xB6
lsls r4, 1
adds r0, r1, r4
ldrh r0, [r0]
cmp r0, 0
bne _08027678
movs r2, 0x90
lsls r2, 1
adds r0, r1, r2
ldr r0, [r0]
str r0, [r1, 0x70]
b _080276A0
.align 2, 0
_08027658: .4byte gFriendActionJoinTeam
_0802765C: .4byte gFriendActionSayFarewell
_08027660: .4byte gUnknown_203B2BC
_08027664: .4byte gFriendActionGive
_08027668: .4byte gFriendActionTake
_0802766C: .4byte gFriendActionSummary
_08027670: .4byte gFriendActionMoves
_08027674: .4byte gFriendActionCheckIQ
_08027678:
adds r3, 0x1
cmp r3, r7
bge _080276A0
mov r4, r12
ldr r2, [r4]
lsls r0, r3, 1
movs r4, 0xB6
lsls r4, 1
adds r1, r2, r4
adds r1, r0
ldrh r0, [r1]
cmp r0, 0
bne _08027678
lsls r0, r3, 3
movs r3, 0x90
lsls r3, 1
adds r1, r2, r3
adds r1, r0
ldr r0, [r1]
str r0, [r2, 0x70]
_080276A0:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end CreateFriendActionMenu
thumb_func_start sub_80276A8
sub_80276A8:
push {r4-r7,lr}
ldr r5, _0802775C
ldr r0, [r5]
movs r7, 0xB6
lsls r7, 1
adds r0, r7
movs r1, 0
movs r2, 0x14
bl MemoryFill16
ldr r2, [r5]
movs r0, 0x8E
lsls r0, 1
adds r1, r2, r0
ldr r0, _08027760
str r0, [r1]
movs r3, 0x90
lsls r3, 1
adds r1, r2, r3
movs r0, 0xA
str r0, [r1]
bl sub_8090A34
cmp r0, 0
bne _080276E4
ldr r0, [r5]
adds r4, r7, 0
adds r0, r4
movs r1, 0x1
strh r1, [r0]
_080276E4:
ldr r4, [r5]
movs r2, 0x1
movs r0, 0x92
lsls r0, 1
adds r1, r4, r0
ldr r0, _08027764
ldr r0, [r0]
str r0, [r1]
movs r3, 0x94
lsls r3, 1
adds r1, r4, r3
movs r0, 0x4
str r0, [r1]
movs r6, 0x2
movs r0, 0x96
lsls r0, 1
adds r1, r4, r0
movs r0, 0
str r0, [r1]
movs r1, 0x98
lsls r1, 1
adds r0, r4, r1
str r2, [r0]
movs r3, 0
mov r12, r4
movs r4, 0x90
lsls r4, 1
add r4, r12
mov r0, r12
adds r2, r0, r7
_08027720:
ldrh r0, [r2]
cmp r0, 0
bne _08027730
ldr r1, [r4]
mov r7, r12
ldr r0, [r7, 0x74]
cmp r1, r0
beq _0802778E
_08027730:
adds r4, 0x8
adds r2, 0x2
adds r3, 0x1
cmp r3, r6
blt _08027720
movs r3, 0
cmp r3, r6
bge _0802778E
ldr r1, [r5]
movs r2, 0xB6
lsls r2, 1
adds r0, r1, r2
ldrh r0, [r0]
cmp r0, 0
bne _08027768
movs r3, 0x90
lsls r3, 1
adds r0, r1, r3
ldr r0, [r0]
str r0, [r1, 0x74]
b _0802778E
.align 2, 0
_0802775C: .4byte gUnknown_203B2BC
_08027760: .4byte gFriendActionGive
_08027764: .4byte gUnknown_80D4970
_08027768:
adds r3, 0x1
cmp r3, r6
bge _0802778E
ldr r2, [r5]
lsls r0, r3, 1
movs r4, 0xB6
lsls r4, 1
adds r1, r2, r4
adds r1, r0
ldrh r0, [r1]
cmp r0, 0
bne _08027768
lsls r0, r3, 3
movs r7, 0x90
lsls r7, 1
adds r1, r2, r7
adds r1, r0
ldr r0, [r1]
str r0, [r2, 0x74]
_0802778E:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80276A8
thumb_func_start sub_8027794
sub_8027794:
push {r4,lr}
ldr r4, _080277F0
ldr r0, [r4]
movs r1, 0xB6
lsls r1, 1
adds r0, r1
movs r1, 0
movs r2, 0x14
bl MemoryFill16
ldr r4, [r4]
movs r3, 0
movs r0, 0x8E
lsls r0, 1
adds r1, r4, r0
ldr r0, _080277F4
ldr r0, [r0]
str r0, [r1]
movs r0, 0x90
lsls r0, 1
adds r1, r4, r0
movs r0, 0x2
str r0, [r1]
movs r2, 0x1
movs r0, 0x92
lsls r0, 1
adds r1, r4, r0
ldr r0, _080277F8
ldr r0, [r0]
str r0, [r1]
movs r0, 0x94
lsls r0, 1
adds r1, r4, r0
movs r0, 0x3
str r0, [r1]
movs r1, 0x96
lsls r1, 1
adds r0, r4, r1
str r3, [r0]
adds r1, 0x4
adds r0, r4, r1
str r2, [r0]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080277F0: .4byte gUnknown_203B2BC
_080277F4: .4byte gUnknown_80D4920
_080277F8: .4byte gUnknown_80D4928
thumb_func_end sub_8027794
thumb_func_start sub_80277FC
sub_80277FC:
push {r4,lr}
movs r0, 0x1
bl sub_8023A94
cmp r0, 0x4
bhi _080278AE
lsls r0, 2
ldr r1, _08027814
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08027814: .4byte _08027818
.align 2, 0
_08027818:
.4byte _080278AE
.4byte _080278AE
.4byte _080278A4
.4byte _0802782C
.4byte _08027868
_0802782C:
bl sub_8023B44
ldr r4, _08027860
ldr r1, [r4]
strh r0, [r1, 0x8]
ldr r3, _08027864
movs r0, 0x8
ldrsh r2, [r1, r0]
movs r0, 0x58
muls r2, r0
ldr r0, [r3]
adds r0, r2
str r0, [r1, 0x18]
ldrb r0, [r0, 0x2]
strb r0, [r1, 0x1C]
ldr r1, [r4]
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
bl sub_808D7DC
movs r0, 0x3
bl sub_8027184
b _080278AE
.align 2, 0
_08027860: .4byte gUnknown_203B2BC
_08027864: .4byte gRecruitedPokemonRef
_08027868:
bl sub_8023B44
ldr r4, _0802789C
ldr r1, [r4]
strh r0, [r1, 0x8]
ldr r3, _080278A0
movs r0, 0x8
ldrsh r2, [r1, r0]
movs r0, 0x58
muls r2, r0
ldr r0, [r3]
adds r0, r2
str r0, [r1, 0x18]
ldrb r0, [r0, 0x2]
strb r0, [r1, 0x1C]
ldr r1, [r4]
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
bl sub_808D7DC
movs r0, 0x4
bl sub_8027184
b _080278AE
.align 2, 0
_0802789C: .4byte gUnknown_203B2BC
_080278A0: .4byte gRecruitedPokemonRef
_080278A4:
bl sub_8023C60
movs r0, 0x11
bl sub_8027184
_080278AE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80277FC
thumb_func_start sub_80278B4
sub_80278B4:
push {r4,lr}
sub sp, 0x4
movs r0, 0
str r0, [sp]
bl sub_8023A94
ldr r4, _080278F8
ldr r0, [r4]
adds r0, 0x7C
bl sub_8012FD8
lsls r0, 24
cmp r0, 0
bne _080278E4
ldr r0, [r4]
adds r0, 0x7C
mov r1, sp
bl sub_8013114
ldr r1, [sp]
cmp r1, 0x1
beq _080278E4
ldr r0, [r4]
str r1, [r0, 0x70]
_080278E4:
ldr r0, [sp]
subs r0, 0x1
cmp r0, 0xB
bls _080278EE
b _08027A36
_080278EE:
lsls r0, 2
ldr r1, _080278FC
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_080278F8: .4byte gUnknown_203B2BC
_080278FC: .4byte _08027900
.align 2, 0
_08027900:
.4byte _08027A30
.4byte _08027A36
.4byte _08027A36
.4byte _08027A20
.4byte _08027A28
.4byte _08027930
.4byte _0802796C
.4byte _0802798C
.4byte _080279C0
.4byte _080279D0
.4byte _080279D8
.4byte _080279C8
_08027930:
ldr r4, _08027964
ldr r0, [r4]
movs r1, 0x8
ldrsh r0, [r0, r1]
bl sub_808D750
lsls r0, 24
cmp r0, 0
beq _0802795E
ldr r0, [r4]
movs r2, 0x8
ldrsh r1, [r0, r2]
movs r0, 0x58
muls r1, r0
ldr r0, _08027968
ldr r0, [r0]
adds r1, r0
ldrh r2, [r1]
movs r0, 0x2
orrs r0, r2
strh r0, [r1]
bl nullsub_104
_0802795E:
bl sub_808ED00
b _08027A0E
.align 2, 0
_08027964: .4byte gUnknown_203B2BC
_08027968: .4byte gRecruitedPokemonRef
_0802796C:
ldr r0, _08027984
ldr r0, [r0]
ldr r2, [r0, 0x18]
ldrh r1, [r2]
ldr r0, _08027988
ands r0, r1
strh r0, [r2]
bl nullsub_104
bl sub_808ED00
b _08027A0E
.align 2, 0
_08027984: .4byte gUnknown_203B2BC
_08027988: .4byte 0x0000fffd
_0802798C:
ldr r2, _080279B8
ldr r0, _080279BC
ldr r0, [r0]
movs r3, 0x8
ldrsh r1, [r0, r3]
movs r0, 0x58
muls r1, r0
ldr r0, [r2]
adds r4, r0, r1
bl sub_808D33C
ldrb r1, [r4, 0x2]
cmp r1, 0
bne _080279B2
strb r1, [r0, 0x2]
movs r0, 0x1
strb r0, [r4, 0x2]
bl nullsub_104
_080279B2:
bl sub_808ED00
b _08027A0E
.align 2, 0
_080279B8: .4byte gRecruitedPokemonRef
_080279BC: .4byte gUnknown_203B2BC
_080279C0:
movs r0, 0x8
bl sub_8027184
b _08027A36
_080279C8:
movs r0, 0xE
bl sub_8027184
b _08027A36
_080279D0:
movs r0, 0xA
bl sub_8027184
b _08027A36
_080279D8:
ldr r0, _08027A18
bl PlaySound
ldr r4, _08027A1C
ldr r1, [r4]
ldrb r0, [r1, 0x14]
cmp r0, 0
beq _080279F0
adds r0, r1, 0
adds r0, 0x14
bl sub_8091274
_080279F0:
bl sub_80910B4
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]
ldr r0, [r4]
strb r1, [r0, 0x15]
ldr r1, [r4]
movs r2, 0x8
ldrsh r0, [r1, r2]
adds r1, 0x14
bl sub_808D800
bl nullsub_104
_08027A0E:
movs r0, 0x2
bl sub_8027184
b _08027A36
.align 2, 0
_08027A18: .4byte 0x0000014d
_08027A1C: .4byte gUnknown_203B2BC
_08027A20:
movs r0, 0x4
bl sub_8027184
b _08027A36
_08027A28:
movs r0, 0x5
bl sub_8027184
b _08027A36
_08027A30:
movs r0, 0x2
bl sub_8027184
_08027A36:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80278B4
thumb_func_start sub_8027A40
sub_8027A40:
push {lr}
bl sub_80244E4
cmp r0, 0x1
bls _08027A58
cmp r0, 0x3
bhi _08027A58
bl sub_802453C
movs r0, 0x2
bl sub_8027184
_08027A58:
pop {r0}
bx r0
thumb_func_end sub_8027A40
thumb_func_start sub_8027A5C
sub_8027A5C:
push {lr}
bl sub_801BF48
cmp r0, 0x1
bls _08027A74
cmp r0, 0x3
bhi _08027A74
bl sub_801BF98
movs r0, 0x2
bl sub_8027184
_08027A74:
pop {r0}
bx r0
thumb_func_end sub_8027A5C
thumb_func_start sub_8027A78
sub_8027A78:
push {lr}
sub sp, 0x4
mov r0, sp
bl sub_80144A4
cmp r0, 0
bne _08027AD8
ldr r0, [sp]
cmp r0, 0x2
beq _08027AA2
cmp r0, 0x2
bgt _08027A96
cmp r0, 0x1
beq _08027A9A
b _08027AD8
_08027A96:
cmp r0, 0x3
bne _08027AD8
_08027A9A:
movs r0, 0x2
bl sub_8027184
b _08027AD8
_08027AA2:
ldr r0, _08027AB8
ldr r0, [r0]
ldr r0, [r0, 0x18]
ldrb r0, [r0, 0x4]
subs r0, 0x44
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bhi _08027ABC
movs r0, 0x1
b _08027ABE
.align 2, 0
_08027AB8: .4byte gUnknown_203B2BC
_08027ABC:
movs r0, 0
_08027ABE:
cmp r0, 0
beq _08027ACA
movs r0, 0x9
bl sub_8027184
b _08027AD8
_08027ACA:
bl sub_8027EB8
ldr r0, _08027AE0
ldr r0, [r0]
ldr r0, [r0, 0x18]
bl sub_808D31C
_08027AD8:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_08027AE0: .4byte gUnknown_203B2BC
thumb_func_end sub_8027A78
.align 2,0

46
asm/friend_rescue.s
View File

@ -1542,7 +1542,7 @@ _080335C0:
adds r0, r4
ldr r1, _080335F0
add r2, sp, 0x14
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r5]
adds r0, r4
b _0803388E
@ -2543,7 +2543,7 @@ sub_8033D74:
movs r0, 0x17
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_08033D8E:
add sp, 0x4
pop {r0}
@ -2558,11 +2558,11 @@ sub_8033D94:
bl sub_80144A4
cmp r0, 0
bne _08033DB6
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _08033DB6
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x18
bl sub_80338C4
_08033DB6:
@ -3410,11 +3410,11 @@ sub_8034478:
bl sub_80144A4
cmp r0, 0
bne _0803449A
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _0803449A
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x2
bl sub_80338C4
_0803449A:
@ -3434,7 +3434,7 @@ sub_80344A0:
movs r0, 0x2C
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_080344BA:
add sp, 0x4
pop {r0}
@ -3710,11 +3710,11 @@ sub_80346D8:
bl sub_80144A4
cmp r0, 0
bne _080346FA
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _080346FA
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x2
bl sub_80338C4
_080346FA:
@ -3734,7 +3734,7 @@ sub_8034700:
movs r0, 0x38
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_0803471A:
add sp, 0x4
pop {r0}
@ -3859,7 +3859,7 @@ sub_80347E4:
movs r0, 0x41
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_080347FE:
add sp, 0x4
pop {r0}
@ -3874,11 +3874,11 @@ sub_8034804:
bl sub_80144A4
cmp r0, 0
bne _08034826
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _08034826
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x42
bl sub_80338C4
_08034826:
@ -4536,7 +4536,7 @@ sub_8034D54:
movs r0, 0x65
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_08034D6E:
add sp, 0x4
pop {r0}
@ -4699,11 +4699,11 @@ sub_8034EC8:
bl sub_80144A4
cmp r0, 0
bne _08034EEA
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _08034EEA
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x2
bl sub_80338C4
_08034EEA:
@ -4720,11 +4720,11 @@ sub_8034EF0:
bl sub_80144A4
cmp r0, 0
bne _08034F12
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _08034F12
bl sub_8012750
bl FinishWriteSavePak
movs r0, 0x2
bl sub_80338C4
_08034F12:
@ -4744,7 +4744,7 @@ sub_8034F18:
movs r0, 0x65
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_08034F32:
add sp, 0x4
pop {r0}
@ -4762,7 +4762,7 @@ sub_8034F38:
movs r0, 0x71
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_08034F52:
add sp, 0x4
pop {r0}
@ -4880,7 +4880,7 @@ sub_8035018:
movs r0, 0x76
bl sub_80338C4
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_08035032:
add sp, 0x4
pop {r0}
@ -4895,11 +4895,11 @@ sub_8035038:
bl sub_80144A4
cmp r0, 0
bne _0803508E
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _0803508E
bl sub_8012750
bl FinishWriteSavePak
ldr r0, _0803506C
ldr r0, [r0]
ldr r1, _08035070

12
asm/game_options.s
View File

@ -62,8 +62,8 @@ _08094A3E:
bx r1
thumb_func_end GameOptionsNotChange
thumb_func_start sub_8094A44
sub_8094A44:
thumb_func_start WriteSaveOptions
WriteSaveOptions:
push {r4-r7,lr}
sub sp, 0x4
adds r4, r0, 0
@ -167,10 +167,10 @@ _08094AEC:
bx r0
.align 2, 0
_08094B14: .4byte gUnknown_203B46C
thumb_func_end sub_8094A44
thumb_func_end WriteSaveOptions
thumb_func_start sub_8094B18
sub_8094B18:
thumb_func_start ReadSaveOptions
ReadSaveOptions:
push {r4-r6,lr}
mov r6, r8
push {r6}
@ -286,7 +286,7 @@ sub_8094B18:
bx r0
.align 2, 0
_08094C10: .4byte gUnknown_203B46C
thumb_func_end sub_8094B18
thumb_func_end ReadSaveOptions
thumb_func_start sub_8094C14
sub_8094C14:

1799
asm/gulpin_shop.s
View File

File diff suppressed because it is too large Load Diff

14
asm/items.s
View File

@ -47,7 +47,7 @@ _08090E50:
ldr r2, [r0]
ldrb r3, [r5, 0x1]
mov r0, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08090EC4
.align 2, 0
_08090E68: .4byte gUnknown_8109770
@ -61,7 +61,7 @@ _08090E70:
adds r0, r2
ldr r2, [r0]
mov r0, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08090EC4
.align 2, 0
_08090E88: .4byte gUnknown_8109778
@ -76,7 +76,7 @@ _08090E90:
adds r2, r0, 0
mov r0, sp
adds r1, r4, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08090EC4
.align 2, 0
_08090EAC: .4byte gUnknown_810977C
@ -99,7 +99,7 @@ _08090EC4:
ldr r1, _08090F30
adds r0, r6, 0
mov r2, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
mov r0, sp
adds r1, r6, 0
movs r2, 0x50
@ -118,7 +118,7 @@ _08090EE2:
ldr r1, _08090F34
adds r0, r6, 0
mov r2, sp
bl sub_800D158
bl ExpandPlaceholdersBuffer
mov r0, sp
adds r1, r6, 0
movs r2, 0x50
@ -218,7 +218,7 @@ _08090F9C:
str r2, [sp]
adds r0, r5, 0
adds r2, r6, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
b _08090FDE
.align 2, 0
_08090FC4: .4byte gUnknown_8109794
@ -231,7 +231,7 @@ _08090FC8:
adds r0, r5, 0
adds r2, r6, 0
add r3, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
_08090FDE:
add sp, 0x2C
pop {r4-r6}

129
asm/kangaskhan_storage_1.s
View File

@ -932,133 +932,4 @@ _08017D1A:
bx r0
thumb_func_end sub_8017C7C
thumb_func_start sub_8017D24
sub_8017D24:
push {r4,lr}
sub sp, 0x4
movs r0, 0
str r0, [sp]
bl sub_801CA08
ldr r4, _08017D64
ldr r0, [r4]
adds r0, 0x58
bl sub_8012FD8
lsls r0, 24
cmp r0, 0
bne _08017D54
ldr r0, [r4]
adds r0, 0x58
mov r1, sp
bl sub_8013114
ldr r1, [sp]
cmp r1, 0x1
beq _08017D54
ldr r0, [r4]
str r1, [r0, 0x20]
_08017D54:
ldr r0, [sp]
cmp r0, 0x3
beq _08017D6E
cmp r0, 0x3
bgt _08017D68
cmp r0, 0x1
beq _08017DB0
b _08017DB6
.align 2, 0
_08017D64: .4byte gUnknown_203B208
_08017D68:
cmp r0, 0x6
beq _08017DA8
b _08017DB6
_08017D6E:
bl sub_8090A34
cmp r0, 0x13
ble _08017D82
bl sub_801CBB8
movs r0, 0x6
bl UpdateKangaskhanStorageState
b _08017DB6
_08017D82:
ldr r0, _08017D9C
ldr r0, [r0]
ldrb r0, [r0, 0xE]
bl sub_8090A60
lsls r0, 24
cmp r0, 0
beq _08017DA0
movs r0, 0x18
bl UpdateKangaskhanStorageState
b _08017DB6
.align 2, 0
_08017D9C: .4byte gUnknown_203B208
_08017DA0:
movs r0, 0x1B
bl UpdateKangaskhanStorageState
b _08017DB6
_08017DA8:
movs r0, 0x1A
bl UpdateKangaskhanStorageState
b _08017DB6
_08017DB0:
movs r0, 0x17
bl UpdateKangaskhanStorageState
_08017DB6:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8017D24
thumb_func_start sub_8017DC0
sub_8017DC0:
push {lr}
bl sub_801B410
cmp r0, 0x1
bls _08017DD8
cmp r0, 0x3
bhi _08017DD8
bl sub_801B450
movs r0, 0xE
bl UpdateKangaskhanStorageState
_08017DD8:
pop {r0}
bx r0
thumb_func_end sub_8017DC0
thumb_func_start sub_8017DDC
sub_8017DDC:
push {lr}
bl sub_801B410
cmp r0, 0x1
bls _08017DF4
cmp r0, 0x3
bhi _08017DF4
bl sub_801B450
movs r0, 0x17
bl UpdateKangaskhanStorageState
_08017DF4:
pop {r0}
bx r0
thumb_func_end sub_8017DDC
thumb_func_start sub_8017DF8
sub_8017DF8:
push {lr}
sub sp, 0x4
mov r0, sp
bl sub_80144A4
cmp r0, 0
bne _08017E10
ldr r0, _08017E18
ldr r0, [r0]
ldr r0, [r0, 0x8]
bl UpdateKangaskhanStorageState
_08017E10:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_08017E18: .4byte gUnknown_203B208
thumb_func_end sub_8017DF8
.align 2,0

2
asm/makuhita_dojo.s
View File

@ -829,7 +829,7 @@ _08030608:
add r0, sp, 0x8
ldr r1, _08030664
adds r2, r5, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
mov r5, r8
ldr r0, [r5]
ldr r3, [r0, 0x64]

0
asm/code_808DAB4.s → asm/pokemon_2.s
View File

6
asm/pokemon_square.s
View File

@ -438,7 +438,7 @@ _0801A1BC:
mov r0, r8
ldr r1, _0801A204
add r2, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
adds r1, r6, 0
bl sub_8013800
@ -906,7 +906,7 @@ _0801A588:
mov r0, r8
ldr r1, _0801A5D0
add r2, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
adds r1, r6, 0
bl sub_8013800
@ -1666,7 +1666,7 @@ _0801AB90:
ldr r1, _0801AC08
adds r0, r5, 0
add r2, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r4, _0801AC0C
ldr r0, [r4]
adds r0, 0x54

46
asm/text.s
View File

@ -5,52 +5,6 @@
.text
thumb_func_start nullsub_152
nullsub_152:
bx lr
thumb_func_end nullsub_152
thumb_func_start sub_8006518
sub_8006518:
push {r4-r7,lr}
ldr r4, _0800653C
adds r2, r0, 0
movs r3, 0x3
_08006520:
adds r1, r2, 0
adds r0, r4, 0
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
adds r4, 0x18
adds r2, 0x18
subs r3, 0x1
cmp r3, 0
bge _08006520
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_0800653C: .4byte gUnknown_202AFC0
thumb_func_end sub_8006518
thumb_func_start nullsub_153
nullsub_153:
bx lr
thumb_func_end nullsub_153
thumb_func_start sub_8006544
sub_8006544:
ldr r1, _08006550
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bx lr
.align 2, 0
_08006550: .4byte gUnknown_80B8814
thumb_func_end sub_8006544
thumb_func_start sub_8006554
sub_8006554:
push {r4-r7,lr}

10
asm/wonder_mail_1.s
View File

@ -124,7 +124,7 @@ sub_802A828:
movs r0, 0x1
bl sub_8011C28
movs r0, 0
bl sub_8012574
bl PrepareSavePakWrite
_0802A848:
add sp, 0x4
pop {r0}
@ -139,11 +139,11 @@ sub_802A850:
bl sub_80144A4
cmp r0, 0
bne _0802A89A
bl sub_8012600
bl WriteSavePak
lsls r0, 24
cmp r0, 0
bne _0802A89A
bl sub_8012750
bl FinishWriteSavePak
ldr r0, _0802A884
ldr r0, [r0]
ldr r1, _0802A888
@ -703,7 +703,7 @@ _0802ACC8:
adds r0, r4
ldr r1, _0802AD00
add r2, sp, 0x14
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r2, [r5]
adds r4, r2, r4
movs r0, 0x84
@ -1174,7 +1174,7 @@ _0802B0AC:
adds r0, r4
ldr r1, _0802B0E8
adds r2, r6, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r2, [r5]
adds r4, r2, r4
movs r3, 0x84

2
asm/wonder_mail_4.s
View File

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

12
asm/wonder_mail_5.s
View File

@ -56,7 +56,7 @@ _08031B2C:
ldr r1, _08031B8C
ldrb r2, [r5, 0x5]
add r0, sp, 0x4
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@ -71,7 +71,7 @@ _08031B2C:
adds r2, r0, 0
add r0, sp, 0x4
adds r1, r4, 0
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
str r6, [sp]
@ -136,7 +136,7 @@ _08031BC2:
ldrb r2, [r4, 0x5]
ldr r0, [sp, 0xD8]
ldr r1, _08031C2C
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r0, r8
@ -167,7 +167,7 @@ _08031C30:
adds r0, r5, 0
ldr r1, _08031C54
mov r2, r9
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r1, r8
@ -194,7 +194,7 @@ _08031C70:
adds r0, r5, 0
ldr r1, _08031C98
_08031C7E:
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8
@ -214,7 +214,7 @@ _08031C9C:
adds r2, r0, 0
adds r0, r5, 0
ldr r1, _08031CD0
bl sub_800D158
bl ExpandPlaceholdersBuffer
ldr r0, [r7]
ldr r3, [r0, 0x10]
mov r2, r8

120
data/data_80B9BB8.s
View File

@ -551,123 +551,3 @@ gUnknown_80D4144: @ 80D4144
.global defaultText
defaultText:
.string "default\0"
@ Error Handling
.global gFuncFileLineString
gFuncFileLineString: @ 80D418C
.string "func = '%s'\n"
.string "file = '%s' line = %5d\0"
.global gNotEntryText
gNotEntryText: @ 80D41B0
.string "--- not entry ---\0"
.align 2,0
.global gFuncFileLineStringWPrefix
gFuncFileLineStringWPrefix: @ 80D41C4
.string "%sfunc = '%s'\n"
.string "file = '%s' line = %5d\n\0"
.align 2,0
.global gFuncFileLineString2
gFuncFileLineString2: @ 80D41EC
.string "func = '%s'\n"
.string "file = '%s' line = %5d\n\0"
.align 2,0
.string "pksdir0\0"
.global gUnknown_80D421C
gUnknown_80D421C: @ 80D421C
.string " Print \0"
.align 2,0
.string "pksdir0\0"
.align 2,0
.global Performance_Text
Performance_Text:
.string "Performance\0"
.align 2,0
.global MemoryCard_Text
MemoryCard_Text:
.string "Memory Card\0"
.align 2,0
.global Memory_Text
Memory_Text:
.string "Memory\0"
.align 2,0
.global Flag_Text
Flag_Text:
.string "Flag\0"
.align 2,0
.global Se_Text
Se_Text:
.string "Se\0"
.align 2,0
.global Bgm_Text
Bgm_Text:
.string "Bgm\0"
.align 2,0
.global Sound_Text
Sound_Text:
.string "Sound\0"
.align 2,0
.global Dungeon_Text
Dungeon_Text:
.string "Dungeon\0"
.align 2,0
.global GroundScript_Text
GroundScript_Text:
.string "GroundScript\0"
.align 2,0
.global Ground_Text
Ground_Text:
.string "Ground\0"
.align 2,0
.global gNotMountText
gNotMountText: @ 80D4288
.string "not mount log system\0"
.align 2,0
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.global gFatalText
gFatalText: @ 80D42C0
.string "!!!!! Fatal !!!!!\n\0"
.align 2,0
.global gUnknown_80D42D4
gUnknown_80D42D4: @ 80D42D4
.string "%s\n\0"
.align 2,0
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.global PokeDungeon_Text
PokeDungeon_Text:
.string "POKE_DUNGEON__05\0"
.align 2,0
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"

18
data/data_810AE24.s
View File

@ -244,8 +244,8 @@ gUnknown_810DFB4: @ 810DFB4
gUnknown_810DFC8: @ 810DFC8
.byte 0xB8, 0xDF, 0x10, 0x08
.global gUnknown_810DFCC
gUnknown_810DFCC: @ 810DFCC
.global gEvolutionStrings
gEvolutionStrings: @ 810DFCC
.4byte NotNowText
.4byte PossibleText
.4byte NoMoreText
@ -363,7 +363,7 @@ gUnknown_8113918: @ 8113918
.global gUnknown_8113934
gUnknown_8113934: @ 8113934
.byte 0x1c, 0x39, 0x11, 0x08
.byte 0x1c, 0x39, 0x11, 0x08
.string "Attack#>42.#c2$d0#r \0"
.align 2,0
@ -759,14 +759,14 @@ gUnknown_8116148: @ 8116148
.byte 0x05, 0x01
.byte 0x00, 0x00
.global gUnknown_811615C
gUnknown_811615C: @ 811615C
.global gInvalidityText
gInvalidityText: @ 811615C
@ replacing .incbin "baserom.gba", 0x0011615c, 0x10
.string "#CWinvalidity#R\0"
.align 2,0
.global gUnknown_811616C
gUnknown_811616C: @ 811616C
.global gUndefineText
gUndefineText: @ 811616C
@ replacing .incbin "baserom.gba", 0x0011616c, 0x10
.string "#CWundefine#R\0"
.align 2,0
@ -1663,8 +1663,8 @@ gUnknown_8118250: @ 8118250
.byte 0xF9, 0x06, 0x00, 0x00
.4byte ExecutePlayerScriptActionLives_Text
.global gUnknown_811825C
gUnknown_811825C: @ 811825C
.global gGroundLives_InvalidityText
gGroundLives_InvalidityText: @ 811825C
.string "#CWinvalidity#R\0"
.align 2,0

7
data/debug.s Normal file
View File

@ -0,0 +1,7 @@
.section .rodata
@ Error Handling
.global gFuncFileLineString
gFuncFileLineString: @ 80D418C
.string "func = '%s'\n"
.string "file = '%s' line = %5d\0"

2
data/dungeon/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
**/pokemon_found.inc
**/floor_id.inc

184
data/dungeon/FrostyForest/pokemon_found.json Normal file
View File

@ -0,0 +1,184 @@
{
"tables": [{
"name": "FrostyForest_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_FURRET",
"level": 14,
"probability": 6250
},
{
"species": "SPECIES_AZURILL",
"level": 11,
"probability": 3750
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyForest_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_FURRET",
"level": 14,
"probability": 4167
},
{
"species": "SPECIES_AZURILL",
"level": 11,
"probability": 2500
},
{
"species": "SPECIES_NOSEPASS",
"level": 13,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyForest_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"level": 25,
"probability": 1429
},
{
"species": "SPECIES_FURRET",
"level": 14,
"probability": 3571
},
{
"species": "SPECIES_PILOSWINE",
"level": 14,
"probability": 2143
},
{
"species": "SPECIES_NOSEPASS",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyForest_5F_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"level": 25,
"probability": 2222
},
{
"species": "SPECIES_PILOSWINE",
"level": 14,
"probability": 3334
},
{
"species": "SPECIES_NOSEPASS",
"level": 13,
"probability": 4444
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyForest_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"level": 25,
"probability": 2000
},
{
"species": "SPECIES_MIGHTYENA",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_LAIRON",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyForest_8F_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DITTO",
"level": 25,
"probability": 1600
},
{
"species": "SPECIES_MIGHTYENA",
"level": 17,
"probability": 3200
},
{
"species": "SPECIES_LAIRON",
"level": 17,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SNORUNT",
"level": 20,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}
]
}

47
data/dungeon/FrostyGrotto/pokemon_found.json Normal file
View File

@ -0,0 +1,47 @@
{
"tables": [{
"name": "FrostyGrotto_1F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RHYHORN",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_METANG",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "FrostyGrotto_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARTICUNO",
"level": 33,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}
]
}

85
data/dungeon/GreatCanyon/pokemon_found.inc
View File

@ -1,85 +0,0 @@
.global GreatCanyon_1F_3F_Pokemon
GreatCanyon_1F_3F_Pokemon:
.byte 0x54, 0x1c, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0xbc, 0x1a, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xe7, 0x1a, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x00, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_4F_Pokemon
GreatCanyon_4F_Pokemon:
.byte 0x2d, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0x54, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_5F_Pokemon
GreatCanyon_5F_Pokemon:
.byte 0x2d, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x37, 0x1d, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_6F_Pokemon
GreatCanyon_6F_Pokemon:
.byte 0x2d, 0x1c, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0xa4, 0x1c, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc6, 0x1c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x37, 0x1d, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_7F_Pokemon
GreatCanyon_7F_Pokemon:
.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xc6, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_8F_Pokemon
GreatCanyon_8F_Pokemon:
.byte 0xa4, 0x1c, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x65, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_9F_Pokemon
GreatCanyon_9F_Pokemon:
.byte 0xa8, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xef, 0x1c, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_10F_11F_Pokemon
GreatCanyon_10F_11F_Pokemon:
.byte 0x80, 0x1e, 0x05, 0x0c, 0x05, 0x0c, 0x00, 0x00
.byte 0xa8, 0x1c, 0x0a, 0x18, 0x0a, 0x18, 0x00, 0x00
.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global GreatCanyon_12F_Pokemon
GreatCanyon_12F_Pokemon:
.byte 0x80, 0x1e, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
.byte 0xfe, 0x1e, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

284
data/dungeon/GreatCanyon/pokemon_found.json Normal file
View File

@ -0,0 +1,284 @@
{
"tables": [{
"name": "GreatCanyon_1F_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_DODUO",
"level": 14,
"probability": 1429
},
{
"species": "SPECIES_SKIPLOOM",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_DUNSPARCE",
"level": 13,
"probability": 2857
},
{
"species": "SPECIES_PHANPY",
"level": 14,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_DODUO",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_BRELOOM",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_MURKROW",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_BRELOOM",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VILEPLUME",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_NOCTOWL",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_MURKROW",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_BRELOOM",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_CACTURNE",
"level": 14,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_NOCTOWL",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_MURKROW",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_HERACROSS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_NOCTOWL",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_ARIADOS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_HERACROSS",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_CACTURNE",
"level": 14,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ARIADOS",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_HERACROSS",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_10F_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_TAUROS",
"level": 15,
"probability": 3077
},
{
"species": "SPECIES_ARIADOS",
"level": 14,
"probability": 3077
},
{
"species": "SPECIES_HOUNDOOM",
"level": 15,
"probability": 3846
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "GreatCanyon_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_TAUROS",
"level": 15,
"probability": 4444
},
{
"species": "SPECIES_HOUNDOOM",
"level": 15,
"probability": 5556
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

57
data/dungeon/LapisCave/pokemon_found.inc
View File

@ -1,57 +0,0 @@
.global LapisCave_1F_3F_Pokemon
LapisCave_1F_3F_Pokemon:
.byte 0x29, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_4F_Pokemon
LapisCave_4F_Pokemon:
.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x3b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_5F_8F_Pokemon
LapisCave_5F_8F_Pokemon:
.byte 0x1e, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x21, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x53, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_9F_10F_Pokemon
LapisCave_9F_10F_Pokemon:
.byte 0x72, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_11F_12F_Pokemon
LapisCave_11F_12F_Pokemon:
.byte 0x2a, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x72, 0x1c, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_13F_Pokemon
LapisCave_13F_Pokemon:
.byte 0x2a, 0x14, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x8f, 0x21, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global LapisCave_14F_Pokemon
LapisCave_14F_Pokemon:
.byte 0x2a, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

174
data/dungeon/LapisCave/pokemon_found.json Normal file
View File

@ -0,0 +1,174 @@
{
"tables": [{
"name": "LapisCave_1F_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_ZUBAT",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_NINCADA",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_4F_Pokemon",
"pokemon": [{
"species": "SPECIES_NIDORINA",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_NIDORINO",
"level": 15,
"probability": 3334
},
{
"species": "SPECIES_NINCADA",
"level": 14,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_5F_8F_Pokemon",
"pokemon": [{
"species": "SPECIES_NIDORINA",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_NIDORINO",
"level": 15,
"probability": 3334
},
{
"species": "SPECIES_ILLIMISE",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_9F_10F_Pokemon",
"pokemon": [{
"species": "SPECIES_TANGELA",
"level": 14,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_11F_12F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"level": 10,
"probability": 3333
},
{
"species": "SPECIES_TANGELA",
"level": 14,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"level": 16,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_13F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"level": 10,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BAGON",
"level": 16,
"probability": 5000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "LapisCave_14F_Pokemon",
"pokemon": [{
"species": "SPECIES_GOLBAT",
"level": 10,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

220
data/dungeon/MtBlaze/pokemon_found.json Normal file
View File

@ -0,0 +1,220 @@
{
"tables": [{
"name": "MtBlaze_1F_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_PIDGEOT",
"level": 16,
"probability": 2857
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 1429
},
{
"species": "SPECIES_MAGBY",
"level": 17,
"probability": 2857
},
{
"species": "SPECIES_NUMEL",
"level": 14,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 2000
},
{
"species": "SPECIES_MAGBY",
"level": 17,
"probability": 4000
},
{
"species": "SPECIES_NUMEL",
"level": 14,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_5F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"level": 15,
"probability": 1304
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 1739
},
{
"species": "SPECIES_MAGBY",
"level": 17,
"probability": 3479
},
{
"species": "SPECIES_NUMEL",
"level": 14,
"probability": 3478
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_6F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 2667
},
{
"species": "SPECIES_NUMEL",
"level": 14,
"probability": 5333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_7F_Pokemon",
"pokemon": [{
"species": "SPECIES_SHUCKLE",
"level": 15,
"probability": 2000
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 2667
},
{
"species": "SPECIES_TORKOAL",
"level": 15,
"probability": 5333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_8F_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"level": 10,
"probability": 3478
},
{
"species": "SPECIES_SHUCKLE",
"level": 15,
"probability": 1305
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 1739
},
{
"species": "SPECIES_TORKOAL",
"level": 15,
"probability": 3478
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlaze_10F_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RAPIDASH",
"level": 10,
"probability": 4000
},
{
"species": "SPECIES_SLUGMA",
"level": 16,
"probability": 2000
},
{
"species": "SPECIES_TORKOAL",
"level": 15,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}
]
}

45
data/dungeon/MtBlazePeak/pokemon_found.json Normal file
View File

@ -0,0 +1,45 @@
{
"tables": [{
"name": "MtBlazePeak_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_FEAROW",
"level": 17,
"probability": 5000
},
{
"species": "SPECIES_ARCANINE",
"level": 18,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtBlazePeak_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_MOLTRES",
"level": 32,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

216
data/dungeon/MtFreeze/pokemon_found.json Normal file
View File

@ -0,0 +1,216 @@
{
"tables": [{
"name": "MtFreeze_1F_2F_Pokemon",
"pokemon": [
{
"species": "SPECIES_PINECO",
"level": 18,
"probability": 1111
},
{
"species": "SPECIES_SWABLU",
"level": 18,
"probability": 4445
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"level": 19,
"probability": 4444
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_3F_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"level": 18,
"probability": 2759
},
{
"species": "SPECIES_PINECO",
"level": 18,
"probability": 689
},
{
"species": "SPECIES_PUPITAR",
"level": 17,
"probability": 1035
},
{
"species": "SPECIES_SWABLU",
"level": 18,
"probability": 2758
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"level": 19,
"probability": 2759
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"level": 18,
"probability": 3333
},
{
"species": "SPECIES_SWABLU",
"level": 18,
"probability": 3334
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_SHELGON",
"level": 19,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SEEL",
"level": 18,
"probability": 2857
},
{
"species": "SPECIES_VIGOROTH",
"level": 20,
"probability": 2857
},
{
"species": "SPECIES_ZANGOOSE",
"level": 18,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"level": 22,
"probability": 1429
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_8F_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VIGOROTH",
"level": 20,
"probability": 4000
},
{
"species": "SPECIES_ZANGOOSE",
"level": 18,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLAKING",
"level": 15,
"probability": 4000
},
{
"species": "SPECIES_ZANGOOSE",
"level": 18,
"probability": 4000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_CHIMECHO",
"level": 22,
"probability": 2000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreeze_13F_15F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SLAKING",
"level": 15,
"probability": 5000
},
{
"species": "SPECIES_SEVIPER",
"level": 19,
"probability": 5000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

56
data/dungeon/MtFreezePeak/pokemon_found.json Normal file
View File

@ -0,0 +1,56 @@
{
"tables": [{
"name": "MtFreezePeak_1F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"level": 20,
"probability": 10000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtFreezePeak_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_CHARIZARD",
"level": 55,
"probability": 0
},
{
"species": "SPECIES_ALAKAZAM",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_TYRANITAR",
"level": 50,
"probability": 0
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_GLALIE",
"level": 20,
"probability": 10000
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

12
data/dungeon/MtSteel/floor_id.inc
View File

@ -1,12 +0,0 @@
.global MtSteelFloorID
MtSteelFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x08, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x09, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0a, 0x00, 0x05, 0x00, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0b, 0x00, 0x05, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0c, 0x00, 0x06, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0d, 0x00, 0x07, 0x00, 0x01, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0e, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x0f, 0x00, 0x08, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x09, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00

86
data/dungeon/MtSteel/floor_id.json Normal file
View File

@ -0,0 +1,86 @@
{
"name": "MtSteelFloorID",
"tables": [
{
"MainData": 8,
"Pokemon": 5,
"Traps": 1,
"Items": 8,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 9,
"Pokemon": 5,
"Traps": 1,
"Items": 8,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 10,
"Pokemon": 5,
"Traps": 1,
"Items": 8,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 11,
"Pokemon": 5,
"Traps": 1,
"Items": 9,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 12,
"Pokemon": 6,
"Traps": 1,
"Items": 9,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 13,
"Pokemon": 7,
"Traps": 1,
"Items": 9,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 14,
"Pokemon": 8,
"Traps": 1,
"Items": 10,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 15,
"Pokemon": 8,
"Traps": 1,
"Items": 10,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 16,
"Pokemon": 9,
"Traps": 1,
"Items": 10,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
}
]
}

53
data/dungeon/MtSteel/pokemon_found.inc
View File

@ -1,53 +0,0 @@
.global MtSteel_1F_4F_Pokemon
MtSteel_1F_4F_Pokemon:
.byte 0x15, 0x08, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0x20, 0x0b, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0x49, 0x0d, 0xdf, 0x1d, 0xdf, 0x1d, 0x00, 0x00
.byte 0x70, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_5F_Pokemon
MtSteel_5F_Pokemon:
.byte 0x4a, 0x0a, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0x05, 0x0d, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x0b, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x49, 0x0d, 0x9f, 0x1f, 0x9f, 0x1f, 0x00, 0x00
.byte 0x4c, 0x0d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_6F_Pokemon
MtSteel_6F_Pokemon:
.byte 0x4a, 0x0a, 0x03, 0x08, 0x03, 0x08, 0x00, 0x00
.byte 0x05, 0x0d, 0x07, 0x10, 0x07, 0x10, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4c, 0x0d, 0x0e, 0x22, 0x0e, 0x22, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_7F_8F_Pokemon
MtSteel_7F_8F_Pokemon:
.byte 0x4a, 0x0a, 0x61, 0x06, 0x61, 0x06, 0x00, 0x00
.byte 0x7f, 0x0c, 0x59, 0x0e, 0x59, 0x0e, 0x00, 0x00
.byte 0x05, 0x0d, 0xba, 0x14, 0xba, 0x14, 0x00, 0x00
.byte 0x49, 0x0d, 0xb3, 0x1c, 0xb3, 0x1c, 0x00, 0x00
.byte 0x4c, 0x0d, 0x14, 0x23, 0x14, 0x23, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtSteel_9F_Pokemon
MtSteel_9F_Pokemon:
.byte 0x32, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xfc, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x49, 0x0d, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x92, 0x0b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

188
data/dungeon/MtSteel/pokemon_found.json Normal file
View File

@ -0,0 +1,188 @@
{
"tables": [{
"name": "MtSteel_1F_4F_Pokemon",
"pokemon": [{
"species": "SPECIES_SPEAROW",
"level": 4,
"probability": 2353
},
{
"species": "SPECIES_ZIGZAGOON",
"level": 5,
"probability": 2353
},
{
"species": "SPECIES_ARON",
"level": 6,
"probability": 2941
},
{
"species": "SPECIES_BALTOY",
"level": 5,
"probability": 2353
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtSteel_5F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"level": 5,
"probability": 1905
},
{
"species": "SPECIES_TYROGUE",
"level": 6,
"probability": 1905
},
{
"species": "SPECIES_ZIGZAGOON",
"level": 5,
"probability": 1904
},
{
"species": "SPECIES_ARON",
"level": 6,
"probability": 2381
},
{
"species": "SPECIES_MEDITITE",
"level": 6,
"probability": 1905
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtSteel_6F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"level": 5,
"probability": 2051
},
{
"species": "SPECIES_TYROGUE",
"level": 6,
"probability": 2052
},
{
"species": "SPECIES_ARON",
"level": 6,
"probability": 2564
},
{
"species": "SPECIES_MEDITITE",
"level": 6,
"probability": 2051
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"level": 5,
"probability": 1282
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtSteel_7F_8F_Pokemon",
"pokemon": [{
"species": "SPECIES_GEODUDE",
"level": 5,
"probability": 1633
},
{
"species": "SPECIES_PINSIR",
"level": 6,
"probability": 2040
},
{
"species": "SPECIES_TYROGUE",
"level": 6,
"probability": 1633
},
{
"species": "SPECIES_ARON",
"level": 6,
"probability": 2041
},
{
"species": "SPECIES_MEDITITE",
"level": 6,
"probability": 1633
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"level": 5,
"probability": 1020
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtSteel_9F_Pokemon",
"pokemon": [{
"species": "SPECIES_DIGLETT",
"level": 5,
"probability": 0
},
{
"species": "SPECIES_SKARMORY",
"level": 10,
"probability": 0
},
{
"species": "SPECIES_ARON",
"level": 6,
"probability": 6667
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_BELDUM",
"level": 5,
"probability": 3333
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

84
data/dungeon/MtThunder/pokemon_found.inc
View File

@ -1,84 +0,0 @@
.global MtThunder_1F_Pokemon
MtThunder_1F_Pokemon:
.byte 0x0d, 0x10, 0x53, 0x07, 0x53, 0x07, 0x00, 0x00
.byte 0x20, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x4e, 0x19, 0xbd, 0x1f, 0xbd, 0x1f, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_2F_4F_Pokemon
MtThunder_2F_4F_Pokemon:
.byte 0x0d, 0x10, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0x20, 0x18, 0x2e, 0x18, 0x2e, 0x18, 0x00, 0x00
.byte 0x4e, 0x19, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00
.byte 0x64, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_5F_Pokemon
MtThunder_5F_Pokemon:
.byte 0x0f, 0x14, 0x35, 0x05, 0x35, 0x05, 0x00, 0x00
.byte 0x11, 0x16, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00
.byte 0x7d, 0x18, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_6F_Pokemon
MtThunder_6F_Pokemon:
.byte 0x0f, 0x14, 0x02, 0x06, 0x02, 0x06, 0x00, 0x00
.byte 0x7d, 0x18, 0x07, 0x12, 0x07, 0x12, 0x00, 0x00
.byte 0xb5, 0x18, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_7F_Pokemon
MtThunder_7F_Pokemon:
.byte 0x0f, 0x14, 0x57, 0x04, 0x57, 0x04, 0x00, 0x00
.byte 0x7d, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xb5, 0x18, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xe8, 0x18, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x03, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_8F_Pokemon
MtThunder_8F_Pokemon:
.byte 0x0f, 0x14, 0x66, 0x03, 0x66, 0x03, 0x00, 0x00
.byte 0x7d, 0x18, 0x31, 0x0a, 0x31, 0x0a, 0x00, 0x00
.byte 0xb5, 0x18, 0x49, 0x0f, 0x49, 0x0f, 0x00, 0x00
.byte 0xe8, 0x18, 0xc7, 0x17, 0xc7, 0x17, 0x00, 0x00
.byte 0x03, 0x13, 0x92, 0x1e, 0x92, 0x1e, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_9F_Pokemon
MtThunder_9F_Pokemon:
.byte 0x3a, 0x14, 0x71, 0x07, 0x71, 0x07, 0x00, 0x00
.byte 0xb5, 0x18, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xe8, 0x18, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00
.byte 0x03, 0x13, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunder_10F_Pokemon
MtThunder_10F_Pokemon:
.byte 0x3a, 0x14, 0x31, 0x09, 0x31, 0x09, 0x00, 0x00
.byte 0xb5, 0x18, 0x16, 0x10, 0x16, 0x10, 0x00, 0x00
.byte 0xe8, 0x18, 0x93, 0x1b, 0x93, 0x1b, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

300
data/dungeon/MtThunder/pokemon_found.json Normal file
View File

@ -0,0 +1,300 @@
{
"tables": [{
"name": "MtThunder_1F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 1875
},
{
"species": "SPECIES_NIDORAN_M",
"level": 12,
"probability": 3125
},
{
"species": "SPECIES_ELECTRIKE",
"level": 12,
"probability": 3125
},
{
"species": "SPECIES_CACNEA",
"level": 11,
"probability": 1875
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_2F_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 1429
},
{
"species": "SPECIES_PIDGEOTTO",
"level": 11,
"probability": 2381
},
{
"species": "SPECIES_NIDORAN_M",
"level": 12,
"probability": 2380
},
{
"species": "SPECIES_ELECTRIKE",
"level": 12,
"probability": 2381
},
{
"species": "SPECIES_CACNEA",
"level": 11,
"probability": 1429
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"level": 10,
"probability": 1333
},
{
"species": "SPECIES_PIDGEOTTO",
"level": 11,
"probability": 3334
},
{
"species": "SPECIES_ELECTABUZZ",
"level": 12,
"probability": 2666
},
{
"species": "SPECIES_STANTLER",
"level": 9,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"level": 10,
"probability": 1538
},
{
"species": "SPECIES_ELECTABUZZ",
"level": 12,
"probability": 3077
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 2308
},
{
"species": "SPECIES_STANTLER",
"level": 9,
"probability": 3077
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"level": 10,
"probability": 1111
},
{
"species": "SPECIES_ELECTABUZZ",
"level": 12,
"probability": 2222
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 1667
},
{
"species": "SPECIES_GLIGAR",
"level": 12,
"probability": 2778
},
{
"species": "SPECIES_STANTLER",
"level": 9,
"probability": 2222
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"level": 10,
"probability": 870
},
{
"species": "SPECIES_ELECTABUZZ",
"level": 12,
"probability": 1739
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 1304
},
{
"species": "SPECIES_GLIGAR",
"level": 12,
"probability": 2174
},
{
"species": "SPECIES_STANTLER",
"level": 9,
"probability": 1739
},
{
"species": "SPECIES_MANECTRIC",
"level": 9,
"probability": 2174
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GROWLITHE",
"level": 10,
"probability": 1905
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 1428
},
{
"species": "SPECIES_GLIGAR",
"level": 12,
"probability": 2381
},
{
"species": "SPECIES_STANTLER",
"level": 9,
"probability": 1905
},
{
"species": "SPECIES_MANECTRIC",
"level": 9,
"probability": 2381
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunder_10F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GROWLITHE",
"level": 10,
"probability": 2353
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 1765
},
{
"species": "SPECIES_GLIGAR",
"level": 12,
"probability": 2941
},
{
"species": "SPECIES_MANECTRIC",
"level": 9,
"probability": 2941
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

17
data/dungeon/MtThunderPeak/pokemon_found.inc
View File

@ -1,17 +0,0 @@
.global MtThunderPeak_1F_2F_Pokemon
MtThunderPeak_1F_2F_Pokemon:
.byte 0x3a, 0x14, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7d, 0x18, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xb5, 0x18, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0xe8, 0x18, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x4f, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global MtThunderPeak_3F_Pokemon
MtThunderPeak_3F_Pokemon:
.byte 0x91, 0x32, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

59
data/dungeon/MtThunderPeak/pokemon_found.json Normal file
View File

@ -0,0 +1,59 @@
{
"tables": [{
"name": "MtThunderPeak_1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_GROWLITHE",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_ELECTABUZZ",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_AMPHAROS",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_GLIGAR",
"level": 12,
"probability": 2000
},
{
"species": "SPECIES_MANECTRIC",
"level": 9,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "MtThunderPeak_3F_Pokemon",
"pokemon": [{
"species": "SPECIES_ZAPDOS",
"level": 25,
"probability": 10000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

84
data/dungeon/SilentChasm/pokemon_found.inc
View File

@ -1,84 +0,0 @@
.global SilentChasm_1F_3F_Pokemon
SilentChasm_1F_3F_Pokemon:
.byte 0x0d, 0x10, 0x83, 0x06, 0x83, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0x6b, 0x0a, 0x6b, 0x0a, 0x00, 0x00
.byte 0x53, 0x14, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf1, 0x14, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_4F_Pokemon
SilentChasm_4F_Pokemon:
.byte 0x0d, 0x10, 0xda, 0x0a, 0xda, 0x0a, 0x00, 0x00
.byte 0x2c, 0x14, 0x5c, 0x11, 0x5c, 0x11, 0x00, 0x00
.byte 0xc1, 0x14, 0x62, 0x1e, 0x62, 0x1e, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_5F_Pokemon
SilentChasm_5F_Pokemon:
.byte 0x0d, 0x10, 0xeb, 0x05, 0xeb, 0x05, 0x00, 0x00
.byte 0x2c, 0x14, 0x78, 0x09, 0x78, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0x20, 0x14, 0x20, 0x14, 0x00, 0x00
.byte 0xfd, 0x16, 0x98, 0x1d, 0x98, 0x1d, 0x00, 0x00
.byte 0x26, 0x15, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_6F_Pokemon
SilentChasm_6F_Pokemon:
.byte 0x0d, 0x10, 0x28, 0x04, 0x28, 0x04, 0x00, 0x00
.byte 0x2c, 0x14, 0xa6, 0x06, 0xa6, 0x06, 0x00, 0x00
.byte 0x3c, 0x14, 0x24, 0x09, 0x24, 0x09, 0x00, 0x00
.byte 0xa7, 0x16, 0x21, 0x0e, 0x21, 0x0e, 0x00, 0x00
.byte 0xc1, 0x14, 0x1e, 0x13, 0x1e, 0x13, 0x00, 0x00
.byte 0xfd, 0x16, 0xc4, 0x19, 0xc4, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x6a, 0x20, 0x6a, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_7F_Pokemon
SilentChasm_7F_Pokemon:
.byte 0x2c, 0x14, 0x8c, 0x02, 0x8c, 0x02, 0x00, 0x00
.byte 0x2e, 0x16, 0xf2, 0x05, 0xf2, 0x05, 0x00, 0x00
.byte 0x3c, 0x14, 0x7e, 0x08, 0x7e, 0x08, 0x00, 0x00
.byte 0xa7, 0x16, 0x96, 0x0d, 0x96, 0x0d, 0x00, 0x00
.byte 0xc1, 0x14, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00
.byte 0xfd, 0x16, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
.byte 0x26, 0x15, 0x45, 0x20, 0x45, 0x20, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_8F_Pokemon
SilentChasm_8F_Pokemon:
.byte 0x2c, 0x14, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0x2e, 0x16, 0x1d, 0x09, 0x1d, 0x09, 0x00, 0x00
.byte 0x3c, 0x14, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xa7, 0x16, 0xd5, 0x14, 0xd5, 0x14, 0x00, 0x00
.byte 0xc1, 0x14, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SilentChasm_9F_Pokemon
SilentChasm_9F_Pokemon:
.byte 0x0f, 0x14, 0xbc, 0x06, 0xbc, 0x06, 0x00, 0x00
.byte 0x2c, 0x14, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0x2e, 0x16, 0x2a, 0x10, 0x2a, 0x10, 0x00, 0x00
.byte 0x3c, 0x14, 0x34, 0x14, 0x34, 0x14, 0x00, 0x00
.byte 0xa7, 0x16, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x61, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

316
data/dungeon/SilentChasm/pokemon_found.json Normal file
View File

@ -0,0 +1,316 @@
{
"tables": [{
"name": "SilentChasm_1F_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 1667
},
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 1000
},
{
"species": "SPECIES_FARFETCHD",
"level": 10,
"probability": 2666
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_TEDDIURSA",
"level": 10,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 2778
},
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 1666
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 3334
},
{
"species": "SPECIES_DUSTOX",
"level": 10,
"probability": 2222
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 1515
},
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 909
},
{
"species": "SPECIES_POLIWAG",
"level": 10,
"probability": 909
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 1819
},
{
"species": "SPECIES_HOUNDOUR",
"level": 11,
"probability": 2424
},
{
"species": "SPECIES_DUSTOX",
"level": 10,
"probability": 2424
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_WEEDLE",
"level": 8,
"probability": 1064
},
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 638
},
{
"species": "SPECIES_POLIWAG",
"level": 10,
"probability": 638
},
{
"species": "SPECIES_SPINARAK",
"level": 11,
"probability": 1277
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 1277
},
{
"species": "SPECIES_HOUNDOUR",
"level": 11,
"probability": 1702
},
{
"species": "SPECIES_DUSTOX",
"level": 10,
"probability": 1702
},
{
"species": "SPECIES_TRAPINCH",
"level": 11,
"probability": 1702
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 652
},
{
"species": "SPECIES_PARAS",
"level": 11,
"probability": 870
},
{
"species": "SPECIES_POLIWAG",
"level": 10,
"probability": 652
},
{
"species": "SPECIES_SPINARAK",
"level": 11,
"probability": 1304
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 1305
},
{
"species": "SPECIES_HOUNDOUR",
"level": 11,
"probability": 1739
},
{
"species": "SPECIES_DUSTOX",
"level": 10,
"probability": 1739
},
{
"species": "SPECIES_TRAPINCH",
"level": 11,
"probability": 1739
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_8F_Pokemon",
"pokemon": [
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 1000
},
{
"species": "SPECIES_PARAS",
"level": 11,
"probability": 1333
},
{
"species": "SPECIES_POLIWAG",
"level": 10,
"probability": 1000
},
{
"species": "SPECIES_SPINARAK",
"level": 11,
"probability": 2000
},
{
"species": "SPECIES_YANMA",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_TRAPINCH",
"level": 11,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SilentChasm_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_BEEDRILL",
"level": 10,
"probability": 1724
},
{
"species": "SPECIES_GLOOM",
"level": 10,
"probability": 1035
},
{
"species": "SPECIES_PARAS",
"level": 11,
"probability": 1379
},
{
"species": "SPECIES_POLIWAG",
"level": 10,
"probability": 1034
},
{
"species": "SPECIES_SPINARAK",
"level": 11,
"probability": 2069
},
{
"species": "SPECIES_TRAPINCH",
"level": 11,
"probability": 2759
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

126
data/dungeon/SinisterWoods/pokemon_found.inc
View File

@ -1,126 +0,0 @@
.global SinisterWoods_1F_Pokemon
SinisterWoods_1F_Pokemon:
.byte 0x2b, 0x0e, 0x2b, 0x06, 0x2b, 0x06, 0x00, 0x00
.byte 0xb9, 0x0e, 0x9d, 0x16, 0x9d, 0x16, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_2F_Pokemon
SinisterWoods_2F_Pokemon:
.byte 0x2b, 0x0e, 0x54, 0x05, 0x54, 0x05, 0x00, 0x00
.byte 0xb9, 0x0e, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0xc0, 0x10, 0xdc, 0x18, 0xdc, 0x18, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_3F_Pokemon
SinisterWoods_3F_Pokemon:
.byte 0x2b, 0x0e, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x53, 0x0e, 0x53, 0x0e, 0x00, 0x00
.byte 0xb9, 0x0e, 0xbd, 0x18, 0xbd, 0x18, 0x00, 0x00
.byte 0xc0, 0x10, 0xa5, 0x1c, 0xa5, 0x1c, 0x00, 0x00
.byte 0xf5, 0x10, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_4F_Pokemon
SinisterWoods_4F_Pokemon:
.byte 0x2b, 0x0e, 0xa9, 0x03, 0xa9, 0x03, 0x00, 0x00
.byte 0xa1, 0x0c, 0x6d, 0x0d, 0x6d, 0x0d, 0x00, 0x00
.byte 0xb9, 0x0e, 0x31, 0x17, 0x31, 0x17, 0x00, 0x00
.byte 0xc0, 0x10, 0xdb, 0x1a, 0xdb, 0x1a, 0x00, 0x00
.byte 0x23, 0x11, 0xf5, 0x20, 0xf5, 0x20, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_5F_Pokemon
SinisterWoods_5F_Pokemon:
.byte 0xa1, 0x0c, 0xe2, 0x0e, 0xe2, 0x0e, 0x00, 0x00
.byte 0xc0, 0x10, 0x76, 0x14, 0x76, 0x14, 0x00, 0x00
.byte 0x23, 0x11, 0xc3, 0x1d, 0xc3, 0x1d, 0x00, 0x00
.byte 0x25, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_6F_Pokemon
SinisterWoods_6F_Pokemon:
.byte 0xa1, 0x0c, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00
.byte 0xc0, 0x10, 0xd1, 0x0e, 0xd1, 0x0e, 0x00, 0x00
.byte 0x23, 0x11, 0x8d, 0x15, 0x8d, 0x15, 0x00, 0x00
.byte 0x25, 0x11, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_7F_Pokemon
SinisterWoods_7F_Pokemon:
.byte 0xa5, 0x0e, 0x60, 0x09, 0x60, 0x09, 0x00, 0x00
.byte 0xc0, 0x10, 0x10, 0x0e, 0x10, 0x0e, 0x00, 0x00
.byte 0x21, 0x11, 0x90, 0x1a, 0x90, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_8F_9F_Pokemon
SinisterWoods_8F_9F_Pokemon:
.byte 0x7b, 0x14, 0xee, 0x08, 0xee, 0x08, 0x00, 0x00
.byte 0xa5, 0x0e, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xc2, 0x14, 0x35, 0x15, 0x35, 0x15, 0x00, 0x00
.byte 0x21, 0x11, 0x22, 0x1e, 0x22, 0x1e, 0x00, 0x00
.byte 0x36, 0x13, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_10F_Pokemon
SinisterWoods_10F_Pokemon:
.byte 0x67, 0x10, 0x21, 0x06, 0x21, 0x06, 0x00, 0x00
.byte 0x7b, 0x14, 0x41, 0x0c, 0x41, 0x0c, 0x00, 0x00
.byte 0xa3, 0x0c, 0x62, 0x12, 0x62, 0x12, 0x00, 0x00
.byte 0xa5, 0x0e, 0xfa, 0x16, 0xfa, 0x16, 0x00, 0x00
.byte 0xc2, 0x14, 0xcf, 0x1a, 0xcf, 0x1a, 0x00, 0x00
.byte 0x36, 0x13, 0xef, 0x20, 0xef, 0x20, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_11F_Pokemon
SinisterWoods_11F_Pokemon:
.byte 0x67, 0x10, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x7b, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00
.byte 0xa3, 0x0c, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x36, 0x13, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_12F_Pokemon
SinisterWoods_12F_Pokemon:
.byte 0x67, 0x10, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00
.byte 0xa3, 0x0c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x36, 0x13, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x38, 0x11, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global SinisterWoods_13F_Pokemon
SinisterWoods_13F_Pokemon:
.byte 0x17, 0x1e, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0x5e, 0x1e, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x4d, 0x19, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

446
data/dungeon/SinisterWoods/pokemon_found.json Normal file
View File

@ -0,0 +1,446 @@
{
"tables": [{
"name": "SinisterWoods_1F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"level": 7,
"probability": 1579
},
{
"species": "SPECIES_SUDOWOODO",
"level": 7,
"probability": 4210
},
{
"species": "SPECIES_SWINUB",
"level": 8,
"probability": 4211
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_2F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"level": 7,
"probability": 1364
},
{
"species": "SPECIES_SUDOWOODO",
"level": 7,
"probability": 3636
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 1364
},
{
"species": "SPECIES_SWINUB",
"level": 8,
"probability": 3636
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"level": 7,
"probability": 1000
},
{
"species": "SPECIES_SENTRET",
"level": 6,
"probability": 2667
},
{
"species": "SPECIES_SUDOWOODO",
"level": 7,
"probability": 2666
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 1000
},
{
"species": "SPECIES_SWINUB",
"level": 8,
"probability": 2667
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_4F_Pokemon",
"pokemon": [
{
"species": "SPECIES_ODDISH",
"level": 7,
"probability": 937
},
{
"species": "SPECIES_SENTRET",
"level": 6,
"probability": 2500
},
{
"species": "SPECIES_SUDOWOODO",
"level": 7,
"probability": 2500
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 938
},
{
"species": "SPECIES_SILCOON",
"level": 8,
"probability": 1562
},
{
"species": "SPECIES_CASCOON",
"level": 8,
"probability": 1563
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SENTRET",
"level": 6,
"probability": 3810
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 1428
},
{
"species": "SPECIES_SILCOON",
"level": 8,
"probability": 2381
},
{
"species": "SPECIES_CASCOON",
"level": 8,
"probability": 2381
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_6F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SENTRET",
"level": 6,
"probability": 2759
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 1034
},
{
"species": "SPECIES_SILCOON",
"level": 8,
"probability": 1724
},
{
"species": "SPECIES_CASCOON",
"level": 8,
"probability": 1724
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 2759
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_7F_Pokemon",
"pokemon": [
{
"species": "SPECIES_LEDYBA",
"level": 7,
"probability": 2400
},
{
"species": "SPECIES_SUNFLORA",
"level": 8,
"probability": 1200
},
{
"species": "SPECIES_LINOONE",
"level": 8,
"probability": 3200
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 3200
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_8F_9F_Pokemon",
"pokemon": [
{
"species": "SPECIES_SCYTHER",
"level": 10,
"probability": 2286
},
{
"species": "SPECIES_LEDYBA",
"level": 7,
"probability": 1714
},
{
"species": "SPECIES_WOOPER",
"level": 10,
"probability": 1429
},
{
"species": "SPECIES_LINOONE",
"level": 8,
"probability": 2285
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 2286
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_10F_Pokemon",
"pokemon": [
{
"species": "SPECIES_EXEGGUTOR",
"level": 8,
"probability": 1569
},
{
"species": "SPECIES_SCYTHER",
"level": 10,
"probability": 1568
},
{
"species": "SPECIES_HOOTHOOT",
"level": 6,
"probability": 1569
},
{
"species": "SPECIES_LEDYBA",
"level": 7,
"probability": 1176
},
{
"species": "SPECIES_WOOPER",
"level": 10,
"probability": 981
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 1568
},
{
"species": "SPECIES_SLAKOTH",
"level": 8,
"probability": 1569
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_11F_Pokemon",
"pokemon": [
{
"species": "SPECIES_EXEGGUTOR",
"level": 8,
"probability": 2000
},
{
"species": "SPECIES_SCYTHER",
"level": 10,
"probability": 2000
},
{
"species": "SPECIES_HOOTHOOT",
"level": 6,
"probability": 2000
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 2000
},
{
"species": "SPECIES_SLAKOTH",
"level": 8,
"probability": 2000
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_12F_Pokemon",
"pokemon": [
{
"species": "SPECIES_EXEGGUTOR",
"level": 8,
"probability": 2500
},
{
"species": "SPECIES_HOOTHOOT",
"level": 6,
"probability": 2500
},
{
"species": "SPECIES_SHROOMISH",
"level": 9,
"probability": 2500
},
{
"species": "SPECIES_SLAKOTH",
"level": 8,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "SinisterWoods_13F_Pokemon",
"pokemon": [
{
"species": "SPECIES_EKANS",
"level": 15,
"probability": 3333
},
{
"species": "SPECIES_GENGAR",
"level": 15,
"probability": 3334
},
{
"species": "SPECIES_MEDICHAM",
"level": 12,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

8
data/dungeon/ThunderwaveCave/floor_id.inc
View File

@ -1,8 +0,0 @@
.global ThunderwaveCaveFloorID
ThunderwaveCaveFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x04, 0x00, 0x02, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x03, 0x00, 0x01, 0x00, 0x06, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x06, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x04, 0x00, 0x01, 0x00, 0x07, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00

50
data/dungeon/ThunderwaveCave/floor_id.json Normal file
View File

@ -0,0 +1,50 @@
{
"name": "ThunderwaveCaveFloorID",
"tables": [
{
"MainData": 3,
"Pokemon": 2,
"Traps": 1,
"Items": 6,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 4,
"Pokemon": 2,
"Traps": 1,
"Items": 6,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 5,
"Pokemon": 3,
"Traps": 1,
"Items": 6,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 6,
"Pokemon": 4,
"Traps": 1,
"Items": 7,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 7,
"Pokemon": 4,
"Traps": 1,
"Items": 7,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
}
]
}

28
data/dungeon/ThunderwaveCave/pokemon_found.inc
View File

@ -1,28 +0,0 @@
.global ThunderwaveCave_1F_2F_Pokemon
ThunderwaveCave_1F_2F_Pokemon:
.byte 0x13, 0x06, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00
.byte 0x1d, 0x08, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ThunderwaveCave_3F_Pokemon
ThunderwaveCave_3F_Pokemon:
.byte 0x13, 0x06, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00
.byte 0x1d, 0x08, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00
.byte 0x64, 0x06, 0xed, 0x1e, 0xed, 0x1e, 0x00, 0x00
.byte 0x1e, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global ThunderwaveCave_4F_5F_Pokemon
ThunderwaveCave_4F_5F_Pokemon:
.byte 0x64, 0x06, 0x06, 0x0f, 0x06, 0x0f, 0x00, 0x00
.byte 0x08, 0x09, 0x0b, 0x1b, 0x0b, 0x1b, 0x00, 0x00
.byte 0x50, 0x07, 0x0e, 0x21, 0x0e, 0x21, 0x00, 0x00
.byte 0x51, 0x07, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

100
data/dungeon/ThunderwaveCave/pokemon_found.json Normal file
View File

@ -0,0 +1,100 @@
{
"tables": [{
"name": "ThunderwaveCave_1F_2F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RATTATA",
"level": 3,
"probability": 5000
},
{
"species": "SPECIES_NIDORAN_F",
"level": 4,
"probability": 2500
},
{
"species": "SPECIES_POOCHYENA",
"level": 3,
"probability": 2500
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "ThunderwaveCave_3F_Pokemon",
"pokemon": [
{
"species": "SPECIES_RATTATA",
"level": 3,
"probability": 4167
},
{
"species": "SPECIES_NIDORAN_F",
"level": 4,
"probability": 2083
},
{
"species": "SPECIES_VOLTORB",
"level": 3,
"probability": 1667
},
{
"species": "SPECIES_POOCHYENA",
"level": 3,
"probability": 2083
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "ThunderwaveCave_4F_5F_Pokemon",
"pokemon": [
{
"species": "SPECIES_VOLTORB",
"level": 3,
"probability": 3846
},
{
"species": "SPECIES_ELEKID",
"level": 4,
"probability": 3077
},
{
"species": "SPECIES_PLUSLE",
"level": 3,
"probability": 1539
},
{
"species": "SPECIES_MINUN",
"level": 3,
"probability": 1538
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

6
data/dungeon/TinyWoods/floor_id.inc
View File

@ -1,6 +0,0 @@
.global TinyWoodsFloorID
TinyWoodsFloorID:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00

32
data/dungeon/TinyWoods/floor_id.json Normal file
View File

@ -0,0 +1,32 @@
{
"name": "TinyWoodsFloorID",
"tables": [
{
"MainData": 0,
"Pokemon": 0,
"Traps": 0,
"Items": 0,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 1,
"Pokemon": 0,
"Traps": 0,
"Items": 4,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
},
{
"MainData": 2,
"Pokemon": 1,
"Traps": 0,
"Items": 5,
"KecleonShop": 1,
"MonsterRoomItems": 2,
"BuriedItems": 3
}
]
}

18
data/dungeon/TinyWoods/pokemon_found.inc
View File

@ -1,18 +0,0 @@
.global TinyWoods1F_2FPokemon
TinyWoods1F_2F_Pokemon:
.byte 0x10, 0x02, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00
.byte 0xbf, 0x02, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.global TinyWoods3FPokemon
TinyWoods3F_Pokemon:
.byte 0x10, 0x02, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
.byte 0x66, 0x02, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0xbf, 0x02, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x22, 0x03, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

64
data/dungeon/TinyWoods/pokemon_found.json Normal file
View File

@ -0,0 +1,64 @@
{
"tables": [{
"name": "TinyWoods1F_2F_Pokemon",
"pokemon": [{
"species": "SPECIES_PIDGEY",
"level": 1,
"probability": 3333
},
{
"species": "SPECIES_SUNKERN",
"level": 1,
"probability": 3334
},
{
"species": "SPECIES_WURMPLE",
"level": 1,
"probability": 3333
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}, {
"name": "TinyWoods3F_Pokemon",
"pokemon": [{
"species": "SPECIES_PIDGEY",
"level": 1,
"probability": 2857
},
{
"species": "SPECIES_EXEGGCUTE",
"level": 1,
"probability": 1429
},
{
"species": "SPECIES_SUNKERN",
"level": 1,
"probability": 2857
},
{
"species": "SPECIES_WURMPLE",
"level": 1,
"probability": 2857
},
{
"species": "SPECIES_KECLEON",
"level": 90,
"probability": 0
},
{
"species": "SPECIES_DECOY",
"level": 1,
"probability": 0
}
]
}]
}

118
data/dungeon/pokemon_found.inc
View File

@ -1,5 +1,7 @@
@ Start of Pokemon Found (0x84b6064)
.include "include/constants/species.h"
.include "data/dungeon/TinyWoods/pokemon_found.inc"
.include "data/dungeon/ThunderwaveCave/pokemon_found.inc"
.include "data/dungeon/MtSteel/pokemon_found.inc"
@ -9,66 +11,16 @@
.include "data/dungeon/MtThunderPeak/pokemon_found.inc"
.include "data/dungeon/GreatCanyon/pokemon_found.inc"
.include "data/dungeon/LapisCave/pokemon_found.inc"
.include "data/dungeon/MtBlaze/pokemon_found.inc"
.include "data/dungeon/MtBlazePeak/pokemon_found.inc"
.include "data/dungeon/FrostyForest/pokemon_found.inc"
.include "data/dungeon/FrostyGrotto/pokemon_found.inc"
.include "data/dungeon/MtFreeze/pokemon_found.inc"
.include "data/dungeon/MtFreezePeak/pokemon_found.inc"
.byte 0x12, 0x20, 0x29, 0x0b, 0x29, 0x0b, 0x00, 0x00
.byte 0xf3, 0x20, 0xbe, 0x10, 0xbe, 0x10, 0x00, 0x00
.byte 0x09, 0x23, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xf3, 0x20, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00
.byte 0x09, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xee, 0x1e, 0x18, 0x05, 0x18, 0x05, 0x00, 0x00
.byte 0xf3, 0x20, 0xe3, 0x0b, 0xe3, 0x0b, 0x00, 0x00
.byte 0x09, 0x23, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00
.byte 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00
.byte 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0xee, 0x1e, 0xd0, 0x07
.byte 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5b, 0x1d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x1e, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0xf3, 0x20, 0x3b, 0x12, 0x3b, 0x12, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0x96, 0x0d
.byte 0x96, 0x0d, 0x00, 0x00, 0xee, 0x1e, 0xaf, 0x12, 0xaf, 0x12, 0x00, 0x00, 0xf3, 0x20, 0x7a, 0x19, 0x7a, 0x19, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x14, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0xf3, 0x20, 0x70, 0x17
.byte 0x70, 0x17, 0x00, 0x00, 0x5d, 0x1f, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x16, 0x22, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x3b, 0x24, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x40, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x6a, 0x18, 0x6a, 0x18, 0x00, 0x00, 0x43, 0x17, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x1c, 0x47, 0x10, 0x47, 0x10, 0x00, 0x00, 0x43, 0x17, 0x0b, 0x1a
.byte 0x0b, 0x1a, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x95, 0x05, 0x95, 0x05, 0x00, 0x00, 0xa2, 0x1c, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0xf6, 0x1c, 0xe7, 0x1b, 0xe7, 0x1b, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xae, 0x08
.byte 0xae, 0x08, 0x00, 0x00, 0xf6, 0x1c, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x44, 0x1b, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0xd0, 0x07, 0xd0, 0x07, 0x00, 0x00, 0x1f, 0x23, 0x70, 0x17, 0x70, 0x17, 0x00, 0x00, 0x4a, 0x23, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x32, 0x40, 0x06
.byte 0x40, 0x06, 0x00, 0x00, 0x1f, 0x23, 0xc0, 0x12, 0xc0, 0x12, 0x00, 0x00, 0x4a, 0x23, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x29, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x20, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x93, 0x23, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x42, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5, 0x24, 0x57, 0x04
.byte 0x57, 0x04, 0x00, 0x00, 0x66, 0x25, 0xb4, 0x15, 0xb4, 0x15, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0xc7, 0x0a, 0xc7, 0x0a, 0x00, 0x00, 0xe5, 0x24, 0x78, 0x0d, 0x78, 0x0d, 0x00, 0x00, 0x10, 0x23, 0x83, 0x11
.byte 0x83, 0x11, 0x00, 0x00, 0x66, 0x25, 0x49, 0x1c, 0x49, 0x1c, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x66, 0x25, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x90, 0x27, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x24, 0x29, 0x0b
.byte 0x29, 0x0b, 0x00, 0x00, 0x39, 0x29, 0x52, 0x16, 0x52, 0x16, 0x00, 0x00, 0x68, 0x25, 0x7b, 0x21, 0x7b, 0x21, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x29, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f
.byte 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0xa0, 0x0f, 0xa0, 0x0f, 0x00, 0x00, 0x68, 0x25, 0x40, 0x1f, 0x40, 0x1f, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x2d, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3a, 0x1f, 0x88, 0x13, 0x88, 0x13, 0x00, 0x00, 0x69, 0x27, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x6e, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x29, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13
.byte 0x14, 0x26, 0xc4, 0x09, 0xc4, 0x09, 0x00, 0x00, 0x1b, 0x28, 0x88, 0x13
.byte 0x88, 0x13, 0x00, 0x00, 0x1f, 0x28, 0x4c, 0x1d, 0x4c, 0x1d, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27, 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0x05, 0x0d, 0x05, 0x0d, 0x00, 0x00, 0x1f, 0x28, 0x0b, 0x1a, 0x0b, 0x1a, 0x00, 0x00, 0x22, 0x2a, 0x10, 0x27
.byte 0x10, 0x27, 0x00, 0x00, 0x7c, 0xb5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x28, 0xc4, 0x09
@ -1616,33 +1568,33 @@ DungeonPokemonFoundTable:
.4byte LapisCave_11F_12F_Pokemon
.4byte LapisCave_13F_Pokemon
.4byte LapisCave_14F_Pokemon
.4byte MtBlaze_1F_3F_Pokemon
.4byte MtBlaze_4F_Pokemon
.4byte MtBlaze_5F_Pokemon
.4byte MtBlaze_6F_Pokemon
.4byte MtBlaze_7F_Pokemon
.4byte MtBlaze_8F_9F_Pokemon
.4byte MtBlaze_10F_12F_Pokemon
.4byte MtBlazePeak_1F_2F_Pokemon
.4byte MtBlazePeak_3F_Pokemon
.4byte FrostyForest_1F_2F_Pokemon
.4byte FrostyForest_3F_Pokemon
.4byte FrostyForest_4F_Pokemon
.4byte FrostyForest_5F_6F_Pokemon
.4byte FrostyForest_7F_Pokemon
.4byte FrostyForest_8F_9F_Pokemon
.4byte FrostyGrotto_1F_4F_Pokemon
.4byte FrostyGrotto_5F_Pokemon
.4byte MtFreeze_1F_2F_Pokemon
.4byte MtFreeze_3F_5F_Pokemon
.4byte MtFreeze_6F_Pokemon
.4byte MtFreeze_7F_Pokemon
.4byte MtFreeze_8F_11F_Pokemon
.4byte MtFreeze_12F_Pokemon
.4byte MtFreeze_13F_15F_Pokemon
.4byte MtFreezePeak_1F_4F_Pokemon
.4byte MtFreezePeak_5F_Pokemon
.byte 0xbc, 0x6c, 0x4b, 0x08
.byte 0xf4, 0x6c, 0x4b, 0x08
.byte 0x24, 0x6d, 0x4b, 0x08
.byte 0x5c, 0x6d, 0x4b, 0x08
.byte 0x8c, 0x6d, 0x4b, 0x08
.byte 0xbc, 0x6d, 0x4b, 0x08
.byte 0xf4, 0x6d, 0x4b, 0x08
.byte 0x24, 0x6e, 0x4b, 0x08
.byte 0x4c, 0x6e, 0x4b, 0x08
.byte 0x6c, 0x6e, 0x4b, 0x08
.byte 0x94, 0x6e, 0x4b, 0x08
.byte 0xc4, 0x6e, 0x4b, 0x08
.byte 0xfc, 0x6e, 0x4b, 0x08
.byte 0x2c, 0x6f, 0x4b, 0x08
.byte 0x5c, 0x6f, 0x4b, 0x08
.byte 0x94, 0x6f, 0x4b, 0x08
.byte 0xbc, 0x6f, 0x4b, 0x08
.byte 0xdc, 0x6f, 0x4b, 0x08
.byte 0x0c, 0x70, 0x4b, 0x08
.byte 0x4c, 0x70, 0x4b, 0x08
.byte 0x7c, 0x70, 0x4b, 0x08
.byte 0xb4, 0x70, 0x4b, 0x08
.byte 0xe4, 0x70, 0x4b, 0x08
.byte 0x14, 0x71, 0x4b, 0x08
.byte 0x3c, 0x71, 0x4b, 0x08
.byte 0x5c, 0x71, 0x4b, 0x08
.byte 0x94, 0x71, 0x4b, 0x08
.byte 0xcc, 0x71, 0x4b, 0x08
.byte 0xfc, 0x71, 0x4b, 0x08

6
data/system_sbin.s
View File

@ -4,11 +4,13 @@
gSystemFileArchive: @ 8300500
@ replacing .incbin "baserom.gba", 0x00300500, 0x72e40
.string "pksdir0\0"
.byte 0xaf, 0x01, 0x00, 0x00 @ 431 (421 level maps)
.byte 0x18, 0x05, 0x30, 0x08 @ Pointer to Data Root Table
.4byte 431 @ 431 entries (421 level maps)
.4byte DataRootTable
.string "pksdir0\0"
@ Data Root Table
.global DataRootTable
DataRootTable:
.byte 0x14, 0x20, 0x30, 0x08 @ Pointer to font string
.byte 0x24, 0x20, 0x30, 0x08
.byte 0x08, 0x20, 0x30, 0x08 @ Pointer to fontd8x8 string

12
dungeon_floor.mk Executable file
View File

@ -0,0 +1,12 @@
# Dungeon Floor data
DUNGEONS_DIR = $(DATA_ASM_SUBDIR)/dungeon
DUNGEON_DIRS := $(dir $(wildcard $(DUNGEONS_DIR)/*/floor_id.json))
DUNGEON_FLOOR := $(patsubst $(DUNGEONS_DIR)/%/,$(DUNGEONS_DIR)/%/floor_id.inc,$(DUNGEON_DIRS))
dungeon_floor: $(DUNGEON_FLOOR);
$(DUNGEONS_DIR)/%/floor_id.inc: $(DUNGEONS_DIR)/%/floor_id.json
$(DUNGEONJSON) floor pmd-red $<

11
dungeon_pokemon.mk Executable file
View File

@ -0,0 +1,11 @@
# Dungeon Pokemon data
DUNGEONS_DIR = $(DATA_ASM_SUBDIR)/dungeon
DUNGEON_DIRS := $(dir $(wildcard $(DUNGEONS_DIR)/*/pokemon_found.json))
DUNGEON_POKEMON := $(patsubst $(DUNGEONS_DIR)/%/,$(DUNGEONS_DIR)/%/pokemon_found.inc,$(DUNGEON_DIRS))
dungeon_pokemon: $(DUNGEON_POKEMON);
$(DUNGEONS_DIR)/%/pokemon_found.inc: $(DUNGEONS_DIR)/%/pokemon_found.json
$(DUNGEONJSON) dungeon pmd-red $<

10
include/debug_menu.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_DEBUG_MENU_H
#define GUARD_DEBUG_MENU_H
#include "text.h"
enum DebugMenuOptions
{
MENU_DEBUG_MENU_DUNGEONS = 0,
@ -13,17 +15,11 @@ enum DebugMenuOptions
MENU_DEBUG_MENU_H_OPEN = 9,
};
struct unkData
{
u8 unk0[24];
};
struct DebugMenu
{
// size: 0x1A4
u8 fill0[0x140];
/* 0x140 */ struct unkData unk140[4];
/* 0x140 */ struct UnkTextStruct2 unk140[4];
u32 fill1A0;
};

2
include/exclusive_pokemon.h
View File

@ -5,7 +5,7 @@
struct ExclusivePokemon
{
u16 poke_id;
s16 poke_id;
bool8 in_rrt; // red rescue team
bool8 in_brt; // blue rescue team
};

8
include/felicity_bank.h
View File

@ -2,11 +2,7 @@
#define FELICITY_BANK_H
#include "file_system.h"
struct unkData
{
u8 unk0[24];
};
#include "text.h"
struct unkStruct_203B204
{
@ -30,7 +26,7 @@ struct unkStruct_203B204
u8 unkA2;
u8 unkA3;
struct OpenedFile **unkA4;
struct unkData unkA8[4];
struct UnkTextStruct2 unkA8[4];
};

4
include/friend_area.h
View File

@ -9,7 +9,7 @@ struct FriendAreaSettings
};
void LoadFriendAreas(void);
u8 *GetBoughtFriendAreas(void);
bool8 *GetBoughtFriendAreas(void);
void InitializeFriendAreas(void);
u8 sub_80923D4(s32 target);
bool8 HasAllFriendAreas(void);
@ -20,5 +20,7 @@ u8 GetFriendAreaUnlockCondition(u8 index);
u32 GetFriendAreaPrice(u8 index);
const char *GetFriendAreaName(u8 index);
u32 SaveFriendAreas(u8 *r0, u32 r1);
u32 ReadSavedFriendAreas(u8 *r0, s32 r1);
#endif

50
include/friend_area_action_menu.h Normal file
View File

@ -0,0 +1,50 @@
#ifndef FRIEND_AREA_ACTION_MENU_H
#define FRIEND_AREA_ACTION_MENU_H
struct unkSubStruct_203B2BC
{
u8 fill0[0x2C];
u32 unk2C;
};
struct unkStruct_203B2BC
{
// size: 0x1E0
u32 state;
u32 unk4;
s16 unk8;
u16 unkA;
u32 unkC;
u8 unk10;
u8 unk11;
u8 unk12;
u8 unk13;
u8 unk14;
u8 fill15[3];
struct unkSubStruct_203B2BC *unk18;
u32 unk1C;
u32 unk20;
u32 unk24;
u32 unk28;
u8 fill2C[0x68 - 0x2C];
u32 unk68;
u32 unk6C;
u32 unk70;
s32 unk74;
u32 unk78;
u32 unk7C;
u8 fill80[0xFD - 0x80];
u32 unkFD;
u8 fill101[0x11C - 0x104];
struct MenuItem menuItems[4];
u8 fill120[0x16C - 0x13C];
// Structure of some sort
u32 unk16C;
u8 fill170[0x180 - 0x170];
struct UnkTextStruct2 unk180[4];
};
#endif

15
include/item.h
View File

@ -55,4 +55,19 @@ enum ItemCategory
ITEM_CATEGORY_ORBS
};
void LoadItemParameters(void);
struct unkStruct_203B460 *GetMoneyItemsInfo(void);
void InitializeMoneyItems(void);
u8 GetItemType(u8 index);
s32 GetItemBuyPrice(u8 itemIndex);
s32 GetItemSellPrice(u8 itemIndex);
u8 GetItemOrder(u8 itemIndex);
u8 GetItemPalette(u8 itemIndex);
u8 GetItemCategory(u8 itemIndex);
u32 GetItemUnkThrow(u8 itemIndex, u32 r1);
u8 *GetItemDescription(u8 itemIndex);
u32 GetItemUnkFood(u8 itemIndex, u32 r1);
s32 sub_8090A34(void);
bool8 sub_8090A60(u8 itemIndex);
#endif

15
include/kangaskhan_storage.h
View File

@ -1,11 +1,7 @@
#ifndef KANGASKHAN_STORAGE_H
#define KANGASKHAN_STORAGE_H
struct unkData
{
u8 unk0[20];
u8 *array;
};
#include "text.h"
struct unkStruct_203B208
{
@ -13,13 +9,16 @@ struct unkStruct_203B208
u32 unk0;
u32 currState;
u32 unk8;
u32 unkC;
u16 unkC;
u8 itemIndex;
u8 unkF;
u32 unk10;
u32 unk14;
u32 unk18;
u32 unk1C;
u32 unk20;
u8 fill24[0x58 - 0x24];
u8 fill24[0x4C - 0x24];
u16 unk4C[5];
u32 unk58;
u8 unk5C[0xA8 - 0x5C];
u32 unkA8;
@ -35,7 +34,7 @@ struct unkStruct_203B208
u8 unkE6;
u8 unkE7;
struct OpenedFile **unkE8;
struct unkData unkEC[4];
struct UnkTextStruct2 unkEC[4];
};
#endif

8
include/kecleon_items.h
View File

@ -2,11 +2,7 @@
#define KECLEON_ITEMS_H
#include "gUnknown_203B460.h"
struct unkData
{
u8 unk0[24];
};
#include "text.h"
struct unkStruct_203B210
{
@ -37,7 +33,7 @@ struct unkStruct_203B210
u8 unkE2;
u8 unkE3;
struct OpenedFile **unkE4;
struct unkData unkE8[4];
struct UnkTextStruct2 unkE8[4];
};
#endif

32
include/personality_test.h
View File

@ -2,12 +2,7 @@
#define GUARD_PERSONALITY_TEST_H
#include "constants/personality_test.h"
struct unkData
{
s16 unk0[10];
u8 *unk14;
};
#include "text.h"
// Definitely wrong but need to figure out better structure later
struct FaceData
@ -15,8 +10,18 @@ struct FaceData
/* 0x0 */ u8 *unk0[5];
};
struct PersonalityAnswer
{
const char * text;
int effect;
};
extern const struct unkData gUnknown_80F4244;
struct PersonalityQuestion
{
const char * question;
const struct PersonalityAnswer * answers;
const u8 (*effects);
};
struct PersonalityStruct_203B400
{
@ -39,21 +44,12 @@ struct PersonalityStruct_203B400
};
extern struct PersonalityStruct_203B400 *gUnknown_203B400;
struct PersonalitySubStruct
{
u8 unkb4;
u8 unkb5;
u8 unkb6;
u8 unkb7;
};
struct PersonalityStruct_203B404
{
// Size: 0xB8
/* 0x0 */ s16 StarterID;
/* 0x2 */ s16 PartnerArray[NUM_PARTNERS];
u8 unk16;
u8 unk17;
/* 0x18 */ struct UnkInputStruct *unk18; // something menu related (seems to be some struct)
u8 padding[0x30 - 0x1C];
/* 0x30 */ s16 currPartnerSelection;
@ -62,8 +58,8 @@ struct PersonalityStruct_203B404
/* 0x3A */ s16 numPartners;
u8 padding3[0x4C - 0x3C];
u32 unk4C;
/* 0x50 */ struct unkData *unk50;
/* 0x54 */ struct unkData unk54[4];
/* 0x50 */ struct UnkTextStruct2 *unk50;
/* 0x54 */ struct UnkTextStruct2 unk54[4];
/* 0xB4 */ u8 unkb4[4];
};
extern struct PersonalityStruct_203B404 *gUnknown_203B404;

8
include/pokemon.h
View File

@ -2,6 +2,7 @@
#define POKEMON_H
#include "file_system.h"
#include "constants/species.h"
struct PokemonStruct
{
@ -49,7 +50,7 @@ struct PokemonStruct3
struct unkStruct_203B45C
{
struct PokemonStruct pokemon[0x19D];
struct PokemonStruct pokemon[NUM_SPECIES];
struct PokemonStruct2 pokemon2[4];
struct PokemonStruct3 pokemon3[4];
};
@ -111,6 +112,11 @@ struct gPokemon
/* 0x42 */ s16 alphabetParent[2]; // alphabetNo and parentNo
};
void LoadMonsterParameters(void);
struct unkStruct_203B45C *GetRecruitedPokemon(void);
void InitializeRecruitedPokemon(void);
void CopySpeciesNametoBuffer(u8 * buffer, s16 index);
void CopyYellowSpeciesNametoBuffer(u8 *buffer, s16 index);
void CopyCyanSpeciesNametoBuffer(u8 *buffer, s16 index);

4
include/rescue_team_info.h
View File

@ -35,7 +35,7 @@ void AddToTeamRankPts(s32 newPts);
u8 GetRescueTeamRank(void);
const char *GetTeamRankString(u8 index);
u8 sub_80921B8(void);
u32 sub_80921C4(u8 *param_1,u32 param_2);
u32 sub_809222C(u8 *param_1, u32 param_2);
u32 SaveRescueTeamInfo(u8 *param_1,u32 param_2);
u32 ReadRescueTeamInfo(u8 *param_1, u32 param_2);
#endif // RESCUE_TEAM_INFO_H

52
include/save.h
View File

@ -4,6 +4,8 @@
#include "play_time.h"
#include "exclusive_pokemon.h"
#include "rescue_team_info.h"
#include "pokemon.h"
#include "item.h"
enum
{
@ -12,20 +14,28 @@ enum
SAVE_FAILED
};
enum
{
READ_SAVE_VALID,
READ_SAVE_FAILED,
READ_SAVE_CHECKSUM_ERROR
};
struct UnkStruct_sub_8011DAC {
// size: 0x57D4
u8 fill000[0x4];
u8 unk004[0x400];
u8 unk404[0x10];
u8 unk404[0x10]; // has "POKE_DUNGEON__05"
u32 unk414;
u32 unk418;
u32 unk41C;
u32 unk420;
u32 unk424;
u32 RngState;
u32 savedRecruitedPokemon;
u32 unk428;
u8 fill42C[0x4];
u32 unk430;
u32 unk434;
u32 savedRescueTeamInfo;
u32 savedFriendAreas;
u32 unk43C;
u32 unk440;
@ -35,8 +45,8 @@ struct UnkStruct_sub_8011DAC {
struct UnkStruct_203B184 {
/* 0x0 */ u32 *unk0;
/* 0x4 */ u32 *recruitedPokemon;
/* 0x0 */ struct unkStruct_203B460 *MoneyItems;
/* 0x4 */ struct unkStruct_203B45C *recruitedPokemon;
/* 0x8 */ u8 *unk8;
/* 0xC */ u8 *unkC;
/* 0x10 */ u32 *unk10;
@ -45,7 +55,7 @@ struct UnkStruct_203B184 {
/* 0x1C */ struct RescueTeamData *RescueTeamInfo;
/* 0x20 */ u32 unk20;
/* 0x24 */ struct ExclusivePokemonData *ExclusivePokemon;
/* 0x28 */ u8 *BoughtFriendAreas;
/* 0x28 */ bool8 *BoughtFriendAreas;
/* 0x2C */ u32 gameOptions;
/* 0x30 */ struct PlayTimeStruct *playTime;
u32 unk34;
@ -57,7 +67,7 @@ struct UnkStruct_203B184 {
u8 *unk04C;
u32 unk050;
u32 unk054;
u32 unk058;
u32 RngState;
};
u32 sub_8011C1C(void);
@ -72,19 +82,19 @@ bool8 IsSaveCorrupted(void);
void sub_8012284(void);
void sub_8012298(void);
void sub_80122A8(void);
void sub_8012468(void);
u8 sub_8012484(void);
void sub_8012558(void);
void sub_8012574(s16 PokemonID);
bool8 sub_8012600(void);
u32 sub_8012744(void);
void sub_8012750(void);
u32 sub_80127A8(void);
u8 sub_8012828(void);
void sub_8012834(void);
void sub_8012850(u8 *r0, u32 r1, u8 r2);
u32 sub_80128B0(void);
void sub_80129FC(void);
void PrepareSavePakRead(void);
bool8 ReadSavePak(void);
void FinishReadSavePak(void);
void PrepareSavePakWrite(s16 PokemonID);
bool8 WriteSavePak(void);
u32 GetSavePakStatus(void);
void FinishWriteSavePak(void);
bool8 ReadQuickSave(void);
bool8 IsQuickSaveValid(void);
void FinishQuickSaveRead(void);
void PrepareQuickSaveWrite(u8 *r0, u32 r1, u8 r2);
u32 WriteQuickSave(void);
void FinishQuickSaveWrite(void);
void sub_8012298();
void sub_80122D0();

6
include/text.h
View File

@ -13,9 +13,10 @@ struct UnkTextStruct1 {
struct UnkTextStruct2 {
u8 fill00[0x0c];
s16 unk0c;
u8 fill0e[2];
s16 unkE;
s16 unk10;
u8 fill12[0x06];
s16 unk12;
const u8 *unk14;
};
void LoadCharmaps(void);
@ -26,4 +27,5 @@ void sub_800898C(void);
void sub_80089AC(const struct UnkTextStruct2 *a0, void *a1);
void sub_8009388(void);
void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2);
void sub_8006518(struct UnkTextStruct2 *);
#endif

13
include/trade_items_menu.h
View File

@ -1,10 +1,7 @@
#ifndef GUARD_TRADE_ITEMS_MENU_H
#define GUARD_TRADE_ITEMS_MENU_H
struct unkData
{
u8 unk0[24];
};
#include "text.h"
struct TradeSubStruct
{
@ -28,7 +25,7 @@ struct TradeItemsMenu
u32 unk20;
u32 unk24;
u32 unk28;
struct unkData *unk2C;
struct UnkTextStruct2 *unk2C;
u32 unk30;
u32 unk34;
u8 fill38[0x44 - 0x38];
@ -36,10 +33,8 @@ struct TradeItemsMenu
u8 fill8[0x134 - 0x48];
u32 unk134;
u8 fill138[0x184 - 0x138];
struct unkData unk184[3]; // guessing the size until I know
u8 fill188[0x1E4 - 0x1CC];
u32 unk1E4;
u8 fill1E8[0x244 - 0x1E8];
struct UnkTextStruct2 unk184[4];
struct UnkTextStruct2 unk1E4[4];
// TODO These might be structs...
struct TradeSubStruct unk244;

28
include/wonder_mail.h
View File

@ -2,28 +2,31 @@
#define GUARD_WONDER_MAIL_H
#include "file_system.h"
#include "text.h"
#define PASSWORD_BUFFER_SIZE 0x36
struct WonderMailStruct_203B2C0
{
// size: 0x548
u32 unk0;
u32 unk4;
u8 unk8[0x36];
u32 state;
u8 passwordBuffer[PASSWORD_BUFFER_SIZE];
u8 unk3E;
u32 unk40;
u32 linkError;
u16 unk48[232];
u8 unk218;
u8 padding7[3];
u32 unk21C;
u8 padding[0x7C];
u32 unk29C;
u8 padding6[0x6C];
u32 unk30C;
u8 padding8[0x4C];
u32 unk35C;
u8 padding5[0x5C];
u32 unk3BC;
u8 padding4[0x60];
struct UnkTextStruct2 unk35C[4];
struct UnkTextStruct2 unk3BC[4];
u32 unkfill; // unkStruct_41C?
struct OpenedFile *faceFile;
u8 *faceData;
u16 unk428;
@ -51,10 +54,9 @@ struct unkStruct_41C
struct WonderMailStruct_203B2C4
{
// size: 0x564
u8 unk0;
u8 padding[3];
u8 state;
u32 unk4; // wonder mail link status??
u8 unk8[0x36]; // Probably a buffer for entry
u8 passwordBuffer[PASSWORD_BUFFER_SIZE]; // Probably a buffer for entry
u8 unk3E;
u32 unk40;
u32 linkError; // another link status
@ -64,10 +66,8 @@ struct WonderMailStruct_203B2C4
u8 filler220[0x30C - 0x220];
u32 unk30C;
u8 filler310[0x35C - 0x310];
u32 unk35C;
u8 filler360[0x3BC - 0x360];
u32 unk3BC;
u8 filler3C0[0x41C - 0x3C0];
struct UnkTextStruct2 unk35C[4];
struct UnkTextStruct2 unk3BC[4];
struct unkStruct_41C unk41C;
/* 0x420 */ struct OpenedFile *faceFile;
/* 0x424 */ u8 *faceData;

16
ld_script.txt
View File

@ -65,6 +65,7 @@ SECTIONS {
src/code_800558C.o(.text);
src/random.o(.text);
src/text.o(.text);
src/text_1.o(.text);
asm/text.o(.text);
src/code_8009804.o(.text);
asm/code_8009804.o(.text);
@ -107,8 +108,11 @@ SECTIONS {
asm/code_801D760.o(.text);
src/code_801DCC4.o(.text);
asm/code_801DCC4.o(.text);
src/gulpin_shop.o(.text);
asm/gulpin_shop.o(.text);
src/code_8027C84_pre.o(.text);
src/friend_area_action_menu.o(.text);
asm/friend_area_action_menu.o(.text);
src/friend_area_action_menu_1.o(.text);
asm/code_8027C84.o(.text);
src/wonder_mail_pre.o(.text);
asm/wonder_mail.o(.text);
@ -150,6 +154,8 @@ SECTIONS {
asm/debug_menu.o(.text);
src/debug_menu_mid.o(.text);
asm/debug_menu_1.o(.text);
src/debug_menu_2.o(.text);
asm/debug_menu_2.o(.text);
src/debug_menu_1.o(.text);
asm/code_803B050.o(.text);
src/pokemon_mail.o(.text);
@ -170,6 +176,7 @@ SECTIONS {
asm/code_80521D0.o(.text);
src/code_8057824.o(.text);
asm/code_8057824.o(.text);
asm/code_807001C.o(.text);
src/code_8057824_1.o(.text);
asm/jirachi_wish.o(.text);
src/code_80521D0_1.o(.text);
@ -178,8 +185,7 @@ SECTIONS {
src/pokemon_mid.o(.text);
asm/pokemon_1.o(.text);
src/pokemon_1.o(.text);
src/code_808DAB4.o(.text);
asm/code_808DAB4.o(.text);
asm/pokemon_2.o(.text);
src/code_808EAB0.o(.text);
asm/code_808EAB0.o(.text);
src/dungeon.o(.text);
@ -199,6 +205,8 @@ SECTIONS {
asm/code_8095014.o(.text);
src/code_809747C.o(.text);
asm/code_809747C.o(.text);
src/code_8097670.o(.text);
asm/code_8097670.o(.text);
src/code_8097F40.o(.text);
src/exclusive_pokemon.o(.text);
asm/exclusive_pokemon.o(.text);
@ -282,6 +290,8 @@ SECTIONS {
data/data.o(.rodata);
src/file_system.o(.rodata);
data/data_80B9BB8.o(.rodata);
data/debug.o(.rodata);
src/debug.o(.rodata);
src/save.o(.rodata);
data/data_80D47B8.o(.rodata);
src/wonder_mail.o(.rodata);

26
src/adventure_log.c
View File

@ -2,15 +2,7 @@
#include "input.h"
#include "gba/io_reg.h"
#include "memory.h"
struct unkData
{
u8 unk0[14];
u16 unkD;
u16 unk10;
u16 unk12;
u8 *unk14;
};
#include "text.h"
struct AdventureLog
{
@ -22,8 +14,8 @@ struct AdventureLog
u16 unk20;
u8 fill22[0x34 - 0x22];
u32 unk34;
struct unkData *unk38;
struct unkData unk3C[3];
struct UnkTextStruct2 *unk38;
struct UnkTextStruct2 unk3C[3];
u8 fill84[0x9C - 0x84];
u8 unk9C;
/* 0x9D */ u8 currPage_u8;
@ -33,19 +25,19 @@ struct AdventureLog
extern struct AdventureLog *gAdventureLog;
const struct unkData gUnknown_80E1FF0 = {
const struct UnkTextStruct2 gUnknown_80E1FF0 = {
0x00, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
NULL
};
const struct unkData gUnknown_80E2008 = {
const struct UnkTextStruct2 gUnknown_80E2008 = {
0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00,
0x02, 0x00, 0x02, 0x00,
0x1A, 0x00, 0x04,
0x1A, 0x04,
0x06, 0x00,
NULL
};
@ -55,8 +47,6 @@ const u8 gAdventureLogHeaderText[] = "Adventure Log";
const u8 gUnknown_80E2030[] = "~95~95~95~95~95~95~95~95~95~95~95~95~95~95~95 "; // string of ???????
const u8 fill_adven[] = "pksdir0";
extern void sub_8006518(struct unkData *);
extern void sub_800641C(void *, u32, u32);
void sub_8032084();
void DisplayAdventureLog();
extern void sub_8013818(void *, u32, u32, u32);
@ -145,7 +135,7 @@ void sub_8032084(void)
sVar2 = sub_80095E4(gAdventureLog->unk1A,0xc) + 2 << 0x10;
// TODO needs asr r3, r0, r16
// and lsr r0, r0, r16
gAdventureLog->unk3C[gAdventureLog->unk34].unkD = sVar2;
gAdventureLog->unk3C[gAdventureLog->unk34].unkE = sVar2;
// Good past here except regs for this store
gAdventureLog->unk3C[gAdventureLog->unk34].unk10 = sVar2 + 2;
ResetUnusedInputStruct();

2
src/adventure_log_menu.c
View File

@ -2,8 +2,8 @@
#include "input.h"
#include "main_menu.h"
#include "adventure_log.h"
#include "text.h"
extern void sub_800641C(u8 *, u32, u32);
extern void CreateAdventureLogScreen(u32);
extern u32 HandleAdventureLogInput(u32);
extern void CleanAdventureLogScreen();

19
src/code_2.c
View File

@ -9,18 +9,19 @@
#include "play_time.h"
#include "save.h"
#include "gUnknown_203B46C.h"
#include "text.h"
#include "exclusive_pokemon.h"
#include "pokemon.h"
#include "rescue_team_info.h"
extern void NDS_DebugInit(void);
extern void sub_801180C(void);
extern void NDS_LoadOverlay_GroundMain(void);
extern void sub_8014144(void);
extern void LoadMonsterParameters(void);
extern void sub_8097670(void);
extern void LoadGameOptions(void);
extern void sub_8094C14(void);
extern void LoadExclusivePokemon(void);
extern void LoadItemParameters(void);
extern void LoadRescueTeamInfo(void);
extern void LoadWazaParameters(void);
extern void sub_80950BC(void);
extern void sub_80958E8(void);
@ -35,15 +36,13 @@ extern void sub_80015C0(u32, u32);
extern u32 sub_8001658(u32, u32);
extern void sub_800A8F8(u32);
extern void ResetSprites(u32);
extern void xxx_update_some_bg_tiles(u32);
extern void sub_80097B0(void);
extern void sub_800CDA8(u32);
extern void sub_800641C(u32, u32, u32);
extern void LoadTitleScreen(void);
extern void SetBGPaletteBufferColorRGB(s32, u8 *, s32, u8 *);
extern void sub_80095CC(u32, u32);
extern void InitMainMenu(void);
extern u8 sub_80363E0(void);
extern bool8 sub_80363E0(void);
extern void SetUpMenu(void);
extern u32 UpdateMenu(void);
extern void CleanUpMenu(void);
@ -139,10 +138,10 @@ void GameLoop(void)
xxx_update_stuff(0);
}
if (tmp3) {
sub_8012468();
while ((u8)(tmp3 = sub_8012484()))
PrepareSavePakRead();
while ((tmp3 = ReadSavePak()))
xxx_update_stuff(0);
sub_8012558();
FinishReadSavePak();
}
tmp3 = 1;
StartNewBGM(MUS_LOADING_SCREEN);
@ -150,7 +149,7 @@ void GameLoop(void)
sub_80095CC(0, 20);
InitMainMenu();
while (1) {
if ((u8)sub_80363E0()) {
if (sub_80363E0()) {
if (gRealInputs.pressed & L_BUTTON) {
flag = FALSE;
SetBGOBJEnableFlags(19);

2
src/code_800D090.c
View File

@ -76,7 +76,7 @@ void sub_800D098(void)
while(REG_KEYINPUT != KEYS_MASK){} // All buttons
}
void sub_800D158(u8 *buffer, const char *text, ...)
void ExpandPlaceholdersBuffer(u8 *buffer, const char *text, ...)
{
va_list vArgv;
va_start(vArgv, text);

10
src/code_80118A4.c
View File

@ -41,11 +41,11 @@ struct UnkBgStruct
extern struct UnkBgStruct *gUnknown_203B0E4;
extern u16 gUnknown_80D4144[];
extern s16 gUnknown_202DE20;
extern s16 gUnknown_202DE22;
extern s16 gUnknown_202DE24;
extern u32 gUnknown_202DE1C;
extern const u16 gUnknown_80D4144[8];
EWRAM_DATA u32 gUnknown_202DE1C;
EWRAM_DATA s16 gUnknown_202DE20;
EWRAM_DATA s16 gUnknown_202DE22;
EWRAM_DATA s16 gUnknown_202DE24;
void nullsub_8(u32);
void sub_8005838(u32, u32);

9
src/code_8012A18_1.c
View File

@ -3,16 +3,17 @@
#include "file_system.h"
#include "memory.h"
#include "input.h"
extern void sub_800641C(u32, u32, u32);
#include "text.h"
struct unkStruct_203B200
{
// size: 0x50
u32 unk0;
u32 unk4;
u8 *pokeName;
s32 state;
/* 0x10 */ struct MenuItem menus[3];
u8 fill[0x50 - 0x28];
};
extern struct unkStruct_203B200 *gUnknown_203B200;
extern const char *gUnknown_80D4920;
@ -94,7 +95,7 @@ u32 sub_801602C(u32 r0, u8 *name)
{
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
gUnknown_203B200 = MemoryAlloc(0x50, 8);
gUnknown_203B200 = MemoryAlloc(sizeof(struct unkStruct_203B200), 8);
gUnknown_203B200->unk0 = r0;
gUnknown_203B200->pokeName = name;
switch(r0)
@ -139,8 +140,6 @@ u32 sub_8016080(void)
return 0;
}
extern void MemoryFree(void *);
void sub_80160D8(void)
{
if(gUnknown_203B200 != NULL)

17
src/code_801C620.c
View File

@ -1,12 +1,7 @@
#include "global.h"
#include "input.h"
#include "memory.h"
struct unkData
{
u8 unk0[24];
};
#include "text.h"
struct subStruct_203B240
{
@ -16,6 +11,7 @@ struct subStruct_203B240
struct unkStruct_203B240
{
// size: 0x94
s32 unk0;
u8 unk4;
u8 fill5[3];
@ -25,8 +21,10 @@ struct unkStruct_203B240
u8 fill14[0x20 - 0x18];
u32 unk20;
u32 unk24;
struct unkData unk28[4];
struct UnkTextStruct2 unk28[4];
u32 unk88;
u32 unk8C;
u32 unk90;
};
extern struct unkStruct_203B240 *gUnknown_203B240;
@ -38,8 +36,7 @@ extern u8 gAvailablePokemonNames[0x58];
extern void ResetSprites(u32);
extern void sub_801317C(u32 *);
extern void sub_80140B4(struct unkData *);
extern void sub_800641C(struct unkData *,u32, u32);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern void sub_8014FF0(u32, u32, char *, u32, u32);
@ -62,7 +59,7 @@ void sub_801C848();
u32 sub_801C620(u8 param_1)
{
ResetSprites(1);
gUnknown_203B240 = MemoryAlloc(0x94,8);
gUnknown_203B240 = MemoryAlloc(sizeof(struct unkStruct_203B240),8);
gUnknown_203B240->unk4 = param_1;
sub_801317C(&gUnknown_203B240->unk88);
gUnknown_203B240->unk24 = 0;

38
src/code_801D760.c
View File

@ -4,12 +4,7 @@
#include "gUnknown_203B460.h"
#include "memory.h"
#include "input.h"
struct unkData
{
u8 unk0[0x14];
u32 *unk14;
};
#include "text.h"
struct unkStruct_203B258
{
@ -18,16 +13,14 @@ struct unkStruct_203B258
u32 unk14;
u8 fill18[0x34 - 0x18];
u32 unk34;
struct unkData *unk38;
struct unkData unk3C[4];
u32 unk9C;
struct UnkTextStruct2 *unk38;
struct UnkTextStruct2 unk3C[4];
u8 unk9C[4];
};
extern struct unkStruct_203B258 *gUnknown_203B258;
extern struct unkData gUnknown_80DBF88;
extern struct UnkTextStruct2 gUnknown_80DBF88;
extern void sub_800641C(struct unkData *, u32, u32);
extern void sub_8006518(struct unkData *);
extern void sub_8013818(void *, u32, u32, u32);
extern void sub_8013878(void *, s32);
extern u8 sub_80138B8(void *, u32);
@ -62,7 +55,6 @@ extern u8 sub_8012FD8(u32 *);
extern void sub_8013114(u32 *, s32 *);
extern const char *sub_8098FB4();
extern void xxx_format_string(const char *, u8 *, u32 **, u32);
extern const char *GetFriendAreaName(u8);
extern s32 sub_8008ED0(u8 *);
extern void xxx_call_draw_string(s32 size, u32, u8 *, u32, u32);
extern const char *GetFriendAreaName(u8);
@ -73,7 +65,7 @@ extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
void LoadTeamRankBadge(u32, u32, u32);
extern void sub_800D158(u8 *, u32 *, ...);
extern void ExpandPlaceholdersBuffer(u8 *, u32 *, ...);
extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray);
extern void sub_8007E20(u32, u32, u32, u32, u32, u8 *, u32);
@ -316,7 +308,7 @@ void sub_801D894(void)
// Stored on stack
u32 *preload_string;
u32 *r5; // R5
u8 auStack116 [96]; // sp +4
u8 buffer [96]; // sp +4
if (gUnknown_203B250->currFriendAreaLocation == NONE) {
location = sub_8098FB4();
@ -325,12 +317,12 @@ void sub_801D894(void)
location = GetFriendAreaName(gUnknown_203B250->currFriendAreaLocation);
}
// TODO this is def a hack
xxx_format_string(location, auStack116, &preload_string + 1, 0);
location_length = sub_8008ED0(auStack116);
xxx_format_string(location, buffer, &preload_string + 1, 0);
location_length = sub_8008ED0(buffer);
x_coord = (128 - location_length) / 2; // Centers the location name
sub_8008C54(1);
sub_80073B8(1);
xxx_call_draw_string(x_coord, 4, auStack116, 1, 0);
xxx_call_draw_string(x_coord, 4, buffer, 1, 0);
sub_80073E0(1);
sub_8008C54(2);
sub_80073B8(2);
@ -339,10 +331,10 @@ void sub_801D894(void)
// Have to load before TeamRank funcs
r5 = &gUnknown_80DBF3C; // %s #C5%d#R Pts.
rank = GetRescueTeamRank();
sub_800D158(auStack116, r5, GetTeamRankString(rank), GetTeamRankPts());
xxx_call_draw_string(32, 4, auStack116, 2, 0);
sub_800D158(auStack116, &gUnknown_80DBF4C, gUnknown_203B460->teamMoney);
xxx_call_draw_string(32, 18, auStack116, 2, 0);
ExpandPlaceholdersBuffer(buffer, r5, GetTeamRankString(rank), GetTeamRankPts());
xxx_call_draw_string(32, 4, buffer, 2, 0);
ExpandPlaceholdersBuffer(buffer, &gUnknown_80DBF4C, gUnknown_203B460->teamMoney);
xxx_call_draw_string(32, 18, buffer, 2, 0);
sub_80073E0(2);
}
@ -374,7 +366,7 @@ u32 sub_801D9E4(void)
gUnknown_203B258->unk38 = &gUnknown_203B258->unk3C[3];
sub_8006518(gUnknown_203B258->unk3C);
gUnknown_203B258->unk3C[gUnknown_203B258->unk34] = gUnknown_80DBF88;
gUnknown_203B258->unk38->unk14 = &gUnknown_203B258->unk9C;
gUnknown_203B258->unk38->unk14 = gUnknown_203B258->unk9C;
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B258->unk3C,1,1);
sub_8013818(gUnknown_203B258,0xe5,10,gUnknown_203B258->unk34);

71
src/code_801DCC4.c
View File

@ -2,16 +2,7 @@
#include "memory.h"
#include "menu.h"
#include "gUnknown_203B46C.h"
struct unkData
{
u8 unk0[0xB];
u16 unkB;
u16 unkD;
u16 unk10;
u16 unk12;
u32 *unk14;
};
#include "text.h"
struct unkStruct_203B25C
{
@ -25,7 +16,7 @@ struct unkStruct_203B25C
struct MenuItem unk6C[3];
u8 fill84[0xAC - 0x84];
u16 unkAC[8];
struct unkData unkBC[4];
struct UnkTextStruct2 unkBC[4];
};
@ -58,9 +49,12 @@ extern void sub_801E2C4(void);
extern s32 sub_80144A4(s32 *);
extern void sub_8094C14(void);
extern void sub_8099690(u32);
extern void sub_8012CAC(struct UnkTextStruct2 *, struct MenuItem *);
extern struct UnkSaveStruct1 *gUnknown_203B46C;
extern struct unkStruct_203B25C *gUnknown_203B25C;
extern const struct UnkTextStruct2 gUnknown_80DBFCC;
extern const struct UnkTextStruct2 gUnknown_80DBFB0;
extern const char gOthers_MenuOption[];
extern const char gUnknown_80DBFEC[];
@ -131,6 +125,60 @@ void sub_801DD6C(u32 newState)
sub_801DED0();
}
#ifdef NONMATCHING
void sub_801DD84(void)
{
s32 iVar3;
sub_8006518(gUnknown_203B25C->unkBC);
switch(gUnknown_203B25C->state)
{
case 0:
CreateOthersMenu();
// TODO probably could be cleaned up to actually match
iVar3 = 0;
if (gUnknown_203B25C->unkAC[iVar3] == 0) {
gUnknown_203B25C->unk18 = gUnknown_203B25C->unk6C[iVar3].menuAction;
}
else {
do {
iVar3++;
if(iVar3 > 7)
break;
if(gUnknown_203B25C->unkAC[iVar3] == 0){
gUnknown_203B25C->unk18 = gUnknown_203B25C->unk6C[iVar3].menuAction;
break;
}
} while (iVar3 < 8);
}
for(iVar3 = 0; iVar3 < 4; iVar3++)
{
gUnknown_203B25C->unkBC[iVar3] = gUnknown_80DBFCC;
}
gUnknown_203B25C->unkBC[0] = gUnknown_80DBFB0;
sub_8012CAC(&gUnknown_203B25C->unkBC[0], gUnknown_203B25C->unk6C);
gUnknown_203B25C->unkBC[0].unk0c = 0xA;
break;
case 1:
CreateOthersMenu();
for(iVar3 = 0; iVar3 < 4; iVar3++)
{
gUnknown_203B25C->unkBC[iVar3] = gUnknown_80DBFB0;
}
gUnknown_203B25C->unkBC[0] = gUnknown_80DBFCC;
sub_8012CAC(&gUnknown_203B25C->unkBC[0], gUnknown_203B25C->unk6C);
gUnknown_203B25C->unkBC[0].unk0c = 0xA;
break;
default:
for(iVar3 = 0; iVar3 < 4; iVar3++)
{
gUnknown_203B25C->unkBC[iVar3] = gUnknown_80DBFB0;
}
break;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B25C->unkBC, 1, 1);
}
#else
NAKED
void sub_801DD84(void)
{
@ -297,6 +345,7 @@ void sub_801DD84(void)
"\t.align 2, 0\n"
"_0801DECC: .4byte gUnknown_203B25C");
}
#endif
void sub_801DED0(void)
{

86
src/code_8027C84_pre.c
View File

@ -1,86 +0,0 @@
#include "global.h"
struct UnkOtherStructTemp
{
/* 0x0 */ u32 unk0;
/* 0x4 */ u32 unk4;
/* 0x8 */ u32 unk8;
/* 0xC */ u32 unkC;
/* 0x10 */ u32 unk10;
/* 0x14 */ u32 unk14;
/* 0x18 */ u32 unk18;
/* 0x1C */ u32 unk1C;
/* 0x20 */ u16 *unk20;
/* 0x24 */ u16 unk24;
/* 0x26 */ u16 unk26;
/* 0x28 */ u16 unk28;
/* 0x2A */ u16 unk2A;
};
struct UnkStructTemp
{
/* 0x0 */ u32 unk0;
/* 0x4 */ u32 unk4;
/* 0x8 */ u32 unk8;
/* 0xC */ u32 unkC;
/* 0x10 */ u32 unk10;
/* 0x14 */ u32 unk14;
/* 0x18 */ u32 unk18;
/* 0x1C */ u32 unk1C;
/* 0x20 */ u32 unk20;
/* 0x24 */ u16 unk24;
/* 0x26 */ u16 unk26;
/* 0x28 */ u16 unk28;
/* 0x2A */ u16 *unk2A;
};
extern struct UnkStructTemp *gUnknown_203B2BC;
u32 sub_801B410();
void sub_801B450();
void sub_8027184(u8 r0);
u32 sub_801EF38(u8 r0);
struct UnkOtherStructTemp *sub_801F194();
void sub_8027184(u8 r0);
void sub_801F214();
void sub_8027C84()
{
u32 temp = sub_801B410();
if(temp <= 1)
return;
if(temp > 3)
return;
sub_801B450();
sub_8027184(0xB);
}
//void sub_8027CA0()
//{
// struct UnkOtherStructTemp *temp_store;
// u32 temp = sub_801EF38(1);
// if(temp > 4)
// return;
// switch(temp)
// {
// case 0:
// case 1:
// break;
// case 2:
// sub_801F214();
// sub_8027184(0x2);
// return;
// case 3:
// case 4:
// temp_store = sub_801F194();
// gUnknown_203B2BC->unk20 = temp_store;
// // TODO missing
// // lsls r0, 3
// // adds r0, r1, r0
// // Why are we shifting the pointer by 3?
// gUnknown_203B2BC->unk24 = temp_store->unk2A[temp_store];
// sub_8027184(0x10);
// break;
// }
//}

25
src/code_80521D0_1.c
View File

@ -110,7 +110,7 @@ extern void sub_803F878(u32, s32);
extern void sub_8086A70(struct unkDungeon_8041D5C *, u32, u32);
extern void sub_8085C54(u32, u32, u32, u32, u32);
extern void sub_803E9D0(void);
extern void sub_808C4C4(void);
extern void DeoxysScreenFlash(void);
extern void sub_8085EB0();
extern void sub_808563C(void *);
extern void sub_80858AC(u32 *, u32);
@ -131,7 +131,7 @@ extern void sub_80861B8(struct unkDungeon_8041D5C *, u32, u32);
void nullsub_99();
extern u32 sub_8084100(s32);
extern u8 *gFriendAreas;
extern bool8 *gFriendAreas;
extern void sub_8049884();
extern void sub_8049B8C();
@ -258,7 +258,7 @@ u8 JirachiFriendAreaSearch(void)
unlockCondition = GetFriendAreaUnlockCondition(friendAreaCounter);
if (!(unlockCondition == UNLOCK_LEGENDARY_REQUEST)){
if (!(unlockCondition == UNLOCK_WONDER_MAIL)){
if(gFriendAreas[friendAreaCounter] == FALSE) {
if(!gFriendAreas[friendAreaCounter]) {
friendAreas[numUnlockableAreas] = friendAreaCounter;
numUnlockableAreas++;
}
@ -579,9 +579,9 @@ void DeoxysPreFightDialogue(void)
sub_8083EA8(0x1a,0x3c);
sub_808C550();
sub_8052910(&gUnknown_81062E8);
sub_808C4C4();
DeoxysScreenFlash();
sub_8052910(&gUnknown_8106368);
sub_808C4C4();
DeoxysScreenFlash();
sub_8052910(&gUnknown_8106390);
sub_803E708(10,0x46);
sub_808563C(sub_808C5AC);
@ -589,7 +589,7 @@ void DeoxysPreFightDialogue(void)
}
}
void sub_808C4C4(void)
void DeoxysScreenFlash(void)
{
s32 iVar1;
@ -619,12 +619,12 @@ void sub_808C550(void)
sub_803E9D0();
sub_803E46C(0x46);
gUnknown_203B418->unk7 = 0;
sub_808C4C4();
DeoxysScreenFlash();
}
void sub_808C590(struct unkDungeon_8041D5C *r0)
{
sub_8068FE0(r0, 0x87 << 2, 0);
sub_8068FE0(r0, 0x21C, 0);
}
void sub_808C5A0(struct unkDungeon_8041D5C *r0)
@ -658,6 +658,7 @@ void sub_808C5C0(void)
CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_CELEBI);
}
// Dummy Celebi Fight Dialogue??
void nullsub_100(void)
{
}
@ -1190,7 +1191,7 @@ void MedichamResuceDialogue(void)
sub_806CE68(temp, 0);
sub_803E708(0x20, 0x46);
sub_8042B0C(temp);
sub_8068FE0(temp, 0x87 << 2, 0);
sub_8068FE0(temp, 0x21C, 0);
gUnknown_203B418->unk4 = 1;
gUnknown_203B418->unk11 = 4;
}
@ -1205,7 +1206,7 @@ void sub_808CB5C(void)
sub_8083E88(0x72);
sub_80854D4();
sub_8085930(4);
sub_8068FE0(temp_2, 0x87 << 2, 0);
sub_8068FE0(temp_2, 0x21C, 0);
sub_8085860(temp->unk4, temp->unk6);
CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_MEDICHAM);
}
@ -1280,7 +1281,7 @@ void SmeargleRescueDialogue(void)
sub_806CE68(temp, 0);
sub_803E708(0x20, 0x46);
sub_8042B0C(temp);
sub_8068FE0(temp, 0x87 << 2, 0);
sub_8068FE0(temp, 0x21C, 0);
gUnknown_203B418->unk4 = 1;
gUnknown_203B418->unk11 = 4;
@ -1297,7 +1298,7 @@ void sub_808CD44(void)
sub_80854D4();
sub_8085930(4);
sub_80855E4(sub_8086A3C);
sub_8068FE0(temp_2, 0x87 << 2, 0);
sub_8068FE0(temp_2, 0x21C, 0);
sub_8085860(temp->unk4, temp->unk6 - 3);
CopySpeciesNametoBuffer(gUnknown_202E038, SPECIES_SMEARGLE);
}

21
src/code_808DAB4.c
View File

@ -1,21 +0,0 @@
#include "global.h"
struct unkStruct_203B45C
{
u8 unk0;
u8 padding1;
u8 unk2;
u8 padding2;
u8 unk4;
u8 array[0x53];
};
extern struct unkStruct_203B45C *gRecruitedPokemonRef;
extern void sub_808DE50(void* r0, struct unkStruct_203B45C *r1, u32 r2, u32 r3);
void sub_808DE30(void* r0, u32 r1)
{
sub_808DE50(r0, &gRecruitedPokemonRef[r1], r1, r1 * sizeof(struct unkStruct_203B45C));
}

188
src/code_8097670.c Normal file
View File

@ -0,0 +1,188 @@
#include "global.h"
struct unkStruct_203B494
{
// size: 0xC8?
u32 unk0;
s32 numAdventures;
s32 unk8;
s32 unkC;
u8 unk10; // location?
u8 unk11;
u8 fill12[2];
s16 unk14;
s16 unk16;
s16 unk18;
u32 unk1C[0xE];
u8 fill54[0x8C - 0x54];
u32 unk8C[0xD];
union UNKC0{
s32 unkC0;
s16 unkC0_16;
} UNKC0;
};
extern struct unkStruct_203B494 *gUnknown_203B494;
extern struct unkStruct_203B494 gUnknown_2039778;
extern const u8 *gAdventureLogText[];
void sub_8097670(void)
{
gUnknown_203B494 = &gUnknown_2039778;
}
struct unkStruct_203B494 *sub_8097680(void)
{
return &gUnknown_2039778;
}
void sub_8097688(u8 *r0)
{
gUnknown_203B494->unk10 = r0[0];
gUnknown_203B494->unk11 = r0[1];
}
u8 *sub_809769C(void)
{
return &gUnknown_203B494->unk10;
}
void sub_80976A8(void)
{
s32 iVar2;
gUnknown_203B494->unk0 = 0;
gUnknown_203B494->unk14 = 0;
gUnknown_203B494->unk16 = 0;
gUnknown_203B494->unk18 = 0;
gUnknown_203B494->UNKC0.unkC0 = 0;
gUnknown_203B494->unk8 = 0;
gUnknown_203B494->unkC = 0;
for(iVar2 = 0; iVar2 < 0xE; iVar2++)
{
gUnknown_203B494->unk1C[iVar2] = 0;
}
for(iVar2 = 0; iVar2 < 0xD; iVar2++)
{
gUnknown_203B494->unk8C[iVar2] = 0;
}
}
void sub_80976F8(u8 r0)
{
gUnknown_203B494->unk0 |= (1 << r0);
}
u8 sub_8097710(u8 r0)
{
if((gUnknown_203B494->unk0 & (1 << r0)) != 0)
return 1;
else
return 0;
}
const u8 *GetAdventureLogLine(u8 index)
{
return gAdventureLogText[index];
}
void ResetNumAdventures(void)
{
gUnknown_203B494->numAdventures = 0;
}
void IncrementNumAdventures(void)
{
gUnknown_203B494->numAdventures++;
if(gUnknown_203B494->numAdventures > 99999)
gUnknown_203B494->numAdventures = 99999;
}
s32 GetNumAdventures(void)
{
return gUnknown_203B494->numAdventures;
}
void SetNumAdventures(s32 numAdventures)
{
gUnknown_203B494->numAdventures = numAdventures;
}
void sub_8097790(void)
{
gUnknown_203B494->unk8++;
if(gUnknown_203B494->unk8 > 99999)
gUnknown_203B494->unk8 = 99999;
sub_80976F8(8);
}
s32 sub_80977B8(void)
{
return gUnknown_203B494->unk8;
}
void sub_80977C4(s32 r0)
{
gUnknown_203B494->unk8 = r0;
}
void sub_80977D0(void)
{
gUnknown_203B494->unkC++;
if(gUnknown_203B494->unkC > 99999)
gUnknown_203B494->unkC = 99999;
sub_80976F8(9);
}
s32 sub_80977F8(void)
{
return gUnknown_203B494->unkC;
}
void sub_8097804(s32 r0)
{
gUnknown_203B494->unkC = r0;
}
void sub_8097810(void)
{
if(gUnknown_203B494->unk14 < 9999)
gUnknown_203B494->unk14++;
sub_80976F8(0xB);
}
s16 sub_8097838(void)
{
return gUnknown_203B494->unk14;
}
void sub_8097848(void)
{
if(gUnknown_203B494->unk16 < 9999)
gUnknown_203B494->unk16++;
sub_80976F8(0xA);
}
s16 sub_8097870(void)
{
return gUnknown_203B494->unk16;
}
s16 sub_8097880(void)
{
return gUnknown_203B494->unk18;
}
void sub_8097890(void)
{
if(gUnknown_203B494->UNKC0.unkC0 < 99999)
gUnknown_203B494->UNKC0.unkC0++;
sub_80976F8(0xC);
}
s16 sub_80978B8(void)
{
return gUnknown_203B494->UNKC0.unkC0_16;
}

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