From febcb77f067c6a69290b216953887489a3259093 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 11 Jul 2017 10:14:35 -0400 Subject: Decompile secret base data --- data/secret_base.s | 77 ---------------------------------------- include/battle.h | 0 include/decoration.h | 0 include/graphics.h | 0 include/menu.h | 0 include/menu_helpers.h | 0 include/pokeblock.h | 0 include/pokemon.h | 0 include/pokenav.h | 0 include/region_map.h | 0 include/secret_base.h | 2 +- include/strings.h | 0 include/use_pokeblock.h | 0 include/vars.h | 0 ld_script.txt | 2 +- src/decoration.c | 0 src/field_specials.c | 0 src/field_tasks.c | 0 src/pokeblock.c | 0 src/secret_base.c | 93 +++++++++++++++++++++++++++++++++++++++++++------ src/sound_check_menu.c | 0 src/use_pokeblock.c | 0 22 files changed, 85 insertions(+), 89 deletions(-) delete mode 100644 data/secret_base.s mode change 100755 => 100644 include/battle.h mode change 100755 => 100644 include/decoration.h mode change 100755 => 100644 include/graphics.h mode change 100755 => 100644 include/menu.h mode change 100755 => 100644 include/menu_helpers.h mode change 100755 => 100644 include/pokeblock.h mode change 100755 => 100644 include/pokemon.h mode change 100755 => 100644 include/pokenav.h mode change 100755 => 100644 include/region_map.h mode change 100755 => 100644 include/strings.h mode change 100755 => 100644 include/use_pokeblock.h mode change 100755 => 100644 include/vars.h mode change 100755 => 100644 src/decoration.c mode change 100755 => 100644 src/field_specials.c mode change 100755 => 100644 src/field_tasks.c mode change 100755 => 100644 src/pokeblock.c mode change 100755 => 100644 src/sound_check_menu.c mode change 100755 => 100644 src/use_pokeblock.c diff --git a/data/secret_base.s b/data/secret_base.s deleted file mode 100644 index 59ded8ddf..000000000 --- a/data/secret_base.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_083D1358:: @ 83D1358 - .2byte 0x26, 0x36 - .2byte 0x27, 0x37 - .2byte 0x1A0, 0x1A1 - .2byte 0x1A8, 0x1A9 - .2byte 0x1B0, 0x1B1 - .2byte 0x208, 0x210 - .2byte 0x271, 0x278 - -gUnknown_083D1374:: @ 83D1374 - .byte 0, 0 - .byte 1, 3 - .byte 6, 0 - .byte 5, 9 - .byte 12, 0 - .byte 1, 3 - .byte 18, 0 - .byte 7, 13 - .byte 1, 0 - .byte 2, 3 - .byte 7, 0 - .byte 9, 2 - .byte 13, 0 - .byte 13, 4 - .byte 19, 0 - .byte 1, 2 - .byte 2, 0 - .byte 1, 3 - .byte 8, 0 - .byte 1, 2 - .byte 14, 0 - .byte 3, 15 - .byte 20, 0 - .byte 3, 14 - .byte 3, 0 - .byte 9, 3 - .byte 9, 0 - .byte 8, 7 - .byte 15, 0 - .byte 3, 6 - .byte 21, 0 - .byte 5, 9 - .byte 4, 0 - .byte 2, 3 - .byte 10, 0 - .byte 5, 6 - .byte 16, 0 - .byte 15, 3 - .byte 22, 0 - .byte 4, 10 - .byte 5, 0 - .byte 3, 3 - .byte 11, 0 - .byte 1, 2 - .byte 17, 0 - .byte 7, 8 - .byte 23, 0 - .byte 9, 6 - - .align 2 -gUnknown_083D13D4:: @ 83D13D4 - .4byte SecretBaseText_DelRegist, sub_80BCA84 - .4byte gUnknownText_Exit, sub_80BCBF8 - - .align 2 -gUnknown_083D13E4:: @ 83D13E4 - .4byte sub_80BCB90 - .4byte sub_80BCBC0 - -gUnknown_083D13EC:: @ 83D13EC - .byte 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 diff --git a/include/battle.h b/include/battle.h old mode 100755 new mode 100644 diff --git a/include/decoration.h b/include/decoration.h old mode 100755 new mode 100644 diff --git a/include/graphics.h b/include/graphics.h old mode 100755 new mode 100644 diff --git a/include/menu.h b/include/menu.h old mode 100755 new mode 100644 diff --git a/include/menu_helpers.h b/include/menu_helpers.h old mode 100755 new mode 100644 diff --git a/include/pokeblock.h b/include/pokeblock.h old mode 100755 new mode 100644 diff --git a/include/pokemon.h b/include/pokemon.h old mode 100755 new mode 100644 diff --git a/include/pokenav.h b/include/pokenav.h old mode 100755 new mode 100644 diff --git a/include/region_map.h b/include/region_map.h old mode 100755 new mode 100644 diff --git a/include/secret_base.h b/include/secret_base.h index 3ea75ce27..6c9f2a632 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -5,7 +5,7 @@ void ResetSecretBases(void); void sub_80BB970(struct MapEvents *); u8 sub_80BBB24(void); void sub_80BBCCC(u8); -void sub_80BC038(); +void sub_80BC038(s16 *, struct MapEvents *); u8 sub_80BC050(); void sub_80BC300(); const u8 sub_80BCCA4(u8); diff --git a/include/strings.h b/include/strings.h old mode 100755 new mode 100644 diff --git a/include/use_pokeblock.h b/include/use_pokeblock.h old mode 100755 new mode 100644 diff --git a/include/vars.h b/include/vars.h old mode 100755 new mode 100644 diff --git a/ld_script.txt b/ld_script.txt index a51f50947..9ddfdf3dc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -410,7 +410,7 @@ SECTIONS { data/contest_effect.o(.rodata); data/record_mixing.o(.rodata); src/sound_check_menu.o(.rodata); - data/secret_base.o(.rodata); + src/secret_base.o(.rodata); data/tv.o(.rodata); data/contest_link_80C2020.o(.rodata); src/pokemon_size_record.o(.rodata); diff --git a/src/decoration.c b/src/decoration.c old mode 100755 new mode 100644 diff --git a/src/field_specials.c b/src/field_specials.c old mode 100755 new mode 100644 diff --git a/src/field_tasks.c b/src/field_tasks.c old mode 100755 new mode 100644 diff --git a/src/pokeblock.c b/src/pokeblock.c old mode 100755 new mode 100644 diff --git a/src/secret_base.c b/src/secret_base.c index d88d2c66a..2923d770d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -22,20 +22,93 @@ #include "text.h" #include "vars.h" -extern u8 gUnknown_020387DC; -extern u16 gSpecialVar_0x8004; -extern u16 gSpecialVar_0x8005; -extern u16 gSpecialVar_0x8006; -extern u16 gSpecialVar_0x8007; -extern u16 gScriptResult; -extern const struct +u8 sub_80BCA84(); +u8 sub_80BCBF8(); +void sub_80BCB90(u8); +void sub_80BCBC0(u8); + +const struct { u16 unk_083D1358_0; u16 unk_083D1358_1; -} gUnknown_083D1358[7]; -extern const u8 gUnknown_083D1374[4 * 16]; +} gUnknown_083D1358[] = { + {0x26, 0x36}, + {0x27, 0x37}, + {0x1a0, 0x1a1}, + {0x1a8, 0x1a9}, + {0x1b0, 0x1b1}, + {0x208, 0x210}, + {0x271, 0x278} +}; + +extern u8 gUnknown_020387DC; + +const u8 gUnknown_083D1374[] = { + MAP_ID_SECRET_BASE_RED_CAVE1, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 3, + MAP_ID_SECRET_BASE_RED_CAVE2, 0, + MAP_ID_SECRET_BASE_SHRUB1, 9, + MAP_ID_SECRET_BASE_RED_CAVE3, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 3, + MAP_ID_SECRET_BASE_RED_CAVE4, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE2, 13, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 0, + MAP_ID_SECRET_BASE_BLUE_CAVE1, 3, + MAP_ID_SECRET_BASE_BROWN_CAVE2, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE2, 2, + MAP_ID_SECRET_BASE_BROWN_CAVE3, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE3, 4, + MAP_ID_SECRET_BASE_BROWN_CAVE4, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 2, + MAP_ID_SECRET_BASE_BLUE_CAVE1, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 3, + MAP_ID_SECRET_BASE_BLUE_CAVE2, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 2, + MAP_ID_SECRET_BASE_BLUE_CAVE3, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE1, 15, + MAP_ID_SECRET_BASE_BLUE_CAVE4, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE1, 14, + MAP_ID_SECRET_BASE_YELLOW_CAVE1, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE2, 3, + MAP_ID_SECRET_BASE_YELLOW_CAVE2, 0, + MAP_ID_SECRET_BASE_BLUE_CAVE2, 7, + MAP_ID_SECRET_BASE_YELLOW_CAVE3, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE1, 6, + MAP_ID_SECRET_BASE_YELLOW_CAVE4, 0, + MAP_ID_SECRET_BASE_SHRUB1, 9, + MAP_ID_SECRET_BASE_TREE1, 0, + MAP_ID_SECRET_BASE_BLUE_CAVE1, 3, + MAP_ID_SECRET_BASE_TREE2, 0, + MAP_ID_SECRET_BASE_SHRUB1, 6, + MAP_ID_SECRET_BASE_TREE3, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE3, 3, + MAP_ID_SECRET_BASE_TREE4, 0, + MAP_ID_SECRET_BASE_TREE1, 10, + MAP_ID_SECRET_BASE_SHRUB1, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE1, 3, + MAP_ID_SECRET_BASE_SHRUB2, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE1, 2, + MAP_ID_SECRET_BASE_SHRUB3, 0, + MAP_ID_SECRET_BASE_BROWN_CAVE2, 8, + MAP_ID_SECRET_BASE_SHRUB4, 0, + MAP_ID_SECRET_BASE_YELLOW_CAVE2, 6 +}; + +const struct MenuAction gUnknown_083D13D4[] = { + {SecretBaseText_DelRegist, sub_80BCA84}, + {gUnknownText_Exit, sub_80BCBF8} +}; + +void (*const gUnknown_083D13E4[])(u8) = { + sub_80BCB90, + sub_80BCBC0 +}; + +const u8 gUnknown_083D13EC[] = { + 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 +}; + extern void *gUnknown_0300485C; -extern const u8 gUnknown_083D13EC[12]; extern u8 gUnknown_081A2E14[]; diff --git a/src/sound_check_menu.c b/src/sound_check_menu.c old mode 100755 new mode 100644 diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c old mode 100755 new mode 100644 -- cgit v1.2.3