From 54c8580d34b61dfd1db5dd91e301dfc788e564de Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 15 Sep 2017 22:12:45 -0400 Subject: [PATCH 01/62] rom_81700F8 --- asm/rom_81700F8.s | 64 --------------------------------------------- include/gpu_regs.h | 15 +++++++++++ include/load_save.h | 1 + include/malloc.h | 3 +++ include/new_game.h | 2 ++ include/rom4.h | 15 +++++++++++ include/save.h | 4 +++ ld_script.txt | 2 +- src/rom_81700F8.c | 32 +++++++++++++++++++++++ 9 files changed, 73 insertions(+), 65 deletions(-) delete mode 100644 asm/rom_81700F8.s create mode 100644 include/gpu_regs.h create mode 100644 include/rom4.h create mode 100644 src/rom_81700F8.c diff --git a/asm/rom_81700F8.s b/asm/rom_81700F8.s deleted file mode 100644 index 45c505cd9..000000000 --- a/asm/rom_81700F8.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81700F8 -sub_81700F8: @ 81700F8 - push {r4,r5,lr} - ldr r5, =0x04000208 - ldrh r4, [r5] - movs r0, 0 - strh r0, [r5] - movs r0, 0x1 - bl RegisterRamReset - movs r0, 0 - movs r1, 0x80 - bl ClearGpuRegBits - strh r4, [r5] - ldr r1, =gMain - ldr r0, =0x00000439 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x3 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - bl sub_815355C - lsls r0, 16 - lsrs r0, 16 - bl SetSaveBlocksPointers - bl sub_808447C - bl ResetSaveCounters - movs r0, 0 - bl sub_81534D0 - ldr r0, =gSaveFileStatus - ldrh r0, [r0] - cmp r0, 0 - beq _08170148 - cmp r0, 0x2 - bne _0817014C -_08170148: - bl Sav2_ClearSetDefault -_0817014C: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x15] - lsls r0, 31 - lsrs r0, 31 - bl SetPokemonCryStereo - ldr r0, =0x02000000 - movs r1, 0xE0 - lsls r1, 9 - bl InitHeap - ldr r0, =sub_8086230 - bl SetMainCallback2 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81700F8 - - .align 2, 0 @ Don't pad with nop. diff --git a/include/gpu_regs.h b/include/gpu_regs.h new file mode 100644 index 000000000..2d47d602c --- /dev/null +++ b/include/gpu_regs.h @@ -0,0 +1,15 @@ +// +// Created by scott on 9/15/2017. +// + +#ifndef POKEEMERALD_GPU_REGS_H +#define POKEEMERALD_GPU_REGS_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void ClearGpuRegBits(u8 regOffset, u16 mask); + +#endif //POKEEMERALD_GPU_REGS_H diff --git a/include/load_save.h b/include/load_save.h index 0fedd720b..20848e1a7 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -18,5 +18,6 @@ void SaveSerializedGame(void); void LoadSerializedGame(void); void LoadPlayerBag(void); void SavePlayerBag(void); +void SetSaveBlocksPointers(u16); #endif // GUARD_LOAD_SAVE_H diff --git a/include/malloc.h b/include/malloc.h index bd870ede3..d26d19242 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,8 +1,11 @@ #ifndef GUARD_MALLOC_H #define GUARD_MALLOC_H +extern u8 gHeap[]; + void *Alloc(u32 size); void *AllocZeroed(u32 size); void Free(void *pointer); +void InitHeap(void *pointer, u32 size); #endif // GUARD_MALLOC_H diff --git a/include/new_game.h b/include/new_game.h index f9ad7fcb8..060279c25 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -9,5 +9,7 @@ void ClearPokedexFlags(void); void WarpToTruck(void); void NewGameInitData(void); void ResetMiniGamesResults(void); +void sub_808447C(void); +void Sav2_ClearSetDefault(void); #endif // GUARD_NEW_GAME_H diff --git a/include/rom4.h b/include/rom4.h new file mode 100644 index 000000000..1538f5dbc --- /dev/null +++ b/include/rom4.h @@ -0,0 +1,15 @@ +// +// Created by scott on 9/15/2017. +// + +#ifndef POKEEMERALD_ROM4_H +#define POKEEMERALD_ROM4_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void sub_8086230(void); + +#endif //POKEEMERALD_ROM4_H diff --git a/include/save.h b/include/save.h index 1d7fdd6e3..e98233c67 100644 --- a/include/save.h +++ b/include/save.h @@ -1,6 +1,8 @@ #ifndef GUARD_SAVE_H #define GUARD_SAVE_H +extern u16 gSaveFileStatus; + struct SaveSectionLocation { void *data; @@ -88,5 +90,7 @@ u16 CalculateChecksum(void *, u16); //u8 unref_sub_8125FF0(u8 *data, u16 size); //u8 unref_sub_8126068(u8 sector, u8 *data, u32 size); //u8 unref_sub_8126080(u8 sector, u8 *data); +u16 sub_815355C(void); +u8 sub_81534D0(u8); #endif // GUARD_SAVE_H diff --git a/ld_script.txt b/ld_script.txt index 4a5bb643a..e8c8a43ce 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -206,7 +206,7 @@ SECTIONS { asm/battle_controller_wally.o(.text); asm/player_pc.o(.text); asm/intro.o(.text); - asm/rom_81700F8.o(.text); + src/rom_81700F8.o(.text); asm/field_region_map.o(.text); asm/battle_anim_8170478.o(.text); asm/hall_of_fame.o(.text); diff --git a/src/rom_81700F8.c b/src/rom_81700F8.c new file mode 100644 index 000000000..b786ff9f8 --- /dev/null +++ b/src/rom_81700F8.c @@ -0,0 +1,32 @@ +#include "global.h" +#include "main.h" +#include "gpu_regs.h" +#include "m4a.h" +#include "load_save.h" +#include "save.h" +#include "new_game.h" +#include "rom4.h" +#include "malloc.h" + +void sub_81700F8(void) +{ + u16 imeBackup; + + imeBackup = REG_IME; + REG_IME = 0; + RegisterRamReset(0x00000001); + ClearGpuRegBits(REG_OFFSET_DISPCNT, 0x80); + REG_IME = imeBackup; + gMain.inBattle = FALSE; + SetSaveBlocksPointers(sub_815355C()); + sub_808447C(); + ResetSaveCounters(); + sub_81534D0(0); + if (gSaveFileStatus == 0 || gSaveFileStatus == 2) + { + Sav2_ClearSetDefault(); + } + SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); + InitHeap(gHeap, 0x1c000); + SetMainCallback2(sub_8086230); +} From 052c9f0234a6034b9db8fce30f779b95b8869df5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 16 Sep 2017 15:13:26 -0400 Subject: [PATCH 02/62] Fix header guards --- include/gpu_regs.h | 6 +++--- include/rom4.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/gpu_regs.h b/include/gpu_regs.h index 2d47d602c..28b97fb6e 100644 --- a/include/gpu_regs.h +++ b/include/gpu_regs.h @@ -2,8 +2,8 @@ // Created by scott on 9/15/2017. // -#ifndef POKEEMERALD_GPU_REGS_H -#define POKEEMERALD_GPU_REGS_H +#ifndef GUARD_GPU_REGS_H +#define GUARD_GPU_REGS_H // Exported type declarations @@ -12,4 +12,4 @@ // Exported ROM declarations void ClearGpuRegBits(u8 regOffset, u16 mask); -#endif //POKEEMERALD_GPU_REGS_H +#endif //GUARD_GPU_REGS_H diff --git a/include/rom4.h b/include/rom4.h index 1538f5dbc..3164c81ea 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -2,8 +2,8 @@ // Created by scott on 9/15/2017. // -#ifndef POKEEMERALD_ROM4_H -#define POKEEMERALD_ROM4_H +#ifndef GUARD_ROM4_H +#define GUARD_ROM4_H // Exported type declarations @@ -12,4 +12,4 @@ // Exported ROM declarations void sub_8086230(void); -#endif //POKEEMERALD_ROM4_H +#endif //GUARD_ROM4_H From 9f87103ea0df19ff4f3bc6bd4acf9fd7f68e9b5b Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sun, 17 Sep 2017 20:32:32 -0500 Subject: [PATCH 03/62] Extract baserom calls from files Extract calls from crt0.s, bard_music.s, battle_4.s --- asm/crt0.s | 56 +- data/bard_music.s | 5576 ++++++++++++++++++- data/battle_4.s | 116 +- data/battle_scripts_1.s | 37 +- data/link.s | 32 +- graphics/battle_interface/unk_battlebox.pal | 19 + graphics/battle_interface/unk_battlebox.png | Bin 0 -> 174 bytes 7 files changed, 5793 insertions(+), 43 deletions(-) create mode 100644 graphics/battle_interface/unk_battlebox.pal create mode 100644 graphics/battle_interface/unk_battlebox.png diff --git a/asm/crt0.s b/asm/crt0.s index 14675fe4c..3ece5c7d0 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -18,17 +18,65 @@ Start: @ 8000000 .global GPIOPortData GPIOPortData: @ 80000C4 - .hword 0 + .2byte 0 .global GPIOPortDirection GPIOPortDirection: @ 80000C6 - .hword 0 + .2byte 0 .global GPIOPortReadEnable GPIOPortReadEnable: @ 80000C8 - .hword 0 + .2byte 0 - .incbin "baserom.gba", 0xCA, 0x204 - 0xCA +@ 80000CA + .2byte 0 + +@ 80000CC + .space 0x34 + + .4byte 3 + .4byte 2 + + .ascii "pokemon emerald version" + .space 9 + + .4byte gMonFrontPicTable + .4byte gMonBackPicTable + .4byte gMonPaletteTable + .4byte gMonShinyPaletteTable + .4byte gMonIconTable + .4byte gMonIconPaletteIndices + .4byte gMonIconPaletteTable + .4byte gSpeciesNames + .4byte gMoveNames + .4byte gDecorations + + .4byte 0x00001270, 0x0000139c, 0x00000018, 0x00000988 + .4byte 0x00003b24, 0x00000046, 0x000008e4, 0x000008ac + .4byte 0x00000182 + + .byte 0x07, 0x0a, 0x0a, 0x0a, 0x0c, 0x0c, 0x06, 0x0c + .byte 0x06, 0x10, 0x12, 0x0c, 0x0f, 0x0b, 0x01, 0x08 + + .4byte 0x0000000c, 0x00000f2c, 0x00003d88, 0x00000234 + .4byte 0x00000238, 0x00000009, 0x0000000a, 0x00000000 + .4byte 0x00000008, 0x00000ca8, 0x00000ca8, 0x000031c7 + .4byte 0x000031b3, 0x00000000 + + .4byte gBaseStats + .4byte gAbilityNames + .4byte gAbilityDescriptionPointers + .4byte gItems + .4byte gBattleMoves + .4byte gUnknown_0832C400 + .4byte gUnknown_0832C460 + + .4byte 0x000000a8, 0x00000864, 0x0000089b + + .byte 0x1e, 0x1e, 0x10, 0x40 + + .4byte 0x0000322e, 0x00000498, 0x000031a8, 0x000031f8 + .4byte 0x00000034, 0x00000000, 0x00000000 .arm .align 2, 0 diff --git a/data/bard_music.s b/data/bard_music.s index ba775dd83..2e7326f9d 100644 --- a/data/bard_music.s +++ b/data/bard_music.s @@ -3,26 +3,5586 @@ .section .rodata + .align 2 gUnknown_085F5490:: @ 85F5490 - .incbin "baserom.gba", 0x5f5490, 0x4 + .4byte 0x19C + .align 2 gUnknown_085F5494:: @ 85F5494 - .incbin "baserom.gba", 0x5f5494, 0x4d40 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000023, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000028, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000001e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000007, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .align 2 gUnknown_085FA1D4:: @ 85FA1D4 - .incbin "baserom.gba", 0x5fa1d4, 0x4 + .4byte 0x163 + .align 2 gUnknown_085FA1D8:: @ 85FA1D8 - .incbin "baserom.gba", 0x5fa1d8, 0xff90 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000029, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002d, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001e, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000028, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .align 2 +gUnknown_085FE468:: @ 85FE468 + .4byte 0x00000012, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_085FE978:: @ 85FE978 + .4byte 0x00000008, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000015, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000007, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000007, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000021, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000002b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_085FFDE8:: @ 85FFDE8 + .4byte 0x00000002, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000023, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000016, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_086009B8:: @ 86009B8 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000028, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000023, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08601198:: @ 8601198 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000013, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000f71a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000007, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000029, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000028, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08601FA8:: @ 8601FA8 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0008051b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000028, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000019, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000031, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000023, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000024, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000013, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000001e, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000013, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000007, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000004, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000004, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000007, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000022, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000007, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08602B78:: @ 8602B78 + .4byte 0x00000009, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000017, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000007, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000028, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000006, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_086036B8:: @ 86036B8 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000004, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_086043A8:: @ 86043A8 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000019, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000020, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000020, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08605098:: @ 8605098 + .4byte 0x00000015, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x00000029, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000020, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000019, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000023, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000016, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000016, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x0000001c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08605D88:: @ 8605D88 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000006, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000002f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002f, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002f, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08606C28:: @ 8606C28 + .4byte 0x00000031, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000029, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000027, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08607498:: @ 8607498 + .4byte 0x00000014, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002f, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002f, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000008, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000026, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08607EB8:: @ 8607EB8 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000001c, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000014, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000028, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000f, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000000a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08608728:: @ 8608728 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000018, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000010, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000004, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000010, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000001, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000002e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08608F08:: @ 8608F08 + .4byte 0x0000001d, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000008, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002d, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000012, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000032, 0x00000000, 0x00000005, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000001e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000003, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + + .align 2 +gUnknown_086095C8:: @ 86095C8 + .4byte 0x0000002c, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000000, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000032, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000015, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000002, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000021, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000004, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000002a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000009, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000030, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 +gUnknown_08609B38:: @ 8609B38 + .4byte 0x00000005, 0x00000000, 0x00000002, 0x00000000 + .4byte 0x00000014, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001b, 0x00000000, 0x0000001b, 0x00000000 + .4byte 0x00000017, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000026, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000012, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000d, 0x00000000, 0x0000001d, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x0000001a, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000b, 0x00000000, 0x00000011, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000000b, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x00000009, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000027, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000000, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000e, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000011, 0x00000000, 0x00000001, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002c, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000a, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000003, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x00000023, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x00000024, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000f, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x00000030, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001d, 0x00000000, 0x0000002c, 0x00000000 + .4byte 0x0000000c, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000005, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000001c, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x00000018, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002b, 0x00000000, 0x00000033, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x0000002a, 0x00000000, 0x0000000e, 0x00000000 + .4byte 0x00000033, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + + .align 2 gUnknown_0860A168:: @ 860A168 - .incbin "baserom.gba", 0x60a168, 0x1b8 + .4byte NULL + .4byte gUnknown_085FE468 + .4byte gUnknown_085FE978 + .4byte gUnknown_085FFDE8 + .4byte gUnknown_086009B8 + .4byte gUnknown_08601198 + .4byte gUnknown_08601FA8 + .4byte gUnknown_08602B78 + .4byte gUnknown_086036B8 + .4byte gUnknown_086043A8 + .4byte gUnknown_08605098 + .4byte gUnknown_08605D88 + .4byte gUnknown_08606C28 + .4byte gUnknown_08607498 + .4byte gUnknown_08607EB8 + .4byte gUnknown_08608728 + .4byte gUnknown_08608F08 + .4byte gUnknown_086095C8 + .4byte NULL + .4byte NULL + .4byte gUnknown_08609B38 + .4byte NULL + .align 2 +gUnknown_0860A1C0:: @ 860A1C0 + .2byte 0xfd00, 0x1800 + +gUnknown_0860A1C4:: @ 860A1C4 + .2byte 0x0900, 0x1800 + +gUnknown_0860A1C8:: @ 860A1C7 + .2byte 0x0100, 0x1800 + +gUnknown_0860A1CC:: @ 860A1CC + .2byte 0x0400, 0x1800 + +gUnknown_0860A1D0:: @ 860A1D0 + .2byte 0x0b00, 0x1800 + +gUnknown_0860A1D4:: @ 860A1D4 + .2byte 0xfd00, 0xff00, 0x1800 + +gUnknown_0860A1DA:: @ 860A1DA + .2byte 0xfd00, 0x0200, 0x1800 + +gUnknown_0860A1E0:: @ 860A1E0 + .2byte 0x0200, 0x0400, 0x1800 + +gUnknown_0860A1E6:: @ 860A1E6 + .2byte 0x0600, 0x0800, 0x1800 + +gUnknown_0860A1EC:: @ 860A1EC + .2byte 0x0900, 0x0800, 0x1800 + +gUnknown_0860A1F2:: @ 860A1F2 + .2byte 0xfd00, 0xff00, 0xfd00, 0x1800 + +gUnknown_0860A1FA:: @ 860A1FA + .2byte 0x0400, 0xfd00, 0x0400, 0x1800 + +gUnknown_0860A202:: @ 860A202 + .2byte 0x0900, 0x0800, 0x0600, 0x1800 + +gUnknown_0860A20A:: @ 860A20A + .2byte 0x0100, 0x0200, 0x0400, 0x1800 + +gUnknown_0860A212:: @ 860A212 + .2byte 0x0600, 0x1000, 0x0d00, 0x1800 + +gUnknown_0860A21A:: @ 860A21A + .2byte 0x0400, 0x0900, 0x0400, 0x0900, 0x1800 + +gUnknown_0860A224:: @ 860A224 + .2byte 0x0900, 0x0400, 0x0d00, 0x0400, 0x1800 + +gUnknown_0860A22E:: @ 860A22E + .2byte 0x0100, 0x0200, 0x0400, 0x0600, 0x1800 + +gUnknown_0860A238:: @ 860A238 + .2byte 0x0800, 0x0600, 0x0400, 0x0200, 0x1800 + +gUnknown_0860A242:: @ 860A242 + .2byte 0x0f00, 0x0d00, 0x0b00, 0x0a00, 0x1800 + +gUnknown_0860A24C:: @ 860A24C + .2byte 0xfd00, 0xff00, 0x0100, 0x0200, 0x0400, 0x1800 + +gUnknown_0860A258:: @ 860A258 + .2byte 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, 0x1800 + +gUnknown_0860A264:: @ 860A264 + .2byte 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, 0x1800 + +gUnknown_0860A270:: @ 860A270 + .2byte 0x0900, 0x0400, 0x0900, 0x0400, 0xfd00, 0x1800 + +gUnknown_0860A27C:: @ 860A27C + .2byte 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, 0x1800 + +gUnknown_0860A288:: @ 860A288 + .2byte 0xfd00, 0xff00, 0x0100, 0x0200, 0x0400, 0x0600, 0x1800 + +gUnknown_0860A296:: @ 860A296 + .2byte 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, 0xff00, 0x1800 + +gUnknown_0860A2A4:: @ 860A2A4 + .2byte 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, 0x1800 + +gUnknown_0860A2B2:: @ 860A2B2 + .2byte 0x0400, 0xfd00, 0x0900, 0x0400, 0x0900, 0x0400, 0x1800 + +gUnknown_0860A2C0:: @ 860A2C0 + .2byte 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, 0x1800 + +gUnknown_0860A2CE:: @ 860A2CE + .2byte 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, 0x1800 + +gUnknown_0860A2DE:: @ 860A2DE + .2byte 0x0100, 0x0100, 0xff00, 0xff00, 0xfd00, 0x0400, 0xfd00, 0x1800 + +gUnknown_0860A2EE:: @ 860A2EE + .2byte 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, 0x1800 + +gUnknown_0860A2FE:: @ 860A2FE + .2byte 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, 0x1800 + +gUnknown_0860A30E:: @ 860A30E + .2byte 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, 0x1800 + + .align 2 gUnknown_0860A320:: @ 860A320 - .incbin "baserom.gba", 0x60a320, 0x8c + .4byte gUnknown_0860A1C0 + .4byte gUnknown_0860A1C4 + .4byte gUnknown_0860A1C8 + .4byte gUnknown_0860A1CC + .4byte gUnknown_0860A1D0 + .4byte gUnknown_0860A1D4 + .4byte gUnknown_0860A1DA + .4byte gUnknown_0860A1E0 + .4byte gUnknown_0860A1E6 + .4byte gUnknown_0860A1EC + .4byte gUnknown_0860A1F2 + .4byte gUnknown_0860A1FA + .4byte gUnknown_0860A202 + .4byte gUnknown_0860A20A + .4byte gUnknown_0860A212 + .4byte gUnknown_0860A21A + .4byte gUnknown_0860A224 + .4byte gUnknown_0860A22E + .4byte gUnknown_0860A238 + .4byte gUnknown_0860A242 + .4byte gUnknown_0860A24C + .4byte gUnknown_0860A258 + .4byte gUnknown_0860A264 + .4byte gUnknown_0860A270 + .4byte gUnknown_0860A27C + .4byte gUnknown_0860A288 + .4byte gUnknown_0860A296 + .4byte gUnknown_0860A2A4 + .4byte gUnknown_0860A2B2 + .4byte gUnknown_0860A2C0 + .4byte gUnknown_0860A2CE + .4byte gUnknown_0860A2DE + .4byte gUnknown_0860A2EE + .4byte gUnknown_0860A2FE + .4byte gUnknown_0860A30E + .align 2 gUnknown_0860A3AC:: @ 860A3AC - .incbin "baserom.gba", 0x60a3ac, 0x30 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .4byte 0x000000ff, 0x00000000, 0x000000ff, 0x00000000 + .align 2 gUnknown_0860A3DC:: @ 860A3DC - .incbin "baserom.gba", 0x60a3dc, 0xd0 + .4byte 0x00000009, 0x00000016, 0x0000000f, 0x00000010 + .4byte 0x00000027, 0x00000015, 0x00000009, 0x0000001e + .4byte 0x00000018, 0x0000000f, 0x00000019, 0x0000000c + .4byte 0x00000016, 0x0000002d, 0x00000018, 0x0000000f + .4byte 0x00000028, 0x00000009, 0x00000015, 0x0000002a + .4byte 0x00000012, 0x00000009, 0x00000016, 0x0000000f + .4byte 0x0000001b, 0x00000030, 0x00000012, 0x0000001b + .4byte 0x00000021, 0x00000018, 0x00000019, 0x00000027 + .4byte 0x00000013, 0x00000010, 0x00000036, 0x00000012 + .4byte 0x00000009, 0x0000002d, 0x0000000f, 0x0000000c + .4byte 0x00000027, 0x00000017, 0x00000005, 0x0000002d + .4byte 0x0000000c, 0x00000015, 0x00000030, 0x0000000c + .4byte 0x00000015, 0x00000045, 0x00000012, 0x0000000f diff --git a/data/battle_4.s b/data/battle_4.s index 1c8fb5384..0f799eac8 100644 --- a/data/battle_4.s +++ b/data/battle_4.s @@ -7,44 +7,134 @@ gMoveEffectBS_Ptrs:: @ 831C224 - .incbin "baserom.gba", 0x31c224, 0xa4 + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB386 + .4byte gUnknown_082DB395 + .4byte gUnknown_082DB3A4 + .4byte gUnknown_082DB3B3 + .4byte gUnknown_082DB3C9 + .4byte gUnknown_082DB3E6 + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB3C2 + .4byte gUnknown_082DB3D6 + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB3DD + .4byte gUnknown_082DB3F4 + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB36A + .4byte gUnknown_082DB3F4 + .align 2 + window_template 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x003f + + .align 2 gUnknown_0831C2C8:: @ 831C2C8 - .incbin "baserom.gba", 0x31c2c8, 0x20 + .incbin "graphics/battle_interface/unk_battlebox.gbapal" + .align 2 gUnknown_0831C2E8:: @ 831C2E8 - .incbin "baserom.gba", 0x31c2e8, 0xd8 + .incbin "graphics/battle_interface/unk_battlebox.4bpp.lz" + .align 2 + .byte 0x3A, 0x3E, 0x3B, 0x3F, 0x3C, 0x3D, 0x00, 0x00 + + .align 2 +gUnknown_0831C3B8:: @ 831C3B8 + .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 + + .align 2 gUnknown_0831C3C0:: @ 831C3C0 - .incbin "baserom.gba", 0x31c3c0, 0x18 + .2byte 0xd75a @ tileTag + .2byte 0xd75a @ paletteTag + .4byte gUnknown_0831C3B8 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_804F450 + .align 2 sProtectSuccessRates:: @ 831C3D8 - .incbin "baserom.gba", 0x31c3d8, 0x8 + .2byte 0xffff, 0x7fff, 0x3fff, 0x1fff + .align 2 gUnknown_0831C3E0:: @ 831C3E0 - .incbin "baserom.gba", 0x31c3e0, 0x28 + .2byte 0x0076, 0x00a5, 0x00a6, 0x0066 + .2byte 0xfffe, 0x0044, 0x00f3, 0x00b6 + .2byte 0x00c5, 0x00cb, 0x00c2, 0x00d6 + .2byte 0x00a8, 0x010a, 0x0121, 0x010e + .2byte 0x0157, 0x010f, 0x0108, 0xffff + .align 2 gUnknown_0831C408:: @ 831C408 - .incbin "baserom.gba", 0x31c408, 0xc + .byte 0x01, 0xc8, 0x04, 0x96, 0x09, 0x64, 0x10, 0x50 + .byte 0x20, 0x28, 0x30, 0x14 + .align 2 gUnknown_0831C414:: @ 831C414 - .incbin "baserom.gba", 0x31c414, 0x14 + .2byte 0x004e, 0x004b, 0x0059, 0x0038 + .2byte 0x0039, 0x003d, 0x009d, 0x00f7 + .2byte 0x0081, 0x0081 + .align 2 gUnknown_0831C428:: @ 831C428 - .incbin "baserom.gba", 0x31c428, 0x18 + .2byte 0x0064, 0x0014, 0x00fa, 0x0028 + .2byte 0x01f4, 0x003c, 0x03e8, 0x0050 + .2byte 0x07d0, 0x0064, 0xffff, 0xffff + .align 2 @ 831C440 .include "data/pickup_items.inc" sTerrainToType:: @ 831C483 - .incbin "baserom.gba", 0x31c483, 0xa + .byte 0x0c, 0x0c, 0x04, 0x0b, 0x0b, 0x0b, 0x05, 0x05 + .byte 0x00, 0x00 sBallCatchBonuses:: @ 831C48D - .incbin "baserom.gba", 0x31c48d, 0x7 + .byte 0x14, 0x0f, 0x0a, 0x0f, 0x00, 0x00, 0x00 + .align 2 gUnknown_0831C494:: @ 831C494 - .incbin "baserom.gba", 0x31c494, 0x64 + .byte 0x3d, 0x44, 0x3d, 0x44, 0x14, 0x2d, 0x54, 0x5c + .byte 0x46, 0x55, 0x20, 0x5c, 0x26, 0x45, 0x46, 0x55 + .byte 0x14, 0x5a, 0x46, 0x5c, 0x1e, 0x32, 0x20, 0x5a + .byte 0x38, 0x4e, 0x38, 0x4e, 0x19, 0x28, 0x4b, 0x5a + .byte 0x45, 0x4b, 0x1c, 0x53, 0x23, 0x2d, 0x1d, 0x23 + .byte 0x3e, 0x48, 0x1e, 0x32, 0x3a, 0x5f, 0x58, 0x5e + .byte 0x22, 0x2d, 0x1d, 0x28, 0x23, 0x28, 0x23, 0x5f + .byte 0x38, 0x4e, 0x38, 0x4e, 0x23, 0x50, 0x22, 0x5e + .byte 0x2c, 0x5e, 0x22, 0x28, 0x38, 0x4e, 0x38, 0x4e + .byte 0x1e, 0x58, 0x1e, 0x58, 0x1e, 0x2b, 0x1b, 0x21 + .byte 0x28, 0x5a, 0x19, 0x57, 0x12, 0x58, 0x5a, 0x5f + .byte 0x58, 0x5e, 0x16, 0x2a, 0x2a, 0x5c, 0x2a, 0x2f + .byte 0x38, 0x4e, 0x38, 0x4e + .align 2 gUnknown_0831C4F8:: @ 831C4F8 - .incbin "baserom.gba", 0x31c4f8, 0x1c + .byte 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00 + .byte 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01 + .byte 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02 + .byte 0x03, 0x00, 0x00, 0x00 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index da05b9367..604e84ee7 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -322,10 +322,43 @@ gUnknown_082DB350:: @ 82DB350 .incbin "baserom.gba", 0x2db350, 0x11 gUnknown_082DB361:: @ 82DB361 - .incbin "baserom.gba", 0x2db361, 0x17 + .incbin "baserom.gba", 0x2db361, 0x9 + +gUnknown_082DB36A:: @ 82DB36A + .incbin "baserom.gba", 0x2db36A, 0xE gUnknown_082DB378:: @ 82DB378 - .incbin "baserom.gba", 0x2db378, 0xaa + .incbin "baserom.gba", 0x2db378, 0xE + +gUnknown_082DB386:: @ 82DB386 + .incbin "baserom.gba", 0x2db386, 0xF + +gUnknown_082DB395:: @ 82DB395 + .incbin "baserom.gba", 0x2db395, 0xF + +gUnknown_082DB3A4:: @ 82DB3A4 + .incbin "baserom.gba", 0x2db3A4, 0xF + +gUnknown_082DB3B3:: @ 82DB3B3 + .incbin "baserom.gba", 0x2db3B3, 0xF + +gUnknown_082DB3C2:: @ 82DB3C2 + .incbin "baserom.gba", 0x2db3C2, 0x7 + +gUnknown_082DB3C9:: @ 82DB3C9 + .incbin "baserom.gba", 0x2db3C9, 0xD + +gUnknown_082DB3D6:: @ 82DB3D6 + .incbin "baserom.gba", 0x2db3D6, 0x7 + +gUnknown_082DB3DD:: @ 82DB3DD + .incbin "baserom.gba", 0x2db3DD, 0x9 + +gUnknown_082DB3E6:: @ 82DB3E6 + .incbin "baserom.gba", 0x2db3E6, 0xE + +gUnknown_082DB3F4:: @ 82DB3F4 + .incbin "baserom.gba", 0x2db3F4, 0x2e gUnknown_082DB422:: @ 82DB422 .incbin "baserom.gba", 0x2db422, 0xe diff --git a/data/link.s b/data/link.s index 900659502..a7424cc1a 100644 --- a/data/link.s +++ b/data/link.s @@ -256,52 +256,52 @@ gUnknown_082ED6E0:: @ 82ED6E0 .2byte 0x0002, 0x7f7d, 0x0000, 0xffff .ascii "RFU WAIT" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 7 .ascii "RFU BOOT" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 7 .ascii "RFU ERROR" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 6 .ascii "RFU RESET" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 6 .ascii "RFU CONFIG" - .byte 0x00, 0x00, 0x00, 0x00, 0x00 + .space 5 .ascii "RFU START" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 6 .ascii "RFU SC POLL" - .byte 0x00, 0x00, 0x00, 0x00 + .space 4 .ascii "RFU SP POLL" - .byte 0x00, 0x00, 0x00, 0x00 + .space 4 .ascii "RFU START" - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .space 6 .ascii "RFU SEND ERR" - .byte 0x00, 0x00, 0x00 + .space 3 .ascii "RFU CP POLL" - .byte 0x00, 0x00, 0x00, 0x00 + .space 4 .ascii " " - .byte 0x00, 0x00 + .space 2 .ascii "RECOVER START " - .byte 0x00, 0x00 + .space 2 .ascii "DISSCONECT " - .byte 0x00, 0x00 + .space 2 .ascii "RECOVER SUUSES" - .byte 0x00, 0x00 + .space 2 .ascii "RECOVER FAILED" - .byte 0x00, 0x00 + .space 2 .align 2 gUnknown_082ED7E0:: @ 82ED7E0 diff --git a/graphics/battle_interface/unk_battlebox.pal b/graphics/battle_interface/unk_battlebox.pal new file mode 100644 index 000000000..862165f3f --- /dev/null +++ b/graphics/battle_interface/unk_battlebox.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 255 +255 255 255 +106 90 115 +0 0 0 +213 230 255 +189 205 238 +238 238 255 +106 172 197 +90 139 180 +123 197 205 +0 0 0 +0 0 0 +123 197 255 +0 0 139 +255 131 131 +164 0 0 diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/unk_battlebox.png new file mode 100644 index 0000000000000000000000000000000000000000..24700ef4d1f822b008d25f4246d58add0ca812b8 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^2|z5t!VDz8AAhQtTjiYy0=sxJqr{Bg6gCH85p|%H#aX~U})rKxepYw^mK6yvFJ@sFjM1{FpxN} z!YN@K;is?8YGNEQX-Qqk;RP2Ho;e9|$Xzv1G2OvtEYUuRrAN|3H;rMU!)(JD|8h5g O4EA*Ob6Mw<&;$U2tUR6o literal 0 HcmV?d00001 From 16f2e40576b29fd85366305b4165da3aff4aef0e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 17 Sep 2017 23:42:44 -0400 Subject: [PATCH 04/62] Fix naming conflicts --- include/global.berry.h | 4 ---- ld_script.txt | 2 +- src/berry.c | 6 +++--- src/load_save.c | 4 ---- src/{rom_81700F8.c => reset_save_heap.c} | 0 5 files changed, 4 insertions(+), 12 deletions(-) rename src/{rom_81700F8.c => reset_save_heap.c} (100%) diff --git a/include/global.berry.h b/include/global.berry.h index 4b9ca644c..a77da20ba 100644 --- a/include/global.berry.h +++ b/include/global.berry.h @@ -46,10 +46,6 @@ struct EnigmaBerry u8 holdEffect; u8 holdEffectParam; u32 checksum; - u8 pic[(6 * 6) * TILE_SIZE_4BPP]; - u16 palette[16]; - u8 description1[45]; - u8 description2[45]; }; struct BattleEnigmaBerry diff --git a/ld_script.txt b/ld_script.txt index 78d0e6cca..19ddabab1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -207,7 +207,7 @@ SECTIONS { asm/battle_controller_wally.o(.text); asm/player_pc.o(.text); asm/intro.o(.text); - src/rom_81700F8.o(.text); + src/reset_save_heap.o(.text); asm/field_region_map.o(.text); asm/battle_anim_8170478.o(.text); asm/hall_of_fame.o(.text); diff --git a/src/berry.c b/src/berry.c index b6eaa14a0..46b93d6ff 100644 --- a/src/berry.c +++ b/src/berry.c @@ -807,7 +807,7 @@ const struct Berry gBerries[] = // unused void ClearEnigmaBerries(void) { - CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry)); + CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/); } void SetEnigmaBerry(u8 *src) @@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src) u32 i; u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry; - for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++) + for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/; i++) dest[i] = src[i]; } @@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry) dest = (u8*)enigmaBerry; checksum = 0; - for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++) + for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/ - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++) { checksum += dest[i]; } diff --git a/src/load_save.c b/src/load_save.c index 588387186..68d978e3d 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -6,15 +6,11 @@ #include "rng.h" #include "malloc.h" -extern u8 gPlayerPartyCount; -extern struct PokemonStorage* gPokemonStoragePtr; extern void* gUnknown_0203CF5C; -extern u8 gHeap[0x1C000]; extern bool16 IdentifyFlash(void); extern void SetBagItemsPointers(void); extern void SetDecorationInventoriesPointers(void); -extern void InitHeap(void *heapStart, u32 heapSize); void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey); diff --git a/src/rom_81700F8.c b/src/reset_save_heap.c similarity index 100% rename from src/rom_81700F8.c rename to src/reset_save_heap.c From 8604291b0f0e430b01f0099ea4e098171938505b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 08:52:57 -0400 Subject: [PATCH 05/62] Start decomp --- asm/berry_fix_program.s | 236 ------------------------------ data/multiboot_berry_glitch_fix.s | 1 + include/gba/multiboot.h | 26 ++-- include/gpu_regs.h | 13 ++ include/multiboot.h | 2 +- include/unknown_task.h | 11 ++ ld_script.txt | 1 + src/berry_fix_program.c | 123 ++++++++++++++++ 8 files changed, 163 insertions(+), 250 deletions(-) create mode 100644 include/gpu_regs.h create mode 100644 include/unknown_task.h create mode 100644 src/berry_fix_program.c diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index 19ed0babd..caeae0115 100755 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -5,242 +5,6 @@ .text - thumb_func_start sub_81BF384 -sub_81BF384: @ 81BF384 - push {r4,lr} - ldr r0, =0x0000ffff - bl DisableInterrupts - movs r0, 0x1 - bl EnableInterrupts - bl m4aSoundVSyncOff - movs r0, 0 - bl SetVBlankCallback - bl ResetSpriteData - bl ResetTasks - bl remove_some_task - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r4, =gUnknown_030012B8 - movs r0, 0x50 - bl AllocZeroed - str r0, [r4] - movs r1, 0 - strb r1, [r0] - ldr r1, [r4] - movs r0, 0x6 - strb r0, [r1, 0x1] - ldr r0, =sub_81BF3DC - bl SetMainCallback2 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81BF384 - - thumb_func_start sub_81BF3DC -sub_81BF3DC: @ 81BF3DC - push {r4,r5,lr} - sub sp, 0x4 - ldr r1, =gUnknown_030012B8 - ldr r0, [r1] - ldrb r0, [r0] - adds r5, r1, 0 - cmp r0, 0x7 - bls _081BF3EE - b _081BF592 -_081BF3EE: - lsls r0, 2 - ldr r1, =_081BF400 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081BF400: - .4byte _081BF420 - .4byte _081BF430 - .4byte _081BF45C - .4byte _081BF488 - .4byte _081BF4BC - .4byte _081BF514 - .4byte _081BF552 - .4byte _081BF574 -_081BF420: - bl sub_81BF5A4 - ldr r0, =gUnknown_030012B8 - ldr r1, [r0] - movs r0, 0x1 - b _081BF590 - .pool -_081BF430: - movs r0, 0x5 - bl sub_81BF7A4 - cmp r0, 0x5 - beq _081BF43C - b _081BF592 -_081BF43C: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _081BF44A - b _081BF592 -_081BF44A: - ldr r0, =gUnknown_030012B8 - ldr r1, [r0] - movs r0, 0x2 - b _081BF590 - .pool -_081BF45C: - movs r0, 0 - bl sub_81BF7A4 - cmp r0, 0 - beq _081BF468 - b _081BF592 -_081BF468: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _081BF476 - b _081BF592 -_081BF476: - ldr r0, =gUnknown_030012B8 - ldr r1, [r0] - movs r0, 0x3 - b _081BF590 - .pool -_081BF488: - movs r0, 0x1 - bl sub_81BF7A4 - cmp r0, 0x1 - beq _081BF494 - b _081BF592 -_081BF494: - ldr r4, =gUnknown_030012B8 - ldr r0, [r4] - ldr r1, =gUnknown_089A6550 - str r1, [r0, 0x2C] - adds r0, 0x4F - movs r5, 0 - strb r5, [r0] - ldr r0, [r4] - adds r0, 0x4 - bl MultiBootInit - ldr r1, [r4] - strh r5, [r1, 0x2] - movs r0, 0x4 - b _081BF590 - .pool -_081BF4BC: - adds r4, r5, 0 - ldr r0, [r4] - adds r0, 0x4 - bl MultiBootMain - ldr r4, [r4] - ldrb r0, [r4, 0x1C] - cmp r0, 0 - bne _081BF4D8 - ldr r0, [r4, 0x20] - ldr r1, =0x00020200 - ands r0, r1 - cmp r0, r1 - beq _081BF4E4 -_081BF4D8: - movs r0, 0 - strh r0, [r4, 0x2] - b _081BF592 - .pool -_081BF4E4: - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xB4 - bls _081BF592 - adds r0, r4, 0x4 - ldr r1, =gMultiBootProgram_BerryGlitchFix_Start - ldr r2, =gMultiBootProgram_BerryGlitchFix_End - subs r2, r1 - movs r3, 0x1 - str r3, [sp] - movs r3, 0x4 - bl MultiBootStartMaster - ldr r1, [r5] - movs r0, 0x5 - b _081BF590 - .pool -_081BF514: - movs r0, 0x2 - bl sub_81BF7A4 - adds r4, r0, 0 - cmp r4, 0x2 - bne _081BF592 - ldr r5, =gUnknown_030012B8 - ldr r0, [r5] - adds r0, 0x4 - bl MultiBootMain - ldr r0, [r5] - adds r0, 0x4 - bl MultiBootCheckComplete - cmp r0, 0 - beq _081BF540 - ldr r1, [r5] - movs r0, 0x6 - b _081BF590 - .pool -_081BF540: - ldr r1, [r5] - adds r0, r1, 0 - adds r0, 0x22 - ldrb r0, [r0] - ands r4, r0 - cmp r4, 0 - bne _081BF592 - movs r0, 0x7 - b _081BF590 -_081BF552: - movs r0, 0x3 - bl sub_81BF7A4 - cmp r0, 0x3 - bne _081BF592 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _081BF592 - bl DoSoftReset - b _081BF592 - .pool -_081BF574: - movs r0, 0x4 - bl sub_81BF7A4 - cmp r0, 0x4 - bne _081BF592 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _081BF592 - ldr r0, =gUnknown_030012B8 - ldr r1, [r0] - movs r0, 0x1 -_081BF590: - strb r0, [r1] -_081BF592: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81BF3DC - thumb_func_start sub_81BF5A4 sub_81BF5A4: @ 81BF5A4 push {r4-r6,lr} diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index bc97eb553..e6a26c619 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -3,6 +3,7 @@ gUnknown_089A6550:: @ 89A6550 .incbin "baserom.gba", 0x9a6550, 0xc0 +gMultiBootProgram_BerryGlitchFix_Script:: @ 89A6610 gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6610 .incbin "baserom.gba", 0x9a6610, 0x3b34 gMultiBootProgram_BerryGlitchFix_End:: diff --git a/include/gba/multiboot.h b/include/gba/multiboot.h index e88b43a19..61c02ec52 100644 --- a/include/gba/multiboot.h +++ b/include/gba/multiboot.h @@ -8,19 +8,19 @@ struct MultiBootParam { - u32 system_work[5]; - u8 handshake_data; - u8 padding; - u16 handshake_timeout; - u8 probe_count; - u8 client_data[MULTIBOOT_NCHILD]; - u8 palette_data; - u8 response_bit; - u8 client_bit; - u8 reserved1; - u8 *boot_srcp; - u8 *boot_endp; - u8 *masterp; + u32 system_work[5]; // 00 + u8 handshake_data; // 14 + u8 padding; // 15 + u16 handshake_timeout; // 16 + u8 probe_count; // 18 + u8 client_data[MULTIBOOT_NCHILD]; // 19 + u8 palette_data; // 1c + u8 response_bit; // 1d + u8 client_bit; // 1e + u8 reserved1; // 1f + u8 *boot_srcp; // 20 + u8 *boot_endp; // 24 + const u8 *masterp; u8 *reserved2[MULTIBOOT_NCHILD]; u32 system_work2[4]; u8 sendflag; diff --git a/include/gpu_regs.h b/include/gpu_regs.h new file mode 100644 index 000000000..d0528bb83 --- /dev/null +++ b/include/gpu_regs.h @@ -0,0 +1,13 @@ +#ifndef GUARD_gpu_regs_H +#define GUARD_gpu_regs_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void DisableInterrupts(u16); +void EnableInterrupts(u16); +void SetGpuReg(u8, u16); + +#endif //GUARD_gpu_regs_H diff --git a/include/multiboot.h b/include/multiboot.h index 950c853d0..d4700ff4e 100644 --- a/include/multiboot.h +++ b/include/multiboot.h @@ -15,7 +15,7 @@ void MultiBootInit(struct MultiBootParam *mp); int MultiBootMain(struct MultiBootParam *mp); void MultiBootStartProbe(struct MultiBootParam *mp); -void MultiBootStartMaster(struct MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed); +void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, int length, u8 palette_color, s8 palette_speed); int MultiBootCheckComplete(struct MultiBootParam *mp); #endif // GUARD_MULTIBOOT_H diff --git a/include/unknown_task.h b/include/unknown_task.h new file mode 100644 index 000000000..f59ca9ac3 --- /dev/null +++ b/include/unknown_task.h @@ -0,0 +1,11 @@ +#ifndef GUARD_unknown_task_H +#define GUARD_unknown_task_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void remove_some_task(void); + +#endif //GUARD_unknown_task_H diff --git a/ld_script.txt b/ld_script.txt index d6b3953fe..b62125311 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -259,6 +259,7 @@ SECTIONS { asm/battle_controller_player_partner.o(.text); asm/fldeff_groundshake.o(.text); asm/fossil_specials.o(.text); + src/berry_fix_program.o(.text); asm/berry_fix_program.o(.text); asm/pokemon_summary_screen.o(.text); asm/pokenav.o(.text); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c new file mode 100644 index 000000000..bafefaf7a --- /dev/null +++ b/src/berry_fix_program.c @@ -0,0 +1,123 @@ + +// Includes +#include "global.h" +#include "multiboot.h" +#include "gpu_regs.h" +#include "main.h" +#include "sprite.h" +#include "task.h" +#include "unknown_task.h" +#include "malloc.h" +#include "m4a.h" + +// Static type declarations + +typedef struct { + u8 state; + u8 unk1; + u16 unk2; + struct MultiBootParam mb; +} berryfix_t; + +// Static RAM declarations + +extern berryfix_t *gUnknown_030012B8; + +// Static ROM declarations + +static void sub_81BF3DC(void); +void sub_81BF5A4(void); +u32 sub_81BF7A4(u8); + +// .rodata + +extern const u8 gUnknown_089A6550[0xC0]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; +extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; + +// .text + +void sub_81BF384(void) +{ + DisableInterrupts(0xFFFF); + EnableInterrupts(0x0001); + m4aSoundVSyncOff(); + SetVBlankCallback(NULL); + ResetSpriteData(); + ResetTasks(); + remove_some_task(); + SetGpuReg(REG_OFFSET_DISPCNT, 0x0000); + gUnknown_030012B8 = AllocZeroed(0x50); + gUnknown_030012B8->state = 0; + gUnknown_030012B8->unk1 = 6; + SetMainCallback2(sub_81BF3DC); +} + +static void sub_81BF3DC(void) +{ + switch (gUnknown_030012B8->state) + { + case 0: + sub_81BF5A4(); + gUnknown_030012B8->state = 1; + break; + case 1: + if (sub_81BF7A4(5) == 5 && (gMain.newKeys & A_BUTTON)) + { + gUnknown_030012B8->state = 2; + } + break; + case 2: + if (sub_81BF7A4(0) == 0 && (gMain.newKeys & A_BUTTON)) + { + gUnknown_030012B8->state = 3; + } + break; + case 3: + if (sub_81BF7A4(1) == 1) + { + gUnknown_030012B8->mb.masterp = gUnknown_089A6550; + gUnknown_030012B8->mb.server_type = 0; + MultiBootInit(&gUnknown_030012B8->mb); + gUnknown_030012B8->unk2 = 0; + gUnknown_030012B8->state = 4; + } + break; + case 4: + MultiBootMain(&gUnknown_030012B8->mb); + if (gUnknown_030012B8->mb.probe_count != 0 || (!(gUnknown_030012B8->mb.response_bit & 2) || !(gUnknown_030012B8->mb.client_bit & 2))) + { + gUnknown_030012B8->unk2 = 0; + } + else if (++ gUnknown_030012B8->unk2 > 180) + { + MultiBootStartMaster(&gUnknown_030012B8->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1); + gUnknown_030012B8->state = 5; + } + break; + case 5: + if (sub_81BF7A4(2) == 2) { + MultiBootMain(&gUnknown_030012B8->mb); + if (MultiBootCheckComplete(&gUnknown_030012B8->mb)) { + gUnknown_030012B8->state = 6; + } + else if (!(gUnknown_030012B8->mb.client_bit & 2)) { + gUnknown_030012B8->state = 7; + } + } + break; + case 6: + if (sub_81BF7A4(3) == 3 && gMain.newKeys & A_BUTTON) + { + DoSoftReset(); + } + break; + case 7: + if (sub_81BF7A4(4) == 4 && gMain.newKeys & A_BUTTON) + { + gUnknown_030012B8->state = 1; + } + break; + } +} From c5dddf41f58446139b52d3b60cb8738052e4a084 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 11:26:45 -0400 Subject: [PATCH 06/62] sub_81BF5A4 --- asm/berry_fix_program.s | 205 ------------------------------ include/bg.h | 19 +++ include/gba/multiboot.h | 4 +- include/menu.h | 2 + include/text.h | 4 +- include/window.h | 2 +- src/berry_fix_program.c | 272 +++++++++++++++++++++++++++++++++++++++- src/bg.c | 189 +++++++++++++--------------- src/multiboot.c | 2 +- src/text.c | 6 +- src/window.c | 2 +- 11 files changed, 390 insertions(+), 317 deletions(-) create mode 100644 include/bg.h diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index caeae0115..83be5e453 100755 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -5,211 +5,6 @@ .text - thumb_func_start sub_81BF5A4 -sub_81BF5A4: @ 81BF5A4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r1, 0 - str r1, [sp, 0xC] - ldr r4, =0x040000d4 - add r0, sp, 0xC - str r0, [r4] - movs r0, 0xC0 - lsls r0, 19 - str r0, [r4, 0x4] - ldr r0, =0x85006000 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - str r1, [sp, 0xC] - add r0, sp, 0xC - str r0, [r4] - movs r0, 0xE0 - lsls r0, 19 - str r0, [r4, 0x4] - ldr r2, =0x85000100 - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - str r1, [sp, 0xC] - add r0, sp, 0xC - str r0, [r4] - movs r0, 0xA0 - lsls r0, 19 - str r0, [r4, 0x4] - str r2, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_08618108 - movs r0, 0 - movs r2, 0x2 - bl InitBgsFromTemplates - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - ldr r0, =gUnknown_08618110 - bl InitWindows - bl DeactivateAllTextPrinters - ldr r0, =gUnknown_08618138 - str r0, [r4] - ldr r0, =0x050001e0 - str r0, [r4, 0x4] - ldr r0, =0x84000008 - str r0, [r4, 0x8] - ldr r0, [r4, 0x8] - movs r0, 0 - movs r1, 0x40 - bl SetGpuReg - movs r0, 0x2 - movs r1, 0 - bl FillWindowPixelBuffer - movs r0, 0x3 - movs r1, 0 - bl FillWindowPixelBuffer - movs r0, 0 - movs r1, 0xAA - bl FillWindowPixelBuffer - ldr r5, =gUnknown_08617E9B - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - adds r1, r0, 0 - movs r4, 0x78 - subs r0, r4, r1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r6, =gUnknown_0861815B - str r6, [sp] - movs r0, 0x1 - negs r0, r0 - mov r8, r0 - str r0, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x2 - movs r1, 0 - movs r3, 0x3 - bl box_print - ldr r5, =gUnknown_08617E8D - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - adds r1, r0, 0 - subs r4, r1 - lsrs r0, r4, 31 - adds r4, r0 - asrs r4, 1 - adds r0, r4, 0 - adds r0, 0x78 - lsls r2, r0, 24 - lsrs r2, 24 - str r6, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x2 - movs r1, 0 - movs r3, 0x3 - bl box_print - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - adds r1, r0, 0 - movs r0, 0x70 - subs r0, r1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r2, r0, 24 - lsrs r2, 24 - str r6, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r5, [sp, 0x8] - movs r0, 0x3 - movs r1, 0 - movs r3, 0 - bl box_print - ldr r4, =gUnknown_08617E78 - movs r0, 0x1 - adds r1, r4, 0 - movs r2, 0 - bl GetStringWidth - adds r1, r0, 0 - movs r0, 0xD0 - subs r0, r1 - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - lsls r2, r0, 24 - lsrs r2, 24 - ldr r0, =gUnknown_08618158 - str r0, [sp] - mov r0, r8 - str r0, [sp, 0x4] - str r4, [sp, 0x8] - movs r0, 0 - movs r1, 0x1 - movs r3, 0x2 - bl box_print - movs r0, 0x2 - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0x3 - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81BF5A4 - thumb_func_start sub_81BF7A4 sub_81BF7A4: @ 81BF7A4 push {r4,r5,lr} diff --git a/include/bg.h b/include/bg.h new file mode 100644 index 000000000..7a0782c1b --- /dev/null +++ b/include/bg.h @@ -0,0 +1,19 @@ +#ifndef GUARD_bg_H +#define GUARD_bg_H + +struct BgTemplate { + u32 bg:2; + u32 charBaseIndex:2; + u32 mapBaseIndex:5; + u32 screenSize:2; + u32 paletteMode:1; + u32 priority:2; + u32 baseTile:10; +}; + +void ResetBgsAndClearDma3BusyFlags(u32); +void InitBgsFromTemplates(u8, const struct BgTemplate *, u8); +u32 ChangeBgX(u8, u32, u8); +u32 ChangeBgY(u8, u32, u8); + +#endif //GUARD_bg_H diff --git a/include/gba/multiboot.h b/include/gba/multiboot.h index 61c02ec52..14b6594b2 100644 --- a/include/gba/multiboot.h +++ b/include/gba/multiboot.h @@ -18,8 +18,8 @@ struct MultiBootParam u8 response_bit; // 1d u8 client_bit; // 1e u8 reserved1; // 1f - u8 *boot_srcp; // 20 - u8 *boot_endp; // 24 + const u8 *boot_srcp; // 20 + const u8 *boot_endp; // 24 const u8 *masterp; u8 *reserved2[MULTIBOOT_NCHILD]; u32 system_work2[4]; diff --git a/include/menu.h b/include/menu.h index c8aafcb30..9a23401e0 100644 --- a/include/menu.h +++ b/include/menu.h @@ -15,4 +15,6 @@ struct MenuAction2 void (*func)(u8); }; +void box_print(u8, u8, u8, u8, const void *, s8, const u8 *); + #endif // GUARD_MENU_H diff --git a/include/text.h b/include/text.h index 73e6e5437..c61f6cc98 100644 --- a/include/text.h +++ b/include/text.h @@ -186,9 +186,9 @@ bool8 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter); bool8 TextPrinterWait(struct TextPrinter *textPrinter); void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex); u16 RenderText(struct TextPrinter *textPrinter); -u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing); +u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); -s32 GetStringWidth(u8 fontId, u8 *str, s16 letterSpacing); +u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str); u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y); u8 GetKeypadIconTileOffset(u8 keypadIconId); diff --git a/include/window.h b/include/window.h index 36a71a1e0..20e5fefa3 100644 --- a/include/window.h +++ b/include/window.h @@ -30,7 +30,7 @@ struct Window u8 *tileData; }; -bool16 InitWindows(struct WindowTemplate *templates); +bool16 InitWindows(const struct WindowTemplate *templates); u16 AddWindow(const struct WindowTemplate *template); int AddWindowWithoutTileMap(struct WindowTemplate *template); void RemoveWindow(u8 windowId); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index bafefaf7a..58e50e509 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -1,13 +1,16 @@ // Includes #include "global.h" -#include "multiboot.h" #include "gpu_regs.h" +#include "multiboot.h" +#include "malloc.h" +#include "bg.h" #include "main.h" #include "sprite.h" #include "task.h" #include "unknown_task.h" -#include "malloc.h" +#include "window.h" +#include "menu.h" #include "m4a.h" // Static type declarations @@ -26,7 +29,7 @@ extern berryfix_t *gUnknown_030012B8; // Static ROM declarations static void sub_81BF3DC(void); -void sub_81BF5A4(void); +static void sub_81BF5A4(void); u32 sub_81BF7A4(u8); // .rodata @@ -35,6 +38,14 @@ extern const u8 gUnknown_089A6550[0xC0]; extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34]; extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; +extern const u8 gUnknown_08617E78[]; +extern const u8 gUnknown_08617E8D[]; +extern const u8 gUnknown_08617E9B[]; +extern const struct BgTemplate gUnknown_08618108[2]; +extern const struct WindowTemplate gUnknown_08618110[7]; +extern const u16 gUnknown_08618138[16]; +extern const u8 gUnknown_08618158[3]; +extern const u8 gUnknown_0861815B[3]; // .text @@ -121,3 +132,258 @@ static void sub_81BF3DC(void) break; } } + +#ifdef NONMATCHING +static void sub_81BF5A4(void) +{ + s32 width; + + SetGpuReg(REG_OFFSET_BG0CNT, 0x0000); + SetGpuReg(REG_OFFSET_BG1CNT, 0x0000); + SetGpuReg(REG_OFFSET_BG0HOFS, 0x0000); + SetGpuReg(REG_OFFSET_BG0VOFS, 0x0000); + SetGpuReg(REG_OFFSET_BG1HOFS, 0x0000); + SetGpuReg(REG_OFFSET_BG1VOFS, 0x0000); + SetGpuReg(REG_OFFSET_BLDCNT, 0x0000); + + DmaFill32(3, 0, VRAM, VRAM_SIZE); + DmaFill32(3, 0, OAM, OAM_SIZE); + DmaFill32(3, 0, PLTT, PLTT_SIZE); + ResetBgsAndClearDma3BusyFlags(0); + + InitBgsFromTemplates(0, gUnknown_08618108, ARRAY_COUNT(gUnknown_08618108)); + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + ChangeBgX(1, 0, 0); + ChangeBgY(1, 0, 0); + InitWindows(gUnknown_08618110); + DeactivateAllTextPrinters(); + + DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); + FillWindowPixelBuffer(2, 0); + FillWindowPixelBuffer(3, 0); + FillWindowPixelBuffer(0, 0xAA); + +// This block is a meme among memes + width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2; + box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B); + width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78; + box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D); + width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2; + box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D); + width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2; + box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78); + + CopyWindowToVram(2, 2); + CopyWindowToVram(3, 2); + CopyWindowToVram(0, 2); +} +#else +__attribute__((naked)) static void sub_81BF5A4(void) +{ + asm(".syntax unified\n" + "\tpush {r4-r6,lr}\n" + "\tmov r6, r8\n" + "\tpush {r6}\n" + "\tsub sp, 0x10\n" + "\tmovs r0, 0x8\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0xA\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x10\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x12\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x14\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x16\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x50\n" + "\tmovs r1, 0\n" + "\tbl SetGpuReg\n" + "\tmovs r1, 0\n" + "\tstr r1, [sp, 0xC]\n" + "\tldr r4, =0x040000d4\n" + "\tadd r0, sp, 0xC\n" + "\tstr r0, [r4]\n" + "\tmovs r0, 0xC0\n" + "\tlsls r0, 19\n" + "\tstr r0, [r4, 0x4]\n" + "\tldr r0, =0x85006000\n" + "\tstr r0, [r4, 0x8]\n" + "\tldr r0, [r4, 0x8]\n" + "\tstr r1, [sp, 0xC]\n" + "\tadd r0, sp, 0xC\n" + "\tstr r0, [r4]\n" + "\tmovs r0, 0xE0\n" + "\tlsls r0, 19\n" + "\tstr r0, [r4, 0x4]\n" + "\tldr r2, =0x85000100\n" + "\tstr r2, [r4, 0x8]\n" + "\tldr r0, [r4, 0x8]\n" + "\tstr r1, [sp, 0xC]\n" + "\tadd r0, sp, 0xC\n" + "\tstr r0, [r4]\n" + "\tmovs r0, 0xA0\n" + "\tlsls r0, 19\n" + "\tstr r0, [r4, 0x4]\n" + "\tstr r2, [r4, 0x8]\n" + "\tldr r0, [r4, 0x8]\n" + "\tmovs r0, 0\n" + "\tbl ResetBgsAndClearDma3BusyFlags\n" + "\tldr r1, =gUnknown_08618108\n" + "\tmovs r0, 0\n" + "\tmovs r2, 0x2\n" + "\tbl InitBgsFromTemplates\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0\n" + "\tmovs r2, 0\n" + "\tbl ChangeBgX\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0\n" + "\tmovs r2, 0\n" + "\tbl ChangeBgY\n" + "\tmovs r0, 0x1\n" + "\tmovs r1, 0\n" + "\tmovs r2, 0\n" + "\tbl ChangeBgX\n" + "\tmovs r0, 0x1\n" + "\tmovs r1, 0\n" + "\tmovs r2, 0\n" + "\tbl ChangeBgY\n" + "\tldr r0, =gUnknown_08618110\n" + "\tbl InitWindows\n" + "\tbl DeactivateAllTextPrinters\n" + "\tldr r0, =gUnknown_08618138\n" + "\tstr r0, [r4]\n" + "\tldr r0, =0x050001e0\n" + "\tstr r0, [r4, 0x4]\n" + "\tldr r0, =0x84000008\n" + "\tstr r0, [r4, 0x8]\n" + "\tldr r0, [r4, 0x8]\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0x40\n" + "\tbl SetGpuReg\n" + "\tmovs r0, 0x2\n" + "\tmovs r1, 0\n" + "\tbl FillWindowPixelBuffer\n" + "\tmovs r0, 0x3\n" + "\tmovs r1, 0\n" + "\tbl FillWindowPixelBuffer\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0xAA\n" + "\tbl FillWindowPixelBuffer\n" + "\tldr r5, =gUnknown_08617E9B\n" + "\tmovs r0, 0\n" + "\tadds r1, r5, 0\n" + "\tmovs r2, 0\n" + "\tbl GetStringWidth\n" + "\tadds r1, r0, 0\n" + "\tmovs r4, 0x78\n" + "\tsubs r0, r4, r1\n" + "\tlsrs r1, r0, 31\n" + "\tadds r0, r1\n" + "\tasrs r0, 1\n" + "\tlsls r2, r0, 24\n" + "\tlsrs r2, 24\n" + "\tldr r6, =gUnknown_0861815B\n" + "\tstr r6, [sp]\n" + "\tmovs r0, 0x1\n" + "\tnegs r0, r0\n" + "\tmov r8, r0\n" + "\tstr r0, [sp, 0x4]\n" + "\tstr r5, [sp, 0x8]\n" + "\tmovs r0, 0x2\n" + "\tmovs r1, 0\n" + "\tmovs r3, 0x3\n" + "\tbl box_print\n" + "\tldr r5, =gUnknown_08617E8D\n" + "\tmovs r0, 0\n" + "\tadds r1, r5, 0\n" + "\tmovs r2, 0\n" + "\tbl GetStringWidth\n" + "\tadds r1, r0, 0\n" + "\tsubs r4, r1\n" + "\tlsrs r0, r4, 31\n" + "\tadds r4, r0\n" + "\tasrs r4, 1\n" + "\tadds r0, r4, 0\n" + "\tadds r0, 0x78\n" + "\tlsls r2, r0, 24\n" + "\tlsrs r2, 24\n" + "\tstr r6, [sp]\n" + "\tmov r0, r8\n" + "\tstr r0, [sp, 0x4]\n" + "\tstr r5, [sp, 0x8]\n" + "\tmovs r0, 0x2\n" + "\tmovs r1, 0\n" + "\tmovs r3, 0x3\n" + "\tbl box_print\n" + "\tmovs r0, 0\n" + "\tadds r1, r5, 0\n" + "\tmovs r2, 0\n" + "\tbl GetStringWidth\n" + "\tadds r1, r0, 0\n" + "\tmovs r0, 0x70\n" + "\tsubs r0, r1\n" + "\tlsrs r1, r0, 31\n" + "\tadds r0, r1\n" + "\tasrs r0, 1\n" + "\tlsls r2, r0, 24\n" + "\tlsrs r2, 24\n" + "\tstr r6, [sp]\n" + "\tmov r0, r8\n" + "\tstr r0, [sp, 0x4]\n" + "\tstr r5, [sp, 0x8]\n" + "\tmovs r0, 0x3\n" + "\tmovs r1, 0\n" + "\tmovs r3, 0\n" + "\tbl box_print\n" + "\tldr r4, =gUnknown_08617E78\n" + "\tmovs r0, 0x1\n" + "\tadds r1, r4, 0\n" + "\tmovs r2, 0\n" + "\tbl GetStringWidth\n" + "\tadds r1, r0, 0\n" + "\tmovs r0, 0xD0\n" + "\tsubs r0, r1\n" + "\tlsrs r1, r0, 31\n" + "\tadds r0, r1\n" + "\tasrs r0, 1\n" + "\tlsls r2, r0, 24\n" + "\tlsrs r2, 24\n" + "\tldr r0, =gUnknown_08618158\n" + "\tstr r0, [sp]\n" + "\tmov r0, r8\n" + "\tstr r0, [sp, 0x4]\n" + "\tstr r4, [sp, 0x8]\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0x1\n" + "\tmovs r3, 0x2\n" + "\tbl box_print\n" + "\tmovs r0, 0x2\n" + "\tmovs r1, 0x2\n" + "\tbl CopyWindowToVram\n" + "\tmovs r0, 0x3\n" + "\tmovs r1, 0x2\n" + "\tbl CopyWindowToVram\n" + "\tmovs r0, 0\n" + "\tmovs r1, 0x2\n" + "\tbl CopyWindowToVram\n" + "\tadd sp, 0x10\n" + "\tpop {r3}\n" + "\tmov r8, r3\n" + "\tpop {r4-r6}\n" + "\tpop {r0}\n" + "\tbx r0\n" + "\t.pool\n" + ".syntax divided"); +} +#endif diff --git a/src/bg.c b/src/bg.c index 8979eaecd..390a99d50 100644 --- a/src/bg.c +++ b/src/bg.c @@ -1,5 +1,6 @@ #include "global.h" #include "dma3.h" +#include "bg.h" #define DISPCNT_ALL_BG_AND_MODE_BITS 0x0F07 @@ -22,33 +23,23 @@ struct BgControl { u16 priority:2; u16 mosaic:1; u16 wraparound:1; - + u16 charBaseIndex:2; u16 mapBaseIndex:5; u16 paletteMode:1; - + u8 unknown_2; u8 unknown_3; } configs[4]; - - u16 bgVisibilityAndMode; -}; -struct BgTemplate { - u32 bg:2; - u32 charBaseIndex:2; - u32 mapBaseIndex:5; - u32 screenSize:2; - u32 paletteMode:1; - u32 priority:2; - u32 baseTile:10; + u16 bgVisibilityAndMode; }; struct BgConfig2 { u32 baseTile:10; u32 basePalette:4; u32 unk_3:18; - + void* tilemap; u32 bg_x; u32 bg_y; @@ -103,7 +94,7 @@ void ResetBgControlStructs(void) struct BgConfig* bgConfigs = &gGpuBgConfigs.configs[0]; struct BgConfig zeroedConfig = gZeroedBgControlStruct; int i; - + for (i = 0; i < 4; i++) { bgConfigs[i] = zeroedConfig; @@ -126,40 +117,40 @@ void SetBgControlAttributes(u8 bg, u8 charBaseIndex, u8 mapBaseIndex, u8 screenS { gGpuBgConfigs.configs[bg].charBaseIndex = charBaseIndex & 0x3; } - + if (mapBaseIndex != 0xFF) { gGpuBgConfigs.configs[bg].mapBaseIndex = mapBaseIndex & 0x1F; } - + if (screenSize != 0xFF) { gGpuBgConfigs.configs[bg].screenSize = screenSize & 0x3; } - + if (paletteMode != 0xFF) { gGpuBgConfigs.configs[bg].paletteMode = paletteMode; } - + if (priority != 0xFF) { gGpuBgConfigs.configs[bg].priority = priority & 0x3; } - + if (mosaic != 0xFF) { gGpuBgConfigs.configs[bg].mosaic = mosaic & 0x1; } - + if (wraparound != 0xFF) { gGpuBgConfigs.configs[bg].wraparound = wraparound; } - + gGpuBgConfigs.configs[bg].unknown_2 = 0; gGpuBgConfigs.configs[bg].unknown_3 = 0; - + gGpuBgConfigs.configs[bg].visible = 1; } } @@ -188,7 +179,7 @@ u16 GetBgControlAttribute(u8 bg, u8 attributeId) return gGpuBgConfigs.configs[bg].wraparound; } } - + return 0xFF; } @@ -196,7 +187,7 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode) { u16 offset; s8 cursor; - + if (IsInvalidBg(bg) == FALSE && gGpuBgConfigs.configs[bg].visible != FALSE) { switch (mode) @@ -211,11 +202,11 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode) cursor = -1; goto end; } - + offset = destOffset + offset; - + cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, 0); - + if (cursor == -1) { return -1; @@ -225,7 +216,7 @@ u8 LoadBgVram(u8 bg, void *src, u16 size, u16 destOffset, u8 mode) { return -1; } - + end: return cursor; } @@ -242,9 +233,9 @@ void ShowBgInternal(u8 bg) (gGpuBgConfigs.configs[bg].mapBaseIndex << 8) | (gGpuBgConfigs.configs[bg].wraparound << 13) | (gGpuBgConfigs.configs[bg].screenSize << 14); - + SetGpuReg((bg << 1) + 0x8, value); - + gGpuBgConfigs.bgVisibilityAndMode |= 1 << (bg + 8); gGpuBgConfigs.bgVisibilityAndMode &= DISPCNT_ALL_BG_AND_MODE_BITS; } @@ -273,7 +264,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, { struct BgAffineSrcData src; struct BgAffineDstData dest; - + switch (gGpuBgConfigs.bgVisibilityAndMode & 0x7) { case 1: @@ -288,7 +279,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, default: return; } - + src.texX = srcCenterX; src.texY = srcCenterY; src.scrX = dispCenterX; @@ -296,7 +287,7 @@ void SetBgAffineInternal(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, src.sx = scaleX; src.sy = scaleY; src.alpha = rotationAngle; - + BgAffineSet(&src, &dest, 1); SetGpuReg(REG_OFFSET_BG2PA, dest.pa); @@ -326,20 +317,20 @@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable) { int i; ResetBgs(); - + for (i = 0; i < 4; i++) { gDmaBusyBitfield[i] = 0; } - + gUnneededFireRedVariable = leftoverFireRedLeafGreenVariable; } -void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplates) +void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates) { int i; u8 bg; - + SetBgModeInternal(bgMode); ResetBgControlStructs(); @@ -355,11 +346,11 @@ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplat templates[i].priority, 0, 0); - + gGpuBgConfigs2[bg].baseTile = templates[i].baseTile; gGpuBgConfigs2[bg].basePalette = 0; gGpuBgConfigs2[bg].unk_3 = 0; - + gGpuBgConfigs2[bg].tilemap = NULL; gGpuBgConfigs2[bg].bg_x = 0; gGpuBgConfigs2[bg].bg_y = 0; @@ -367,10 +358,10 @@ void InitBgsFromTemplates(u8 bgMode, struct BgTemplate *templates, u8 numTemplat } } -void InitBgFromTemplate(struct BgTemplate *template) +void InitBgFromTemplate(const struct BgTemplate *template) { u8 bg = template->bg; - + if (bg < 4) { SetBgControlAttributes(bg, @@ -381,11 +372,11 @@ void InitBgFromTemplate(struct BgTemplate *template) template->priority, 0, 0); - + gGpuBgConfigs2[bg].baseTile = template->baseTile; gGpuBgConfigs2[bg].basePalette = 0; gGpuBgConfigs2[bg].unk_3 = 0; - + gGpuBgConfigs2[bg].tilemap = NULL; gGpuBgConfigs2[bg].bg_x = 0; gGpuBgConfigs2[bg].bg_y = 0; @@ -401,7 +392,7 @@ u16 LoadBgTiles(u8 bg, void* src, u16 size, u16 destOffset) { u16 tileOffset; u8 cursor; - + if (GetBgControlAttribute(bg, BG_CTRL_ATTR_PALETTEMODE) == 0) { tileOffset = (gGpuBgConfigs2[bg].baseTile + destOffset) * 0x20; @@ -410,37 +401,37 @@ u16 LoadBgTiles(u8 bg, void* src, u16 size, u16 destOffset) { tileOffset = (gGpuBgConfigs2[bg].baseTile + destOffset) * 0x40; } - + cursor = LoadBgVram(bg, src, size, tileOffset, DISPCNT_MODE_1); - + if (cursor == 0xFF) { return -1; } - + gDmaBusyBitfield[cursor / 0x20] |= (1 << (cursor % 0x20)); - + if (gUnneededFireRedVariable == 1) { DummiedOutFireRedLeafGreenTileAllocFunc(bg, tileOffset / 0x20, size / 0x20, 1); } - + return cursor; } u16 LoadBgTilemap(u8 bg, void *src, u16 size, u16 destOffset) { u8 cursor; - + cursor = LoadBgVram(bg, src, size, destOffset * 2, DISPCNT_MODE_2); - + if (cursor == 0xFF) { return -1; } - + gDmaBusyBitfield[cursor / 0x20] |= (1 << (cursor % 0x20)); - + return cursor; } @@ -448,12 +439,12 @@ u16 Unused_LoadBgPalette(u8 bg, void *src, u16 size, u16 destOffset) { u16 paletteOffset; s8 cursor; - + if (IsInvalidBg32(bg) == FALSE) { paletteOffset = (gGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2); cursor = RequestDma3Copy(src, (void*)(paletteOffset + BG_PLTT), size, 0); - + if (cursor == -1) { return -1; @@ -475,14 +466,14 @@ bool8 IsDma3ManagerBusyWithBgCopy(void) u8 mod; u8 div; s8 reqSpace; - + int i; - + for (i = 0; i < 0x80; i++) { div = i / 0x20; mod = i % 0x20; - + if ((gDmaBusyBitfield[div] & (1 << mod)) != FALSE) { reqSpace = CheckForSpaceForDma3Request(i); @@ -490,7 +481,7 @@ bool8 IsDma3ManagerBusyWithBgCopy(void) { return TRUE; } - + gDmaBusyBitfield[div] &= ~(1 << mod); } } @@ -634,12 +625,12 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op) u8 mode; u16 temp1; u16 temp2; - + if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0) { return -1; } - + switch (op) { case 0: @@ -653,9 +644,9 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op) gGpuBgConfigs2[bg].bg_x -= value; break; } - + mode = GetBgMode(); - + switch (bg) { case 0: @@ -695,7 +686,7 @@ u32 ChangeBgX(u8 bg, u32 value, u8 op) } break; } - + return gGpuBgConfigs2[bg].bg_x; } @@ -713,12 +704,12 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op) u8 mode; u16 temp1; u16 temp2; - + if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0) { return -1; } - + switch (op) { case 0: @@ -732,9 +723,9 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op) gGpuBgConfigs2[bg].bg_y -= value; break; } - + mode = GetBgMode(); - + switch (bg) { case 0: @@ -774,7 +765,7 @@ u32 ChangeBgY(u8 bg, u32 value, u8 op) } break; } - + return gGpuBgConfigs2[bg].bg_y; } @@ -783,12 +774,12 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) u8 mode; u16 temp1; u16 temp2; - + if (IsInvalidBg32(bg) != FALSE || GetBgControlAttribute(bg, BG_CTRL_ATTR_VISIBLE) == 0) { return -1; } - + switch (op) { case 0: @@ -802,9 +793,9 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) gGpuBgConfigs2[bg].bg_y -= value; break; } - + mode = GetBgMode(); - + switch (bg) { case 0: @@ -820,7 +811,7 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) { temp1 = gGpuBgConfigs2[2].bg_y >> 0x8; SetGpuReg_ForcedBlank(REG_OFFSET_BG2VOFS, temp1); - + } else { @@ -845,7 +836,7 @@ u32 ChangeBgY_ScreenOff(u8 bg, u32 value, u8 op) } break; } - + return gGpuBgConfigs2[bg].bg_y; } @@ -868,13 +859,13 @@ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2) u16 result; s16 test1; s16 test2; - + result = GetGpuReg(REG_OFFSET_MOSAIC); - + test1 = result & 0xF; test2 = (result >> 4) & 0xF; result &= 0xFF00; - + switch (a2) { case 0: @@ -929,12 +920,12 @@ u8 Unused_AdjustBgMosaic(u8 a1, u8 a2) } break; } - + result |= ((test2 << 0x4) & 0xF0); result |= (test1 & 0xF); - + SetGpuReg(REG_OFFSET_MOSAIC, result); - + return result; } @@ -981,7 +972,7 @@ void CopyToBgTilemapBuffer(u8 bg, void *src, u16 mode, u16 destOffset) void CopyBgTilemapBufferToVram(u8 bg) { u16 sizeToLoad; - + if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE) { switch (GetBgType(bg)) @@ -1006,7 +997,7 @@ void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u u16 destX16; u16 destY16; u16 mode; - + if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE) { switch (GetBgType(bg)) @@ -1047,11 +1038,11 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid u16 attribute; u16 mode; u16 mode2; - + void* srcCopy; u16 destX16; u16 destY16; - + if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE) { attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE); @@ -1336,7 +1327,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u16 x16; u16 y16; u16 mode; - + if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE) { switch (GetBgType(bg)) @@ -1375,10 +1366,10 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt u16 mode2; u16 attribute; u16 mode3; - + u16 x16; u16 y16; - + if (IsInvalidBg32(bg) == FALSE && IsTileMapOutsideWram(bg) == FALSE) { attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE); @@ -1414,9 +1405,9 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt u16 GetBgMetricTextMode(u8 bg, u8 whichMetric) { u8 attribute; - + attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE); - + switch (whichMetric) { case 0: @@ -1462,9 +1453,9 @@ u16 GetBgMetricTextMode(u8 bg, u8 whichMetric) u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric) { u8 attribute; - + attribute = GetBgControlAttribute(bg, BG_CTRL_ATTR_SCREENSIZE); - + switch (whichMetric) { case 0: @@ -1491,7 +1482,7 @@ u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 { x = x & (screenWidth - 1); y = y & (screenHeight - 1); - + switch (screenSize) { case 0: @@ -1526,7 +1517,7 @@ void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 pal test = ((*dest & 0xFC00) + (palette2 << 12)) | ((*src + tileOffset) & 0x3FF); break; } - + *dest = test; } #else @@ -1586,10 +1577,10 @@ _08002B3C:\n\ u32 GetBgType(u8 bg) { u8 mode; - + mode = GetBgMode(); - - + + switch (bg) { case 0: @@ -1621,7 +1612,7 @@ u32 GetBgType(u8 bg) } break; } - + return 0xFFFF; } diff --git a/src/multiboot.c b/src/multiboot.c index 80291ff46..7fd6df2d0 100644 --- a/src/multiboot.c +++ b/src/multiboot.c @@ -316,7 +316,7 @@ void MultiBootStartProbe(struct MultiBootParam *mp) mp->probe_count = 1; } -void MultiBootStartMaster(struct MultiBootParam *mp, u8 *srcp, int length, u8 palette_color, s8 palette_speed) +void MultiBootStartMaster(struct MultiBootParam *mp, const u8 *srcp, int length, u8 palette_color, s8 palette_speed) { int i = 0; diff --git a/src/text.c b/src/text.c index cad8326e3..aa4e201c0 100644 --- a/src/text.c +++ b/src/text.c @@ -2779,7 +2779,7 @@ _08005D6E:\n\ bx r1"); } -u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing) +u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) { int i; u8 width; @@ -2788,7 +2788,7 @@ u32 GetStringWidthFixedWidthFont(u8 *str, u8 fontId, u8 letterSpacing) u8 line; int strPos; u8 lineWidths[8]; - u8 *strLocal; + const u8 *strLocal; for (i = 0; i < 8; i++) { @@ -2883,7 +2883,7 @@ u32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32) return 0; } -s32 GetStringWidth(u8 fontId, u8 *str, s16 letterSpacing) +u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) { bool8 isJapanese; int minGlyphWidth; diff --git a/src/window.c b/src/window.c index 574b13aa0..164031bee 100644 --- a/src/window.c +++ b/src/window.c @@ -35,7 +35,7 @@ static void nullsub_8(void) } -bool16 InitWindows(struct WindowTemplate *templates) +bool16 InitWindows(const struct WindowTemplate *templates) { int i; void *bgTilemapBuffer; From 097a38f054c8a858917049fdf8973cb16a26c771 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 13:54:39 -0400 Subject: [PATCH 07/62] nonmatching sub_81BF7A4 --- asm/berry_fix_program.s | 36 --------------------- src/berry_fix_program.c | 69 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 37 deletions(-) diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index 83be5e453..50771f338 100755 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -5,42 +5,6 @@ .text - thumb_func_start sub_81BF7A4 -sub_81BF7A4: @ 81BF7A4 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gUnknown_030012B8 - ldr r0, [r5] - ldrb r0, [r0, 0x1] - cmp r0, r4 - bne _081BF7BC - adds r0, r4, 0 - b _081BF7DC - .pool -_081BF7BC: - cmp r0, 0x6 - bne _081BF7CC - adds r0, r4, 0 - bl sub_81BF7E8 - ldr r0, [r5] - strb r4, [r0, 0x1] - b _081BF7D6 -_081BF7CC: - bl sub_81BF8D8 - ldr r1, [r5] - movs r0, 0x6 - strb r0, [r1, 0x1] -_081BF7D6: - ldr r0, =gUnknown_030012B8 - ldr r0, [r0] - ldrb r0, [r0, 0x1] -_081BF7DC: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81BF7A4 - thumb_func_start sub_81BF7E8 sub_81BF7E8: @ 81BF7E8 push {r4-r6,lr} diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 58e50e509..b63bc12be 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -30,7 +30,9 @@ extern berryfix_t *gUnknown_030012B8; static void sub_81BF3DC(void); static void sub_81BF5A4(void); -u32 sub_81BF7A4(u8); +static int sub_81BF7A4(int); +void sub_81BF7E8(int); +void sub_81BF8D8(int); // .rodata @@ -179,6 +181,32 @@ static void sub_81BF5A4(void) CopyWindowToVram(3, 2); CopyWindowToVram(0, 2); } + +static int sub_81BF7A4(int checkval) +{ + int retval; + + retval = gUnknown_030012B8->unk1; + if (retval == checkval) + { + retval = checkval; + } + else + { + if (retval == 6) + { + sub_81BF7E8(checkval); + gUnknown_030012B8->unk1 = checkval; + } + else + { + sub_81BF8D8(gUnknown_030012B8->unk1); + gUnknown_030012B8->unk1 = 6; + } + retval = gUnknown_030012B8->unk1; + } + return retval; +} #else __attribute__((naked)) static void sub_81BF5A4(void) { @@ -386,4 +414,43 @@ __attribute__((naked)) static void sub_81BF5A4(void) "\t.pool\n" ".syntax divided"); } + +__attribute__((naked)) static int sub_81BF7A4(int checkval) +{ + asm(".syntax unified\n" + "\tpush {r4,r5,lr}\n" + "\tadds r4, r0, 0\n" + "\tldr r5, =gUnknown_030012B8\n" + "\tldr r0, [r5]\n" + "\tldrb r0, [r0, 0x1]\n" + "\tcmp r0, r4\n" + "\tbne _081BF7BC\n" + "\tadds r0, r4, 0\n" + "\tb _081BF7DC\n" + "\t.pool\n" + "_081BF7BC:\n" + "\tcmp r0, 0x6\n" + "\tbne _081BF7CC\n" + "\tadds r0, r4, 0\n" + "\tbl sub_81BF7E8\n" + "\tldr r0, [r5]\n" + "\tstrb r4, [r0, 0x1]\n" + "\tb _081BF7D6\n" + "_081BF7CC:\n" + "\tbl sub_81BF8D8\n" + "\tldr r1, [r5]\n" + "\tmovs r0, 0x6\n" + "\tstrb r0, [r1, 0x1]\n" + "_081BF7D6:\n" + "\tldr r0, =gUnknown_030012B8\n" + "\tldr r0, [r0]\n" + "\tldrb r0, [r0, 0x1]\n" + "_081BF7DC:\n" + "\tpop {r4,r5}\n" + "\tpop {r1}\n" + "\tbx r1\n" + "\t.pool\n" + ".syntax divided"); +} #endif + From 39e6bdf094ac1b53109782c9b5b98c211bbe3149 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 14:04:00 -0400 Subject: [PATCH 08/62] sub_81BF7E8 --- asm/berry_fix_program.s | 96 ----------------------------------------- include/bg.h | 4 ++ src/berry_fix_program.c | 33 +++++++++++++- 3 files changed, 36 insertions(+), 97 deletions(-) diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index 50771f338..3dfc07fa8 100755 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -5,102 +5,6 @@ .text - thumb_func_start sub_81BF7E8 -sub_81BF7E8: @ 81BF7E8 - push {r4-r6,lr} - sub sp, 0xC - adds r6, r0, 0 - movs r0, 0x20 - str r0, [sp] - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0x1 - movs r1, 0xAA - bl FillWindowPixelBuffer - ldr r0, =gUnknown_08618158 - str r0, [sp] - movs r0, 0x1 - negs r0, r0 - str r0, [sp, 0x4] - ldr r0, =gUnknown_08618160 - lsls r4, r6, 2 - adds r0, r4, r0 - ldr r0, [r0] - str r0, [sp, 0x8] - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - movs r3, 0 - bl box_print - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0x1 - movs r1, 0x2 - bl CopyWindowToVram - cmp r6, 0x5 - bhi _081BF87E - ldr r0, =_081BF850 - adds r0, r4, r0 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081BF850: - .4byte _081BF868 - .4byte _081BF870 - .4byte _081BF868 - .4byte _081BF868 - .4byte _081BF868 - .4byte _081BF878 -_081BF868: - movs r0, 0x2 - bl PutWindowTilemap - b _081BF87E -_081BF870: - movs r0, 0x3 - bl PutWindowTilemap - b _081BF87E -_081BF878: - movs r0, 0 - bl PutWindowTilemap -_081BF87E: - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r5, =gUnknown_08618178 - lsls r4, r6, 1 - adds r4, r6 - lsls r4, 2 - adds r0, r4, r5 - ldr r0, [r0] - ldr r1, =0x06004000 - bl LZ77UnCompVram - adds r0, r5, 0x4 - adds r0, r4, r0 - ldr r0, [r0] - ldr r1, =0x0600f800 - bl LZ77UnCompVram - adds r5, 0x8 - adds r4, r5 - ldr r0, [r4] - movs r1, 0xA0 - lsls r1, 19 - ldr r2, =0x04000040 - bl CpuSet - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81BF7E8 - thumb_func_start sub_81BF8D8 sub_81BF8D8: @ 81BF8D8 push {lr} diff --git a/include/bg.h b/include/bg.h index 7a0782c1b..444d3f3c2 100644 --- a/include/bg.h +++ b/include/bg.h @@ -15,5 +15,9 @@ void ResetBgsAndClearDma3BusyFlags(u32); void InitBgsFromTemplates(u8, const struct BgTemplate *, u8); u32 ChangeBgX(u8, u32, u8); u32 ChangeBgY(u8, u32, u8); +void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); +void ShowBg(u8); +void HideBg(u8); +void CopyBgTilemapBufferToVram(u8); #endif //GUARD_bg_H diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index b63bc12be..6f4c1c79e 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -31,7 +31,7 @@ extern berryfix_t *gUnknown_030012B8; static void sub_81BF3DC(void); static void sub_81BF5A4(void); static int sub_81BF7A4(int); -void sub_81BF7E8(int); +static void sub_81BF7E8(int); void sub_81BF8D8(int); // .rodata @@ -48,6 +48,8 @@ extern const struct WindowTemplate gUnknown_08618110[7]; extern const u16 gUnknown_08618138[16]; extern const u8 gUnknown_08618158[3]; extern const u8 gUnknown_0861815B[3]; +extern const u8 *const gUnknown_08618160[6]; +extern const u8 *const gUnknown_08618178[6][3]; // .text @@ -454,3 +456,32 @@ __attribute__((naked)) static int sub_81BF7A4(int checkval) } #endif +static void sub_81BF7E8(int scene) +{ + FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); + FillWindowPixelBuffer(1, 0xAA); + box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]); + PutWindowTilemap(1); + CopyWindowToVram(1, 2); + switch (scene) + { + case 0: + case 2: + case 3: + case 4: + PutWindowTilemap(2); + break; + case 1: + PutWindowTilemap(3); + break; + case 5: + PutWindowTilemap(0); + break; + } + CopyBgTilemapBufferToVram(0); + LZ77UnCompVram(gUnknown_08618178[scene][0], (void *)BG_CHAR_ADDR(1)); + LZ77UnCompVram(gUnknown_08618178[scene][1], (void *)BG_SCREEN_ADDR(31)); + CpuCopy32(gUnknown_08618178[scene][2], (void *)BG_PLTT, 0x100); + ShowBg(0); + ShowBg(1); +} From 0e2d84f24d22b6ec47e6adf32bc5f4d6b4c6289b Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 14:07:34 -0400 Subject: [PATCH 09/62] Remaining functions --- asm/berry_fix_program.s | 11 ----- ld_script.txt | 1 - src/berry_fix_program.c | 90 ++++++++++++----------------------------- 3 files changed, 26 insertions(+), 76 deletions(-) diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s index 3dfc07fa8..2428f2984 100755 --- a/asm/berry_fix_program.s +++ b/asm/berry_fix_program.s @@ -5,15 +5,4 @@ .text - thumb_func_start sub_81BF8D8 -sub_81BF8D8: @ 81BF8D8 - push {lr} - movs r0, 0 - bl HideBg - movs r0, 0x1 - bl HideBg - pop {r0} - bx r0 - thumb_func_end sub_81BF8D8 - .align 2, 0 @ Don't pad with nop. diff --git a/ld_script.txt b/ld_script.txt index b62125311..621df10f8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -260,7 +260,6 @@ SECTIONS { asm/fldeff_groundshake.o(.text); asm/fossil_specials.o(.text); src/berry_fix_program.o(.text); - asm/berry_fix_program.o(.text); asm/pokemon_summary_screen.o(.text); asm/pokenav.o(.text); asm/rayquaza_scene.o(.text); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 6f4c1c79e..e4ec0d8c4 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -32,7 +32,7 @@ static void sub_81BF3DC(void); static void sub_81BF5A4(void); static int sub_81BF7A4(int); static void sub_81BF7E8(int); -void sub_81BF8D8(int); +static void sub_81BF8D8(void); // .rodata @@ -184,31 +184,6 @@ static void sub_81BF5A4(void) CopyWindowToVram(0, 2); } -static int sub_81BF7A4(int checkval) -{ - int retval; - - retval = gUnknown_030012B8->unk1; - if (retval == checkval) - { - retval = checkval; - } - else - { - if (retval == 6) - { - sub_81BF7E8(checkval); - gUnknown_030012B8->unk1 = checkval; - } - else - { - sub_81BF8D8(gUnknown_030012B8->unk1); - gUnknown_030012B8->unk1 = 6; - } - retval = gUnknown_030012B8->unk1; - } - return retval; -} #else __attribute__((naked)) static void sub_81BF5A4(void) { @@ -416,46 +391,27 @@ __attribute__((naked)) static void sub_81BF5A4(void) "\t.pool\n" ".syntax divided"); } - -__attribute__((naked)) static int sub_81BF7A4(int checkval) -{ - asm(".syntax unified\n" - "\tpush {r4,r5,lr}\n" - "\tadds r4, r0, 0\n" - "\tldr r5, =gUnknown_030012B8\n" - "\tldr r0, [r5]\n" - "\tldrb r0, [r0, 0x1]\n" - "\tcmp r0, r4\n" - "\tbne _081BF7BC\n" - "\tadds r0, r4, 0\n" - "\tb _081BF7DC\n" - "\t.pool\n" - "_081BF7BC:\n" - "\tcmp r0, 0x6\n" - "\tbne _081BF7CC\n" - "\tadds r0, r4, 0\n" - "\tbl sub_81BF7E8\n" - "\tldr r0, [r5]\n" - "\tstrb r4, [r0, 0x1]\n" - "\tb _081BF7D6\n" - "_081BF7CC:\n" - "\tbl sub_81BF8D8\n" - "\tldr r1, [r5]\n" - "\tmovs r0, 0x6\n" - "\tstrb r0, [r1, 0x1]\n" - "_081BF7D6:\n" - "\tldr r0, =gUnknown_030012B8\n" - "\tldr r0, [r0]\n" - "\tldrb r0, [r0, 0x1]\n" - "_081BF7DC:\n" - "\tpop {r4,r5}\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.pool\n" - ".syntax divided"); -} #endif +static int sub_81BF7A4(int checkval) +{ + if (gUnknown_030012B8->unk1 == checkval) + { + return checkval; + } + if (gUnknown_030012B8->unk1 == 6) + { + sub_81BF7E8(checkval); + gUnknown_030012B8->unk1 = checkval; + } + else + { + sub_81BF8D8(); + gUnknown_030012B8->unk1 = 6; + } + return gUnknown_030012B8->unk1; +} + static void sub_81BF7E8(int scene) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); @@ -485,3 +441,9 @@ static void sub_81BF7E8(int scene) ShowBg(0); ShowBg(1); } + +static void sub_81BF8D8() +{ + HideBg(0); + HideBg(1); +} From 810bfffd1242ebfd29fcc2db6fef19b34545ad0b Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 15:10:25 -0400 Subject: [PATCH 10/62] data decomp --- data/data_emerald2.s | 31 +--------- data/graphics.s | 58 +++++++++++++++++- data/text/move_descriptions.inc | 3 + get_diffs.py | 24 ++++++++ ld_script.txt | 2 + src/berry_fix_program.c | 103 ++++++++++++++++++++++++++++---- 6 files changed, 179 insertions(+), 42 deletions(-) create mode 100644 get_diffs.py diff --git a/data/data_emerald2.s b/data/data_emerald2.s index 7efcbbecf..ce7e2a6e3 100644 --- a/data/data_emerald2.s +++ b/data/data_emerald2.s @@ -34,36 +34,7 @@ gUnknown_08617E34:: @ 8617E34 gUnknown_08617E60:: @ 8617E60 .incbin "baserom.gba", 0x617e60, 0x18 -gUnknown_08617E78:: @ 8617E78 - .incbin "baserom.gba", 0x617e78, 0x15 - -gUnknown_08617E8D:: @ 8617E8D - .incbin "baserom.gba", 0x617e8d, 0xe - -gUnknown_08617E9B:: @ 8617E9B - .incbin "baserom.gba", 0x617e9b, 0x26d - -gUnknown_08618108:: @ 8618108 - .incbin "baserom.gba", 0x618108, 0x8 - -gUnknown_08618110:: @ 8618110 - .incbin "baserom.gba", 0x618110, 0x28 - -gUnknown_08618138:: @ 8618138 - .incbin "baserom.gba", 0x618138, 0x20 - -gUnknown_08618158:: @ 8618158 - .incbin "baserom.gba", 0x618158, 0x3 - -gUnknown_0861815B:: @ 861815B - .incbin "baserom.gba", 0x61815b, 0x5 - -gUnknown_08618160:: @ 8618160 - .incbin "baserom.gba", 0x618160, 0x18 - -gUnknown_08618178:: @ 8618178 - .incbin "baserom.gba", 0x618178, 0x49 - + .section .rodata.2 @ 86181C1 .include "data/text/move_descriptions.inc" diff --git a/data/graphics.s b/data/graphics.s index bf080fd95..1be6d1a07 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -953,7 +953,7 @@ gUnknown_08DD4BF0:: @ 8DD4BF0 gUnknown_08DD4C4C:: @ 8DD4C4C .incbin "baserom.gba", 0xdd4c4c, 0xac - + .align 2 gUnknown_08DD4CF8:: @ 8DD4CF8 .incbin "graphics/interface/unk_change_case.4bpp.lz" @@ -988,7 +988,61 @@ gUnknown_08DD7300:: @ 8DD7300 .incbin "baserom.gba", 0xdd7300, 0x60 gUnknown_08DD7360:: @ 8DD7360 - .incbin "baserom.gba", 0xdd7360, 0x4084 + .incbin "baserom.gba", 0xdd7360, 0x1420 + +gUnknown_08DD8780:: @ 8DD8780 + .incbin "baserom.gba", 0xdd8780, 0x40 + +gUnknown_08DD87C0:: @ 8DD87C0 + .incbin "baserom.gba", 0xdd87c0, 0x720 + +gUnknown_08DD8EE0:: @ 8DD8EE0 + .incbin "baserom.gba", 0xdd8ee0, 0x1a0 + +gUnknown_08DD9080:: @ 8DD9080 + .incbin "baserom.gba", 0xdd9080, 0x60 + +gUnknown_08DD90E0:: @ 8DD90E0 + .incbin "baserom.gba", 0xdd90e0, 0x638 + +gUnknown_08DD9718:: @ 8DD9718 + .incbin "baserom.gba", 0xdd9718, 0x15c + +gUnknown_08DD9874:: @ 8DD9874 + .incbin "baserom.gba", 0xdd9874, 0x40 + +gUnknown_08DD98B4:: @ 8DD98B4 + .incbin "baserom.gba", 0xdd98b4, 0x5a4 + +gUnknown_08DD9E58:: @ 8DD9E58 + .incbin "baserom.gba", 0xdd9e58, 0x194 + +gUnknown_08DD9FEC:: @ 8DD9FEC + .incbin "baserom.gba", 0xdd9fec, 0x40 + +gUnknown_08DDA02C:: @ 8DDA02C + .incbin "baserom.gba", 0xdda02c, 0x610 + +gUnknown_08DDA63C:: @ 8DDA63C + .incbin "baserom.gba", 0xdda63c, 0x1c4 + +gUnknown_08DDA800:: @ 8DDA800 + .incbin "baserom.gba", 0xdda800, 0x40 + +gUnknown_08DDA840:: @ 8DDA840 + .incbin "baserom.gba", 0xdda840, 0x600 + +gUnknown_08DDAE40:: @ 8DDAE40 + .incbin "baserom.gba", 0xddae40, 0x1a0 + +gUnknown_08DDAFE0:: @ 8DDAFE0 + .incbin "baserom.gba", 0xddafe0, 0x40 + +gUnknown_08DDB020:: @ 8DDB020 + .incbin "baserom.gba", 0xddb020, 0x2a4 + +gUnknown_08DDB2C4:: @ 8DDB2C4 + .incbin "baserom.gba", 0xddb2c4, 0x120 gUnknown_08DDB3E4:: @ 8DDB3E4 .incbin "baserom.gba", 0xddb3e4, 0x80 diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc index 454e49ae1..0f6b1adbf 100644 --- a/data/text/move_descriptions.inc +++ b/data/text/move_descriptions.inc @@ -1,3 +1,6 @@ +gNullMoveDescription:: @ 86181C0 + .string "$" + gPoundMoveDescription:: @ 86181C1 .string "Pounds the foe with\nforelegs or tail.$" diff --git a/get_diffs.py b/get_diffs.py new file mode 100644 index 000000000..d42ce7827 --- /dev/null +++ b/get_diffs.py @@ -0,0 +1,24 @@ +addrs = sorted([0xdd7360, + 0xdd87c0, + 0xdd8ee0, + 0xdd8780, + 0xdd90e0, + 0xdd9718, + 0xdd9080, + 0xdd98b4, + 0xdd9e58, + 0xdd9874, + 0xdda02c, + 0xdda63c, + 0xdd9fec, + 0xdda840, + 0xddae40, + 0xdda800, + 0xddb020, + 0xddb2c4, + 0xddafe0, + 0xddb3e4]) +for i, addr in enumerate(addrs[:-1]): + print 'gUnknown_08{0:06X}:: @ 8{0:06X}'.format(addr) + print '\t.incbin "baserom.gba", 0x{:06x}, 0x{:x}'.format(addr, addrs[i + 1] - addr) + print '' diff --git a/ld_script.txt b/ld_script.txt index 621df10f8..24356a435 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -379,6 +379,8 @@ SECTIONS { data/data_emerald.o(.rodata); data/battle_controller_player_partner.o(.rodata); data/data_emerald2.o(.rodata); + src/berry_fix_program.o(.rodata); + data/data_emerald2.o(.rodata.2); data/fonts.o(.rodata); data/mystery_event_msg.o(.rodata); src/m4a_tables.o(.rodata); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index e4ec0d8c4..fa13c7e1e 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -36,20 +36,103 @@ static void sub_81BF8D8(void); // .rodata +const u8 gUnknown_08617E78[] = _("Berry Program Update"); +const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire"); +const u8 gUnknown_08617E9B[] = _("Emerald"); + +const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button."); +const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again."); +const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears."); +const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable."); +const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen."); +const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again."); + +const struct BgTemplate gUnknown_08618108[] = { + { + 0, 0, 30, 0, 0, 0 + }, { + 1, 1, 31, 0, 0, 1 + } +}; + +const struct WindowTemplate gUnknown_08618110[] = { + {0, 2, 4, 26, 2, 15, 0x001}, + {0, 1, 11, 28, 8, 15, 0x035}, + {0, 0, 8, 30, 2, 15, 0x115}, + {0, 8, 0, 14, 2, 15, 0x151}, + {-1} +}; + +const u16 gUnknown_08618138[] = { + 0x7fff, 0x7fff, 0x318c, 0x675a, + 0x043c, 0x3aff, 0x0664, 0x4bd2, + 0x6546, 0x7b14, 0x7fff, 0x318c, + 0x675a, 0x0000, 0x0000, 0x0000 +}; + +const u8 gUnknown_08618158[] = {10, 11, 12}; +const u8 gUnknown_0861815B[] = { 0, 10, 13}; + +const u8 *const gUnknown_08618160[] = { + Unknown_08617F07, + Unknown_08617F97, + Unknown_08618020, + Unknown_08618092, + Unknown_086180D7, + Unknown_08617EA3 +}; + +extern const u8 gUnknown_08DD87C0[]; +extern const u8 gUnknown_08DD8EE0[]; +extern const u8 gUnknown_08DD8780[]; +extern const u8 gUnknown_08DD90E0[]; +extern const u8 gUnknown_08DD9718[]; +extern const u8 gUnknown_08DD9080[]; +extern const u8 gUnknown_08DD98B4[]; +extern const u8 gUnknown_08DD9E58[]; +extern const u8 gUnknown_08DD9874[]; +extern const u8 gUnknown_08DDA02C[]; +extern const u8 gUnknown_08DDA63C[]; +extern const u8 gUnknown_08DD9FEC[]; +extern const u8 gUnknown_08DDA840[]; +extern const u8 gUnknown_08DDAE40[]; +extern const u8 gUnknown_08DDA800[]; +extern const u8 gUnknown_08DDB020[]; +extern const u8 gUnknown_08DDB2C4[]; +extern const u8 gUnknown_08DDAFE0[]; + +const u8 *const gUnknown_08618178[][3] = { + { + gUnknown_08DD87C0, + gUnknown_08DD8EE0, + gUnknown_08DD8780 + }, { + gUnknown_08DD90E0, + gUnknown_08DD9718, + gUnknown_08DD9080 + }, { + gUnknown_08DD98B4, + gUnknown_08DD9E58, + gUnknown_08DD9874 + }, { + gUnknown_08DDA02C, + gUnknown_08DDA63C, + gUnknown_08DD9FEC + }, { + gUnknown_08DDA840, + gUnknown_08DDAE40, + gUnknown_08DDA800 + }, { + gUnknown_08DDB020, + gUnknown_08DDB2C4, + gUnknown_08DDAFE0 + }, +}; + extern const u8 gUnknown_089A6550[0xC0]; extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34]; extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; -extern const u8 gUnknown_08617E78[]; -extern const u8 gUnknown_08617E8D[]; -extern const u8 gUnknown_08617E9B[]; -extern const struct BgTemplate gUnknown_08618108[2]; -extern const struct WindowTemplate gUnknown_08618110[7]; -extern const u16 gUnknown_08618138[16]; -extern const u8 gUnknown_08618158[3]; -extern const u8 gUnknown_0861815B[3]; -extern const u8 *const gUnknown_08618160[6]; -extern const u8 *const gUnknown_08618178[6][3]; // .text From d48c4ab7a95c0b3cc59e96ca2bf30fdbc7ff1581 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Sep 2017 15:28:55 -0400 Subject: [PATCH 11/62] Slight cleanup and relabeling of functions --- asm/title_screen.s | 2 +- src/berry_fix_program.c | 136 ++++++++++++++++++++-------------------- sym_bss.txt | 5 +- 3 files changed, 71 insertions(+), 72 deletions(-) diff --git a/asm/title_screen.s b/asm/title_screen.s index 39247aef4..15037e80d 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1259,7 +1259,7 @@ c2_berry_program_update_screen_1: @ 80AAF28 cmp r0, 0 bne _080AAF3E bl m4aMPlayAllStop - ldr r0, =sub_81BF384 + ldr r0, =InitBerryFixProgram bl SetMainCallback2 _080AAF3E: pop {r0} diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index fa13c7e1e..931e92746 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -24,30 +24,30 @@ typedef struct { // Static RAM declarations -extern berryfix_t *gUnknown_030012B8; +static berryfix_t *berry_fix_mb_manager; // Static ROM declarations -static void sub_81BF3DC(void); -static void sub_81BF5A4(void); -static int sub_81BF7A4(int); -static void sub_81BF7E8(int); -static void sub_81BF8D8(void); +static void berry_fix_main(void); +static void berry_fix_gpu_set(void); +static int berry_fix_text_update(int); +static void berry_fix_text_print(int); +static void berry_fix_bg_hide(void); // .rodata -const u8 gUnknown_08617E78[] = _("Berry Program Update"); -const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire"); -const u8 gUnknown_08617E9B[] = _("Emerald"); +static const u8 gUnknown_08617E78[] = _("Berry Program Update"); +static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire"); +static const u8 gUnknown_08617E9B[] = _("Emerald"); -const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button."); -const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again."); -const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears."); -const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable."); -const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen."); -const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again."); +static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button."); +static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again."); +static const u8 Unknown_08617F97[] = _("Please turn on the power of POKéMON\nRuby/Sapphire while holding START and\nSELECT simultaneously. Then, ensure\nthe picture above appears."); +static const u8 Unknown_08618020[] = _("Transmitting. Please wait.\n{COLOR RED}{SHADOW LIGHT_RED}Please do not turn off the power or\nunplug the Game Boy Advance Game\nLink Cable."); +static const u8 Unknown_08618092[] = _("Please follow the instructions on your\nPOKéMON Ruby/Sapphire screen."); +static const u8 Unknown_086180D7[] = _("Transmission failure.\n{COLOR RED}{SHADOW LIGHT_RED}Please try again."); -const struct BgTemplate gUnknown_08618108[] = { +static const struct BgTemplate gUnknown_08618108[] = { { 0, 0, 30, 0, 0, 0 }, { @@ -55,7 +55,7 @@ const struct BgTemplate gUnknown_08618108[] = { } }; -const struct WindowTemplate gUnknown_08618110[] = { +static const struct WindowTemplate gUnknown_08618110[] = { {0, 2, 4, 26, 2, 15, 0x001}, {0, 1, 11, 28, 8, 15, 0x035}, {0, 0, 8, 30, 2, 15, 0x115}, @@ -63,17 +63,17 @@ const struct WindowTemplate gUnknown_08618110[] = { {-1} }; -const u16 gUnknown_08618138[] = { +static const u16 gUnknown_08618138[] = { 0x7fff, 0x7fff, 0x318c, 0x675a, 0x043c, 0x3aff, 0x0664, 0x4bd2, 0x6546, 0x7b14, 0x7fff, 0x318c, 0x675a, 0x0000, 0x0000, 0x0000 }; -const u8 gUnknown_08618158[] = {10, 11, 12}; -const u8 gUnknown_0861815B[] = { 0, 10, 13}; +static const u8 gUnknown_08618158[] = {10, 11, 12}; +static const u8 gUnknown_0861815B[] = { 0, 10, 13}; -const u8 *const gUnknown_08618160[] = { +static const u8 *const gUnknown_08618160[] = { Unknown_08617F07, Unknown_08617F97, Unknown_08618020, @@ -101,7 +101,7 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u8 gUnknown_08DDAFE0[]; -const u8 *const gUnknown_08618178[][3] = { +static const u8 *const gUnknown_08618178[][3] = { { gUnknown_08DD87C0, gUnknown_08DD8EE0, @@ -136,7 +136,7 @@ extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; // .text -void sub_81BF384(void) +void InitBerryFixProgram(void) { DisableInterrupts(0xFFFF); EnableInterrupts(0x0001); @@ -146,82 +146,82 @@ void sub_81BF384(void) ResetTasks(); remove_some_task(); SetGpuReg(REG_OFFSET_DISPCNT, 0x0000); - gUnknown_030012B8 = AllocZeroed(0x50); - gUnknown_030012B8->state = 0; - gUnknown_030012B8->unk1 = 6; - SetMainCallback2(sub_81BF3DC); + berry_fix_mb_manager = AllocZeroed(0x50); + berry_fix_mb_manager->state = 0; + berry_fix_mb_manager->unk1 = 6; + SetMainCallback2(berry_fix_main); } -static void sub_81BF3DC(void) +static void berry_fix_main(void) { - switch (gUnknown_030012B8->state) + switch (berry_fix_mb_manager->state) { case 0: - sub_81BF5A4(); - gUnknown_030012B8->state = 1; + berry_fix_gpu_set(); + berry_fix_mb_manager->state = 1; break; case 1: - if (sub_81BF7A4(5) == 5 && (gMain.newKeys & A_BUTTON)) + if (berry_fix_text_update(5) == 5 && (gMain.newKeys & A_BUTTON)) { - gUnknown_030012B8->state = 2; + berry_fix_mb_manager->state = 2; } break; case 2: - if (sub_81BF7A4(0) == 0 && (gMain.newKeys & A_BUTTON)) + if (berry_fix_text_update(0) == 0 && (gMain.newKeys & A_BUTTON)) { - gUnknown_030012B8->state = 3; + berry_fix_mb_manager->state = 3; } break; case 3: - if (sub_81BF7A4(1) == 1) + if (berry_fix_text_update(1) == 1) { - gUnknown_030012B8->mb.masterp = gUnknown_089A6550; - gUnknown_030012B8->mb.server_type = 0; - MultiBootInit(&gUnknown_030012B8->mb); - gUnknown_030012B8->unk2 = 0; - gUnknown_030012B8->state = 4; + berry_fix_mb_manager->mb.masterp = gUnknown_089A6550; + berry_fix_mb_manager->mb.server_type = 0; + MultiBootInit(&berry_fix_mb_manager->mb); + berry_fix_mb_manager->unk2 = 0; + berry_fix_mb_manager->state = 4; } break; case 4: - MultiBootMain(&gUnknown_030012B8->mb); - if (gUnknown_030012B8->mb.probe_count != 0 || (!(gUnknown_030012B8->mb.response_bit & 2) || !(gUnknown_030012B8->mb.client_bit & 2))) + MultiBootMain(&berry_fix_mb_manager->mb); + if (berry_fix_mb_manager->mb.probe_count != 0 || (!(berry_fix_mb_manager->mb.response_bit & 2) || !(berry_fix_mb_manager->mb.client_bit & 2))) { - gUnknown_030012B8->unk2 = 0; + berry_fix_mb_manager->unk2 = 0; } - else if (++ gUnknown_030012B8->unk2 > 180) + else if (++ berry_fix_mb_manager->unk2 > 180) { - MultiBootStartMaster(&gUnknown_030012B8->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1); - gUnknown_030012B8->state = 5; + MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1); + berry_fix_mb_manager->state = 5; } break; case 5: - if (sub_81BF7A4(2) == 2) { - MultiBootMain(&gUnknown_030012B8->mb); - if (MultiBootCheckComplete(&gUnknown_030012B8->mb)) { - gUnknown_030012B8->state = 6; + if (berry_fix_text_update(2) == 2) { + MultiBootMain(&berry_fix_mb_manager->mb); + if (MultiBootCheckComplete(&berry_fix_mb_manager->mb)) { + berry_fix_mb_manager->state = 6; } - else if (!(gUnknown_030012B8->mb.client_bit & 2)) { - gUnknown_030012B8->state = 7; + else if (!(berry_fix_mb_manager->mb.client_bit & 2)) { + berry_fix_mb_manager->state = 7; } } break; case 6: - if (sub_81BF7A4(3) == 3 && gMain.newKeys & A_BUTTON) + if (berry_fix_text_update(3) == 3 && gMain.newKeys & A_BUTTON) { DoSoftReset(); } break; case 7: - if (sub_81BF7A4(4) == 4 && gMain.newKeys & A_BUTTON) + if (berry_fix_text_update(4) == 4 && gMain.newKeys & A_BUTTON) { - gUnknown_030012B8->state = 1; + berry_fix_mb_manager->state = 1; } break; } } #ifdef NONMATCHING -static void sub_81BF5A4(void) +static void berry_fix_gpu_set(void) { s32 width; @@ -268,7 +268,7 @@ static void sub_81BF5A4(void) } #else -__attribute__((naked)) static void sub_81BF5A4(void) +__attribute__((naked)) static void berry_fix_gpu_set(void) { asm(".syntax unified\n" "\tpush {r4-r6,lr}\n" @@ -476,26 +476,26 @@ __attribute__((naked)) static void sub_81BF5A4(void) } #endif -static int sub_81BF7A4(int checkval) +static int berry_fix_text_update(int checkval) { - if (gUnknown_030012B8->unk1 == checkval) + if (berry_fix_mb_manager->unk1 == checkval) { return checkval; } - if (gUnknown_030012B8->unk1 == 6) + if (berry_fix_mb_manager->unk1 == 6) { - sub_81BF7E8(checkval); - gUnknown_030012B8->unk1 = checkval; + berry_fix_text_print(checkval); + berry_fix_mb_manager->unk1 = checkval; } else { - sub_81BF8D8(); - gUnknown_030012B8->unk1 = 6; + berry_fix_bg_hide(); + berry_fix_mb_manager->unk1 = 6; } - return gUnknown_030012B8->unk1; + return berry_fix_mb_manager->unk1; } -static void sub_81BF7E8(int scene) +static void berry_fix_text_print(int scene) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); FillWindowPixelBuffer(1, 0xAA); @@ -525,7 +525,7 @@ static void sub_81BF7E8(int scene) ShowBg(1); } -static void sub_81BF8D8() +static void berry_fix_bg_hide() { HideBg(0); HideBg(1); diff --git a/sym_bss.txt b/sym_bss.txt index 070e7e5f9..ce2549850 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -129,7 +129,7 @@ gUnknown_03000E06: @ 3000E06 .space 0x2 .include "src/play_time.o" - + .align 2 gUnknown_03000E0C: @ 3000E0C @@ -376,8 +376,7 @@ gUnknown_03001298: @ 3001298 gUnknown_030012A8: @ 30012A8 .space 0x10 -gUnknown_030012B8: @ 30012B8 - .space 0x4 + .include "src/berry_fix_program.o" gUnknown_030012BC: @ 30012BC .space 0x4 From 9e96bd540ad3ae258ce7b2e8184cd162caa63c48 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 19:39:20 -0400 Subject: [PATCH 12/62] Battle Dome Cards BEGIN --- asm/battle_dome_cards.s | 27 --------------------------- ld_script.txt | 1 + src/battle_dome_cards.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 src/battle_dome_cards.c diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 8bb1971c4..525aa3d79 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,33 +6,6 @@ .text - thumb_func_start nullsub_122 -nullsub_122: @ 818CFC8 - bx lr - thumb_func_end nullsub_122 - - thumb_func_start dp13_810BB8C -dp13_810BB8C: @ 818CFCC - push {r4-r7,lr} - ldr r4, =gUnknown_0860B058 - ldr r3, =gUnknown_0203CD04 - movs r2, 0x7 -_0818CFD4: - adds r1, r3, 0 - adds r0, r4, 0 - ldm r0!, {r5-r7} - stm r1!, {r5-r7} - adds r3, 0xC - subs r2, 0x1 - cmp r2, 0 - bge _0818CFD4 - movs r0, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end dp13_810BB8C - thumb_func_start load_pokemon_image_TODO @ int load_pokemon_image_TODO(int species_num, unsigned int a2, u8 a3, void *a4, int a5, u8 a6) load_pokemon_image_TODO: @ 818CFF4 diff --git a/ld_script.txt b/ld_script.txt index 8a3f3e139..9ba5755c9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -239,6 +239,7 @@ SECTIONS { asm/recorded_battle.o(.text); asm/battle_controller_recorded_opponent.o(.text); asm/battle_controller_recorded_player.o(.text); + src/battle_dome_cards.o(.text); asm/battle_dome_cards.o(.text); asm/lilycove_lady.o(.text); asm/battle_frontier_1.o(.text); diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c new file mode 100644 index 000000000..0afad23f6 --- /dev/null +++ b/src/battle_dome_cards.c @@ -0,0 +1,37 @@ + +// Includes +#include "global.h" + +// Static type declarations + +struct BattleDomeCard { + u8 unk_00[12]; +}; + +// Static RAM declarations + +extern struct BattleDomeCard gUnknown_0203CD04[8]; + +// Static ROM declarations + +// .rodata + +extern const struct BattleDomeCard gUnknown_0860B058; + +// .text + +void nullsub_122(void) +{ + +} + +bool8 dp13_810BB8C(void) +{ + int i; + + for (i = 0; i < 8; i ++) + { + gUnknown_0203CD04[i] = gUnknown_0860B058; + } + return FALSE; +} From e033c721219f4412a0cb2cbbdcbec583ec60c87a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 20:00:46 -0400 Subject: [PATCH 13/62] load_pokemon_image_TODO --- asm/battle_dome_cards.s | 86 ----------------------------------------- src/battle_dome_cards.c | 52 ++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 87 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 525aa3d79..923dc997d 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,92 +6,6 @@ .text - thumb_func_start load_pokemon_image_TODO -@ int load_pokemon_image_TODO(int species_num, unsigned int a2, u8 a3, void *a4, int a5, u8 a6) -load_pokemon_image_TODO: @ 818CFF4 - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r1, 0 - adds r5, r3, 0 - ldr r3, [sp, 0x18] - ldr r1, [sp, 0x1C] - lsls r0, 16 - lsrs r4, r0, 16 - adds r7, r4, 0 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsls r1, 24 - lsrs r1, 24 - adds r0, r1, 0 - cmp r3, 0 - bne _0818D068 - cmp r2, 0 - beq _0818D034 - cmp r1, 0 - bne _0818D028 - lsls r0, r4, 3 - ldr r1, =gMonFrontPicTable - b _0818D03C - .pool -_0818D028: - lsls r0, r4, 3 - ldr r1, =gMonFrontPicTable - b _0818D054 - .pool -_0818D034: - cmp r0, 0 - bne _0818D050 - lsls r0, r4, 3 - ldr r1, =gMonBackPicTable -_0818D03C: - adds r0, r1 - str r2, [sp] - adds r1, r5, 0 - adds r2, r4, 0 - adds r3, r6, 0 - bl LoadSpecialPokePic - b _0818D08E - .pool -_0818D050: - lsls r0, r4, 3 - ldr r1, =gMonBackPicTable -_0818D054: - adds r0, r1 - str r2, [sp] - adds r1, r5, 0 - adds r2, r4, 0 - adds r3, r6, 0 - bl LoadSpecialPokePic_DontHandleDeoxys - b _0818D08E - .pool -_0818D068: - cmp r2, 0 - beq _0818D080 - lsls r0, r4, 3 - ldr r1, =gTrainerFrontPicTable - adds r0, r1 - adds r1, r5, 0 - adds r2, r4, 0 - bl DecompressPicFromTable - b _0818D08E - .pool -_0818D080: - lsls r0, r7, 3 - ldr r1, =gTrainerBackPicTable - adds r0, r1 - adds r1, r5, 0 - adds r2, r7, 0 - bl DecompressPicFromTable -_0818D08E: - movs r0, 0 - add sp, 0x4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end load_pokemon_image_TODO - thumb_func_start sub_818D09C sub_818D09C: @ 818D09C push {r4,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 0afad23f6..6ceb929ad 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -1,6 +1,15 @@ // Includes #include "global.h" +#include "sprite.h" +#include "species.h" +#include "pokemon.h" +#include "decompress.h" + +extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES]; +extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; +extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; +extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; // Static type declarations @@ -20,7 +29,7 @@ extern const struct BattleDomeCard gUnknown_0860B058; // .text -void nullsub_122(void) +void nullsub_122(struct Sprite *sprite) { } @@ -35,3 +44,44 @@ bool8 dp13_810BB8C(void) } return FALSE; } + +bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys) +{ + if (!isTrainer) + { + if (isFrontPic) + { + if (!ignoreDeoxys) + { + LoadSpecialPokePic(&gMonFrontPicTable[species], dest, species, personality, isFrontPic); + } + else + { + LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species], dest, species, personality, isFrontPic); + } + } + else + { + if (!ignoreDeoxys) + { + LoadSpecialPokePic(&gMonBackPicTable[species], dest, species, personality, isFrontPic); + } + else + { + LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species], dest, species, personality, isFrontPic); + } + } + } + else + { + if (isFrontPic) + { + DecompressPicFromTable(&gTrainerFrontPicTable[species], dest, species); + } + else + { + DecompressPicFromTable(&gTrainerBackPicTable[species], dest, species); + } + } + return FALSE; +} From 7de2140b868a77ea99e4965b06602af9d7de2926 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 21:26:11 -0400 Subject: [PATCH 14/62] sub_818D0C4 --- asm/battle_dome_cards.s | 109 ---------------------------------------- src/battle_dome_cards.c | 43 ++++++++++++++-- 2 files changed, 40 insertions(+), 112 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 923dc997d..1e0db8e71 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,115 +6,6 @@ .text - thumb_func_start sub_818D09C -sub_818D09C: @ 818D09C - push {r4,lr} - sub sp, 0x8 - ldr r4, [sp, 0x10] - lsls r0, 16 - lsrs r0, 16 - lsls r2, 24 - lsrs r2, 24 - lsls r4, 24 - lsrs r4, 24 - str r4, [sp] - movs r4, 0 - str r4, [sp, 0x4] - bl load_pokemon_image_TODO - lsls r0, 16 - lsrs r0, 16 - add sp, 0x8 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_818D09C - - thumb_func_start sub_818D0C4 -sub_818D0C4: @ 818D0C4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r1, 0 - mov r8, r2 - ldr r1, [sp, 0x18] - ldr r2, [sp, 0x1C] - lsls r0, 16 - lsrs r4, r0, 16 - adds r6, r4, 0 - lsls r3, 24 - lsrs r5, r3, 24 - mov r12, r5 - lsls r1, 16 - lsrs r3, r1, 16 - adds r1, r3, 0 - lsls r2, 24 - cmp r2, 0 - bne _0818D128 - ldr r0, =0x0000ffff - cmp r3, r0 - bne _0818D110 - ldr r2, =gUnknown_0203CCEC - ldrh r1, [r2, 0x2] - adds r0, r3, 0 - orrs r0, r1 - strh r0, [r2, 0x2] - adds r0, r4, 0 - adds r1, r7, 0 - mov r2, r8 - bl species_and_otid_get_pal - lsls r1, r5, 20 - b _0818D144 - .pool -_0818D110: - ldr r0, =gUnknown_0203CCEC - strh r3, [r0, 0x2] - adds r0, r4, 0 - adds r1, r7, 0 - mov r2, r8 - bl sub_806E7CC - bl LoadCompressedObjectPalette - b _0818D16E - .pool -_0818D128: - ldr r0, =0x0000ffff - cmp r3, r0 - bne _0818D160 - ldr r2, =gUnknown_0203CCEC - ldrh r1, [r2, 0x2] - adds r0, r3, 0 - orrs r0, r1 - strh r0, [r2, 0x2] - ldr r1, =gTrainerFrontPicPaletteTable - lsls r0, r4, 3 - adds r0, r1 - ldr r0, [r0] - mov r2, r12 - lsls r1, r2, 20 -_0818D144: - movs r2, 0x80 - lsls r2, 17 - adds r1, r2 - lsrs r1, 16 - movs r2, 0x20 - bl LoadCompressedPalette - b _0818D16E - .pool -_0818D160: - ldr r0, =gUnknown_0203CCEC - strh r1, [r0, 0x2] - lsls r0, r6, 3 - ldr r1, =gTrainerFrontPicPaletteTable - adds r0, r1 - bl LoadCompressedObjectPalette -_0818D16E: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818D0C4 - thumb_func_start sub_818D180 sub_818D180: @ 818D180 push {r4,r5,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 6ceb929ad..085afeb0c 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -3,13 +3,14 @@ #include "global.h" #include "sprite.h" #include "species.h" -#include "pokemon.h" +#include "palette.h" #include "decompress.h" extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; +extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; // Static type declarations @@ -20,6 +21,7 @@ struct BattleDomeCard { // Static RAM declarations extern struct BattleDomeCard gUnknown_0203CD04[8]; +extern struct SpriteTemplate gUnknown_0203CCEC; // Static ROM declarations @@ -34,7 +36,7 @@ void nullsub_122(struct Sprite *sprite) } -bool8 dp13_810BB8C(void) +bool16 dp13_810BB8C(void) { int i; @@ -45,7 +47,7 @@ bool8 dp13_810BB8C(void) return FALSE; } -bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys) +bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys) { if (!isTrainer) { @@ -85,3 +87,38 @@ bool8 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, vo } return FALSE; } + +bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer) +{ + return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE); +} + +void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) +{ + if (!isTrainer) + { + if (paletteTag == 0xFFFF) + { + gUnknown_0203CCEC.paletteTag |= 0xFFFF; + LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20); + } + else + { + gUnknown_0203CCEC.paletteTag = paletteTag; + LoadCompressedObjectPalette(sub_806E7CC(species, otId, personality)); + } + } + else + { + if (paletteTag == 0xFFFF) + { + gUnknown_0203CCEC.paletteTag |= 0xFFFF; + LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20); + } + else + { + gUnknown_0203CCEC.paletteTag = paletteTag; + LoadCompressedObjectPalette(&gTrainerFrontPicPaletteTable[species]); + } + } +} From 16b0b386be02390ab847a68b279f51aea54c3a95 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 21:28:28 -0400 Subject: [PATCH 15/62] sub_818D180 --- asm/battle_dome_cards.s | 33 --------------------------------- src/battle_dome_cards.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 1e0db8e71..774872c65 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,39 +6,6 @@ .text - thumb_func_start sub_818D180 -sub_818D180: @ 818D180 - push {r4,r5,lr} - adds r5, r1, 0 - ldr r1, [sp, 0xC] - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r4, r3, 24 - lsls r1, 24 - cmp r1, 0 - bne _0818D1A4 - adds r1, r5, 0 - bl species_and_otid_get_pal - lsls r1, r4, 4 - movs r2, 0x20 - bl LoadCompressedPalette - b _0818D1B4 -_0818D1A4: - ldr r1, =gTrainerFrontPicPaletteTable - lsls r0, 3 - adds r0, r1 - ldr r0, [r0] - lsls r1, r4, 4 - movs r2, 0x20 - bl LoadCompressedPalette -_0818D1B4: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818D180 - thumb_func_start uns_builder_assign_animtable1 uns_builder_assign_animtable1: @ 818D1C0 push {lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 085afeb0c..810ee82eb 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -122,3 +122,15 @@ void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 pal } } } + +void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer) +{ + if (!isTrainer) + { + LoadCompressedPalette(species_and_otid_get_pal(species, otId, personality), paletteSlot * 0x10, 0x20); + } + else + { + LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20); + } +} From 8aeb5ea3017dfb7ea9fd8b8f1ef6bc9d4a0fbba9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 21:31:28 -0400 Subject: [PATCH 16/62] uns_builder_assign_animtable1 --- asm/battle_dome_cards.s | 22 ---------------------- src/battle_dome_cards.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 774872c65..73948ea94 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -6,28 +6,6 @@ .text - thumb_func_start uns_builder_assign_animtable1 -uns_builder_assign_animtable1: @ 818D1C0 - push {lr} - lsls r0, 24 - cmp r0, 0 - bne _0818D1D8 - ldr r1, =gUnknown_0203CCEC - ldr r0, =gUnknown_082FF70C - str r0, [r1, 0x8] - b _0818D1E0 - .pool -_0818D1D8: - ldr r0, =gUnknown_0203CCEC - ldr r1, =gUnknown_0830536C - ldr r1, [r1] - str r1, [r0, 0x8] -_0818D1E0: - pop {r0} - bx r0 - .pool - thumb_func_end uns_builder_assign_animtable1 - thumb_func_start oamt_spawn_poke_or_trainer_picture oamt_spawn_poke_or_trainer_picture: @ 818D1EC push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 810ee82eb..e92773a1b 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -11,6 +11,8 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; +extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const *const gUnknown_0830536C[]; // Static type declarations @@ -134,3 +136,15 @@ void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 i LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20); } } + +void uns_builder_assign_animtable1(bool8 isTrainer) +{ + if (!isTrainer) + { + gUnknown_0203CCEC.anims = gUnknown_082FF70C; + } + else + { + gUnknown_0203CCEC.anims = gUnknown_0830536C[0]; + } +} From c593b51dc538961641d4f679a5b0366295179c5e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 22:23:13 -0400 Subject: [PATCH 17/62] oamt_spawn_poke_or_trainer_picture --- asm/battle_dome_cards.s | 192 ---------------------------------------- src/battle_dome_cards.c | 68 +++++++++++++- 2 files changed, 67 insertions(+), 193 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 73948ea94..4de32086c 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,198 +5,6 @@ .text - - thumb_func_start oamt_spawn_poke_or_trainer_picture -oamt_spawn_poke_or_trainer_picture: @ 818D1EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x30 - str r1, [sp, 0xC] - str r2, [sp, 0x10] - ldr r1, [sp, 0x50] - ldr r2, [sp, 0x54] - ldr r4, [sp, 0x58] - ldr r5, [sp, 0x5C] - ldr r6, [sp, 0x60] - ldr r7, [sp, 0x64] - mov r8, r7 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x8] - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x14] - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x18] - lsls r2, 16 - lsrs r2, 16 - str r2, [sp, 0x1C] - lsls r4, 24 - lsrs r4, 24 - str r4, [sp, 0x20] - lsls r5, 16 - lsrs r5, 16 - mov r10, r5 - lsls r6, 24 - lsrs r6, 24 - mov r9, r6 - mov r0, r8 - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r1, =gUnknown_0203CD04 - ldrb r0, [r1, 0xB] - cmp r0, 0 - beq _0818D25C -_0818D244: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bhi _0818D25C - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0xB] - cmp r0, 0 - bne _0818D244 -_0818D25C: - cmp r4, 0x8 - beq _0818D280 - movs r0, 0x80 - lsls r0, 6 - bl Alloc - adds r7, r0, 0 - cmp r7, 0 - beq _0818D280 - movs r0, 0x20 - bl Alloc - mov r8, r0 - cmp r0, 0 - bne _0818D28C - adds r0, r7, 0 - bl Free -_0818D280: - ldr r0, =0x0000ffff - b _0818D356 - .pool -_0818D28C: - mov r1, r9 - str r1, [sp] - str r5, [sp, 0x4] - ldr r0, [sp, 0x8] - ldr r1, [sp, 0x10] - ldr r2, [sp, 0x14] - adds r3, r7, 0 - bl load_pokemon_image_TODO - lsls r0, 16 - cmp r0, 0 - bne _0818D280 - lsls r2, r4, 1 - str r2, [sp, 0x2C] - ldr r5, =gUnknown_0203CCEC - ldr r0, =gUnknown_0860B064 - mov r12, r0 - ldr r1, [sp, 0x18] - lsls r1, 16 - str r1, [sp, 0x24] - ldr r2, [sp, 0x1C] - lsls r2, 16 - str r2, [sp, 0x28] - movs r3, 0x80 - lsls r3, 4 - mov r0, r8 - adds r1, r7, 0 - adds r6, r3, 0 - movs r2, 0x3 -_0818D2C6: - str r1, [r0] - strh r3, [r0, 0x4] - adds r0, 0x8 - adds r1, r6 - subs r2, 0x1 - cmp r2, 0 - bge _0818D2C6 - ldr r0, =0x0000ffff - strh r0, [r5] - mov r0, r12 - str r0, [r5, 0x4] - mov r0, r9 - bl uns_builder_assign_animtable1 - mov r1, r8 - str r1, [r5, 0xC] - ldr r0, =gDummySpriteAffineAnimTable - str r0, [r5, 0x10] - ldr r0, =nullsub_122 - str r0, [r5, 0x14] - mov r2, r10 - str r2, [sp] - mov r0, r9 - str r0, [sp, 0x4] - ldr r0, [sp, 0x8] - ldr r1, [sp, 0xC] - ldr r2, [sp, 0x10] - ldr r3, [sp, 0x20] - bl sub_818D0C4 - ldr r2, [sp, 0x24] - asrs r1, r2, 16 - ldr r0, [sp, 0x28] - asrs r2, r0, 16 - adds r0, r5, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - adds r6, r2, 0 - ldr r0, =0x0000ffff - cmp r10, r0 - bne _0818D336 - ldr r0, =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldr r2, [sp, 0x20] - lsls r3, r2, 4 - ldrb r2, [r1, 0x5] - movs r0, 0xF - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x5] -_0818D336: - ldr r1, =gUnknown_0203CD04 - ldr r2, [sp, 0x2C] - adds r0, r2, r4 - lsls r0, 2 - adds r2, r0, r1 - str r7, [r2] - adds r1, 0x4 - adds r0, r1 - mov r7, r8 - str r7, [r0] - mov r0, r10 - strh r0, [r2, 0x8] - strb r6, [r2, 0xA] - movs r0, 0x1 - strb r0, [r2, 0xB] - adds r0, r6, 0 -_0818D356: - add sp, 0x30 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end oamt_spawn_poke_or_trainer_picture - thumb_func_start sub_818D384 sub_818D384: @ 818D384 push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index e92773a1b..764e3dfe4 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -2,6 +2,7 @@ // Includes #include "global.h" #include "sprite.h" +#include "malloc.h" #include "species.h" #include "palette.h" #include "decompress.h" @@ -13,11 +14,16 @@ extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AnimCmd *const gUnknown_082FF70C[]; extern const union AnimCmd *const *const gUnknown_0830536C[]; +extern const struct OamData gUnknown_0860B064; // Static type declarations struct BattleDomeCard { - u8 unk_00[12]; + u8 *frames; + const struct SpriteFrameImage *images; + u16 paletteTag; + u8 spriteId; + u8 active; }; // Static RAM declarations @@ -148,3 +154,63 @@ void uns_builder_assign_animtable1(bool8 isTrainer) gUnknown_0203CCEC.anims = gUnknown_0830536C[0]; } } + +u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys) +{ + u8 i; + u8 *framePics; + struct SpriteFrameImage *images; + int j; + u8 spriteId; + + for (i = 0; i < 8; i ++) + { + if (!gUnknown_0203CD04[i].active) + { + break; + } + } + if (i == 8) + { + return 0xFFFF; + } + framePics = Alloc(4 * 0x800); + if (!framePics) + { + return 0xFFFF; + } + images = Alloc(4 * sizeof(struct SpriteFrameImage)); + if (!images) + { + Free(framePics); + return 0xFFFF; + } + if (load_pokemon_image_TODO(species, personality, isFrontPic, framePics, isTrainer, ignoreDeoxys)) + { + // debug trap? + return 0xFFFF; + } + for (j = 0; j < 4; j ++) + { + images[j].data = framePics + 0x800 * j; + images[j].size = 0x800; + } + gUnknown_0203CCEC.tileTag = 0xFFFF; + gUnknown_0203CCEC.oam = &gUnknown_0860B064; + uns_builder_assign_animtable1(isTrainer); + gUnknown_0203CCEC.images = images; + gUnknown_0203CCEC.affineAnims = gDummySpriteAffineAnimTable; + gUnknown_0203CCEC.callback = nullsub_122; + sub_818D0C4(species, otId, personality, paletteSlot, paletteTag, isTrainer); + spriteId = CreateSprite(&gUnknown_0203CCEC, x, y, 0); + if (paletteTag == 0xFFFF) + { + gSprites[spriteId].oam.paletteNum = paletteSlot; + } + gUnknown_0203CD04[i].frames = framePics; + gUnknown_0203CD04[i].images = images; + gUnknown_0203CD04[i].paletteTag = paletteTag; + gUnknown_0203CD04[i].spriteId = spriteId; + gUnknown_0203CD04[i].active = TRUE; + return spriteId; +} From 52dc68aa89a4e568673f1155542856504bd3da3f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 22:41:54 -0400 Subject: [PATCH 18/62] sub_818D3E4 --- asm/battle_dome_cards.s | 269 ---------------------------------------- src/battle_dome_cards.c | 92 ++++++++++++++ 2 files changed, 92 insertions(+), 269 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 4de32086c..397bfe88f 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,275 +5,6 @@ .text - thumb_func_start sub_818D384 -sub_818D384: @ 818D384 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - ldr r4, [sp, 0x34] - ldr r5, [sp, 0x38] - ldr r6, [sp, 0x3C] - ldr r7, [sp, 0x40] - mov r8, r7 - ldr r7, [sp, 0x44] - mov r9, r7 - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r6, 24 - lsrs r6, 24 - mov r7, r8 - lsls r7, 16 - lsrs r7, 16 - mov r8, r7 - mov r7, r9 - lsls r7, 24 - lsrs r7, 24 - lsls r4, 16 - asrs r4, 16 - str r4, [sp] - lsls r5, 16 - asrs r5, 16 - str r5, [sp, 0x4] - str r6, [sp, 0x8] - mov r4, r8 - str r4, [sp, 0xC] - str r7, [sp, 0x10] - movs r4, 0 - str r4, [sp, 0x14] - bl oamt_spawn_poke_or_trainer_picture - lsls r0, 16 - lsrs r0, 16 - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818D384 - - thumb_func_start sub_818D3E4 -sub_818D3E4: @ 818D3E4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x2C - str r1, [sp, 0x8] - str r2, [sp, 0xC] - ldr r1, [sp, 0x4C] - ldr r2, [sp, 0x50] - ldr r4, [sp, 0x54] - ldr r5, [sp, 0x58] - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - lsls r3, 24 - lsrs r6, r3, 24 - lsls r1, 16 - lsrs r1, 16 - str r1, [sp, 0x10] - lsls r2, 16 - lsrs r2, 16 - str r2, [sp, 0x14] - lsls r4, 24 - lsrs r4, 24 - str r4, [sp, 0x18] - lsls r5, 16 - lsrs r5, 16 - str r5, [sp, 0x1C] - movs r5, 0 - ldr r1, =gUnknown_0203CD04 - ldrb r0, [r1, 0xB] - cmp r0, 0 - beq _0818D440 -_0818D428: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x7 - bhi _0818D440 - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0xB] - cmp r0, 0 - bne _0818D428 -_0818D440: - cmp r5, 0x8 - beq _0818D47C - movs r0, 0x80 - lsls r0, 6 - bl Alloc - adds r7, r0, 0 - cmp r7, 0 - beq _0818D47C - movs r0, 0x80 - ands r0, r6 - cmp r0, 0 - beq _0818D468 - movs r0, 0x7F - ands r6, r0 - movs r0, 0x3 - mov r9, r0 - b _0818D46A - .pool -_0818D468: - mov r9, r6 -_0818D46A: - movs r0, 0x20 - bl Alloc - mov r8, r0 - cmp r0, 0 - bne _0818D484 - adds r0, r7, 0 - bl Free -_0818D47C: - ldr r0, =0x0000ffff - b _0818D588 - .pool -_0818D484: - movs r0, 0 - str r0, [sp] - str r0, [sp, 0x4] - mov r0, r10 - ldr r1, [sp, 0xC] - adds r2, r6, 0 - adds r3, r7, 0 - bl load_pokemon_image_TODO - lsls r0, 16 - cmp r0, 0 - bne _0818D47C - lsls r1, r5, 1 - str r1, [sp, 0x28] - ldr r4, =gUnknown_0203CCEC - mov r2, r10 - lsls r2, 2 - mov r12, r2 - ldr r0, [sp, 0x10] - lsls r0, 16 - str r0, [sp, 0x20] - ldr r1, [sp, 0x14] - lsls r1, 16 - str r1, [sp, 0x24] - movs r3, 0x80 - lsls r3, 4 - mov r0, r8 - adds r1, r7, 0 - adds r6, r3, 0 - movs r2, 0x3 -_0818D4C0: - str r1, [r0] - strh r3, [r0, 0x4] - adds r0, 0x8 - adds r1, r6 - subs r2, 0x1 - cmp r2, 0 - bge _0818D4C0 - ldr r0, =0x0000ffff - strh r0, [r4] - ldr r0, =gUnknown_08309AAC - add r0, r12 - ldr r0, [r0] - str r0, [r4, 0x8] - mov r2, r8 - str r2, [r4, 0xC] - mov r0, r9 - cmp r0, 0x1 - bne _0818D4F8 - ldr r0, =gUnknown_082FF694 - b _0818D500 - .pool -_0818D4F8: - mov r1, r9 - cmp r1, 0 - bne _0818D510 - ldr r0, =gUnknown_082FF618 -_0818D500: - str r0, [r4, 0x10] - ldr r0, =gUnknown_0860B06C - str r0, [r4, 0x4] - b _0818D518 - .pool -_0818D510: - ldr r0, =gUnknown_0860B064 - str r0, [r4, 0x4] - ldr r0, =gDummySpriteAffineAnimTable - str r0, [r4, 0x10] -_0818D518: - ldr r2, =nullsub_122 - str r2, [r4, 0x14] - ldr r0, [sp, 0x1C] - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - mov r0, r10 - ldr r1, [sp, 0x8] - ldr r2, [sp, 0xC] - ldr r3, [sp, 0x18] - bl sub_818D0C4 - ldr r2, [sp, 0x20] - asrs r1, r2, 16 - ldr r0, [sp, 0x24] - asrs r2, r0, 16 - adds r0, r4, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - adds r6, r2, 0 - ldr r0, =0x0000ffff - ldr r1, [sp, 0x1C] - cmp r1, r0 - bne _0818D566 - ldr r0, =gSprites - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldr r2, [sp, 0x18] - lsls r3, r2, 4 - ldrb r2, [r1, 0x5] - movs r0, 0xF - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x5] -_0818D566: - ldr r1, =gUnknown_0203CD04 - ldr r2, [sp, 0x28] - adds r0, r2, r5 - lsls r0, 2 - adds r2, r0, r1 - str r7, [r2] - adds r1, 0x4 - adds r0, r1 - mov r1, r8 - str r1, [r0] - mov r0, sp - ldrh r0, [r0, 0x1C] - strh r0, [r2, 0x8] - strb r6, [r2, 0xA] - movs r0, 0x1 - strb r0, [r2, 0xB] - adds r0, r6, 0 -_0818D588: - add sp, 0x2C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818D3E4 - thumb_func_start sub_818D5B0 sub_818D5B0: @ 818D5B0 push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 764e3dfe4..7eee245ee 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -15,6 +15,10 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const union AnimCmd *const gUnknown_082FF70C[]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const struct OamData gUnknown_0860B064; +extern const struct OamData gUnknown_0860B06C; +extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; +extern const union AffineAnimCmd *const gUnknown_082FF694[]; +extern const union AffineAnimCmd *const gUnknown_082FF618[]; // Static type declarations @@ -214,3 +218,91 @@ u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, b gUnknown_0203CD04[i].active = TRUE; return spriteId; } + +u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) +{ + return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, isTrainer, FALSE); +} + +u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag) +{ + u8 *framePics; + struct SpriteFrameImage *images; + int j; + u8 i; + u8 spriteId; + u8 flags2; + + for (i = 0; i < 8; i ++) + { + if (!gUnknown_0203CD04[i].active) + { + break; + } + } + if (i == 8) + { + return 0xFFFF; + } + framePics = Alloc(4 * 0x800); + if (!framePics) + { + return 0xFFFF; + } + if (flags & 0x80) + { + flags &= 0x7F; + flags2 = 3; + } + else + { + flags2 = flags; + } + images = Alloc(4 * sizeof(struct SpriteFrameImage)); + if (!images) + { + Free(framePics); + return 0xFFFF; + } + if (load_pokemon_image_TODO(species, personality, flags, framePics, FALSE, FALSE)) + { + // debug trap? + return 0xFFFF; + } + for (j = 0; j < 4; j ++) + { + images[j].data = framePics + 0x800 * j; + images[j].size = 0x800; + } + gUnknown_0203CCEC.tileTag = 0xFFFF; + gUnknown_0203CCEC.anims = gUnknown_08309AAC[species]; + gUnknown_0203CCEC.images = images; + if (flags2 == 0x01) + { + gUnknown_0203CCEC.affineAnims = gUnknown_082FF694; + gUnknown_0203CCEC.oam = &gUnknown_0860B06C; + } + else if (flags2 == 0x00) + { + gUnknown_0203CCEC.affineAnims = gUnknown_082FF618; + gUnknown_0203CCEC.oam = &gUnknown_0860B06C; + } + else + { + gUnknown_0203CCEC.oam = &gUnknown_0860B064; + gUnknown_0203CCEC.affineAnims = gDummySpriteAffineAnimTable; + } + gUnknown_0203CCEC.callback = nullsub_122; + sub_818D0C4(species, otId, personality, paletteSlot, paletteTag, FALSE); + spriteId = CreateSprite(&gUnknown_0203CCEC, x, y, 0); + if (paletteTag == 0xFFFF) + { + gSprites[spriteId].oam.paletteNum = paletteSlot; + } + gUnknown_0203CD04[i].frames = framePics; + gUnknown_0203CD04[i].images = images; + gUnknown_0203CD04[i].paletteTag = paletteTag; + gUnknown_0203CD04[i].spriteId = spriteId; + gUnknown_0203CD04[i].active = TRUE; + return spriteId; +} From 7e157f202703f75933302d509f8b2bf26cf40655 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Sep 2017 22:49:42 -0400 Subject: [PATCH 19/62] Decorate local EWRAM objects in battle_dome_cards.c as EWRAM --- src/battle_dome_cards.c | 10 +++++----- sym_ewram.txt | 6 +----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 7eee245ee..f27e1e4fa 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -12,13 +12,13 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpriteSheet gTrainerBackPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; +extern const union AffineAnimCmd *const gUnknown_082FF618[]; +extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AnimCmd *const gUnknown_082FF70C[]; +extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const struct OamData gUnknown_0860B064; extern const struct OamData gUnknown_0860B06C; -extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; -extern const union AffineAnimCmd *const gUnknown_082FF694[]; -extern const union AffineAnimCmd *const gUnknown_082FF618[]; // Static type declarations @@ -32,8 +32,8 @@ struct BattleDomeCard { // Static RAM declarations -extern struct BattleDomeCard gUnknown_0203CD04[8]; -extern struct SpriteTemplate gUnknown_0203CCEC; +static EWRAM_DATA struct SpriteTemplate gUnknown_0203CCEC = {}; +EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; // Static ROM declarations diff --git a/sym_ewram.txt b/sym_ewram.txt index a675fa4e2..cc63c342b 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1762,11 +1762,7 @@ gUnknown_0203CCDC: @ 203CCDC gUnknown_0203CCE8: @ 203CCE8 .space 0x4 -gUnknown_0203CCEC: @ 203CCEC - .space 0x18 - -gUnknown_0203CD04: @ 203CD04 - .space 0x60 + .include "src/battle_dome_cards.o" gUnknown_0203CD64: @ 203CD64 .space 0x4 From 6ef3f9dd50a0cb2d8695401d3740407fa73cde9c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:13:53 -0400 Subject: [PATCH 20/62] sub_818D5B0 --- asm/battle_dome_cards.s | 82 ----------------------------------------- src/battle_dome_cards.c | 32 +++++++++++++++- 2 files changed, 31 insertions(+), 83 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 397bfe88f..775007e9f 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,88 +5,6 @@ .text - thumb_func_start sub_818D5B0 -sub_818D5B0: @ 818D5B0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r4, r0, 16 - movs r2, 0 - ldr r0, =gUnknown_0203CD04 - ldrb r1, [r0, 0xA] - adds r3, r0, 0 - cmp r1, r4 - beq _0818D5E0 - adds r1, r3, 0 -_0818D5C8: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x7 - bhi _0818D5E0 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0xA] - cmp r0, r4 - bne _0818D5C8 -_0818D5E0: - cmp r2, 0x8 - bne _0818D5F0 - ldr r0, =0x0000ffff - b _0818D646 - .pool -_0818D5F0: - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r5, r0, r3 - ldr r1, [r5] - mov r8, r1 - adds r1, r3, 0x4 - adds r0, r1 - ldr r7, [r0] - ldrh r1, [r5, 0x8] - ldr r0, =0x0000ffff - lsls r6, r4, 4 - cmp r1, r0 - beq _0818D624 - ldr r1, =gSprites - adds r0, r6, r4 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x5] - lsrs r0, 4 - bl GetSpritePaletteTagByPaletteNum - lsls r0, 16 - lsrs r0, 16 - bl FreeSpritePaletteByTag -_0818D624: - adds r0, r6, r4 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl DestroySprite - mov r0, r8 - bl Free - adds r0, r7, 0 - bl Free - adds r1, r5, 0 - ldr r0, =gUnknown_0860B058 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - movs r0, 0 -_0818D646: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818D5B0 - thumb_func_start sub_818D65C sub_818D65C: @ 818D65C push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index f27e1e4fa..a01115a99 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -24,7 +24,7 @@ extern const struct OamData gUnknown_0860B06C; struct BattleDomeCard { u8 *frames; - const struct SpriteFrameImage *images; + struct SpriteFrameImage *images; u16 paletteTag; u8 spriteId; u8 active; @@ -306,3 +306,33 @@ u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, gUnknown_0203CD04[i].active = TRUE; return spriteId; } + +u16 sub_818D5B0(u16 spriteId) +{ + u8 i; + u8 *framePics; + struct SpriteFrameImage *images; + + for (i = 0; i < 8; i ++) + { + if (gUnknown_0203CD04[i].spriteId == spriteId) + { + break; + } + } + if (i == 8) + { + return 0xFFFF; + } + framePics = gUnknown_0203CD04[i].frames; + images = gUnknown_0203CD04[i].images; + if (gUnknown_0203CD04[i].paletteTag != 0xFFFF) + { + FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum)); + } + DestroySprite(&gSprites[spriteId]); + Free(framePics); + Free(images); + gUnknown_0203CD04[i] = gUnknown_0860B058; + return 0; +} From ee47fe93778f938ac99be89e24761a46b44b1816 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:22:43 -0400 Subject: [PATCH 21/62] sub_818D65C --- asm/battle_dome_cards.s | 58 ----------------------------------------- src/battle_dome_cards.c | 11 ++++++++ 2 files changed, 11 insertions(+), 58 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 775007e9f..7d9dd4eab 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,64 +5,6 @@ .text - thumb_func_start sub_818D65C -sub_818D65C: @ 818D65C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - mov r9, r1 - adds r7, r2, 0 - adds r4, r3, 0 - ldr r1, [sp, 0x20] - ldr r2, [sp, 0x24] - ldr r3, [sp, 0x28] - lsls r0, 16 - lsrs r5, r0, 16 - lsls r4, 24 - lsrs r4, 24 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r6, r3, 24 - adds r0, r2, 0 - movs r1, 0x7 - bl GetWindowAttribute - adds r3, r0, 0 - movs r0, 0 - str r0, [sp] - adds r0, r5, 0 - adds r1, r7, 0 - adds r2, r4, 0 - bl sub_818D09C - lsls r0, 16 - cmp r0, 0 - bne _0818D6B8 - str r6, [sp] - adds r0, r5, 0 - mov r1, r9 - adds r2, r7, 0 - mov r3, r8 - bl sub_818D180 - movs r0, 0 - b _0818D6BA -_0818D6B8: - ldr r0, =0x0000ffff -_0818D6BA: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818D65C - thumb_func_start sub_818D6CC sub_818D6CC: @ 818D6CC push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index a01115a99..b8f0c4ff8 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -2,6 +2,7 @@ // Includes #include "global.h" #include "sprite.h" +#include "window.h" #include "malloc.h" #include "species.h" #include "palette.h" @@ -336,3 +337,13 @@ u16 sub_818D5B0(u16 spriteId) gUnknown_0203CD04[i] = gUnknown_0860B058; return 0; } + +u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer) +{ + if (sub_818D09C(species, personality, isFrontPic, (void *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) + { + return 0xFFFF; + } + sub_818D180(species, otId, personality, paletteSlot, isTrainer); + return 0; +} From b2b6774efc5d6cd1bf9ca7f9c1c925dfd237428c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:32:49 -0400 Subject: [PATCH 22/62] sub_818D6CC --- asm/battle_dome_cards.s | 86 ----------------------------------------- src/battle_dome_cards.c | 21 ++++++++-- 2 files changed, 18 insertions(+), 89 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 7d9dd4eab..b04a27d3f 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,92 +5,6 @@ .text - thumb_func_start sub_818D6CC -sub_818D6CC: @ 818D6CC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x24 - str r1, [sp, 0x18] - str r2, [sp, 0x1C] - ldr r1, [sp, 0x44] - ldr r2, [sp, 0x48] - ldr r4, [sp, 0x4C] - ldr r5, [sp, 0x50] - ldr r6, [sp, 0x54] - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - lsls r3, 24 - lsrs r7, r3, 24 - lsls r1, 16 - lsrs r1, 16 - mov r10, r1 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - lsls r4, 24 - lsrs r4, 24 - str r4, [sp, 0x20] - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - movs r0, 0x80 - lsls r0, 6 - bl Alloc - adds r4, r0, 0 - cmp r4, 0 - beq _0818D762 - str r6, [sp] - mov r0, r9 - ldr r1, [sp, 0x1C] - adds r2, r7, 0 - adds r3, r4, 0 - bl sub_818D09C - lsls r0, 16 - cmp r0, 0 - bne _0818D762 - movs r0, 0x40 - str r0, [sp] - str r0, [sp, 0x4] - mov r1, r10 - str r1, [sp, 0x8] - mov r1, r8 - str r1, [sp, 0xC] - str r0, [sp, 0x10] - str r0, [sp, 0x14] - adds r0, r5, 0 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0 - bl BlitBitmapRectToWindow - str r6, [sp] - mov r0, r9 - ldr r1, [sp, 0x18] - ldr r2, [sp, 0x1C] - ldr r3, [sp, 0x20] - bl sub_818D180 - adds r0, r4, 0 - bl Free - movs r0, 0 - b _0818D764 -_0818D762: - ldr r0, =0x0000ffff -_0818D764: - add sp, 0x24 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818D6CC - thumb_func_start sub_818D778 sub_818D778: @ 818D778 push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index b8f0c4ff8..4b2e9f41c 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -60,7 +60,7 @@ bool16 dp13_810BB8C(void) return FALSE; } -bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer, bool8 ignoreDeoxys) +bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys) { if (!isTrainer) { @@ -101,7 +101,7 @@ bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, v return FALSE; } -bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, void *dest, bool8 isTrainer) +bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer) { return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE); } @@ -340,10 +340,25 @@ u16 sub_818D5B0(u16 spriteId) u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer) { - if (sub_818D09C(species, personality, isFrontPic, (void *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) + if (sub_818D09C(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { return 0xFFFF; } sub_818D180(species, otId, personality, paletteSlot, isTrainer); return 0; } + +u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer) +{ + u8 *framePics; + + framePics = Alloc(4 * 0x800); + if (framePics && !sub_818D09C(species, personality, isFrontPic, framePics, isTrainer)) + { + BlitBitmapRectToWindow(windowId, framePics, 0, 0, 0x40, 0x40, destX, destY, 0x40, 0x40); + sub_818D180(species, otId, personality, paletteSlot, isTrainer); + Free(framePics); + return 0; + } + return 0xFFFF; +} From 8634f722905247646305824afd62ebec60810212 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:35:27 -0400 Subject: [PATCH 23/62] sub_818D778 --- asm/battle_dome_cards.s | 51 ----------------------------------------- src/battle_dome_cards.c | 5 ++++ 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index b04a27d3f..712da90ad 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,57 +5,6 @@ .text - thumb_func_start sub_818D778 -sub_818D778: @ 818D778 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - ldr r4, [sp, 0x34] - ldr r5, [sp, 0x38] - ldr r6, [sp, 0x3C] - ldr r7, [sp, 0x40] - mov r8, r7 - ldr r7, [sp, 0x44] - mov r9, r7 - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r6, 24 - lsrs r6, 24 - mov r7, r8 - lsls r7, 16 - lsrs r7, 16 - mov r8, r7 - mov r7, r9 - lsls r7, 24 - lsrs r7, 24 - lsls r4, 16 - asrs r4, 16 - str r4, [sp] - lsls r5, 16 - asrs r5, 16 - str r5, [sp, 0x4] - str r6, [sp, 0x8] - mov r4, r8 - str r4, [sp, 0xC] - movs r4, 0 - str r4, [sp, 0x10] - str r7, [sp, 0x14] - bl oamt_spawn_poke_or_trainer_picture - lsls r0, 16 - lsrs r0, 16 - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818D778 - thumb_func_start sub_818D7D8 sub_818D7D8: @ 818D7D8 push {r4-r7,lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 4b2e9f41c..1e6a98810 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -362,3 +362,8 @@ u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 de } return 0xFFFF; } + +u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) +{ + return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys); +} From 057894f3c583f99b4c626181fc86cfc0744c2ea1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:36:45 -0400 Subject: [PATCH 24/62] sub_818D7D8 --- asm/battle_dome_cards.s | 39 --------------------------------------- src/battle_dome_cards.c | 5 +++++ 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 712da90ad..5819bc79c 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,45 +5,6 @@ .text - thumb_func_start sub_818D7D8 -sub_818D7D8: @ 818D7D8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - ldr r4, [sp, 0x2C] - ldr r5, [sp, 0x30] - ldr r6, [sp, 0x34] - ldr r7, [sp, 0x38] - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r6, 24 - lsrs r6, 24 - lsls r7, 16 - lsrs r7, 16 - lsls r4, 16 - asrs r4, 16 - str r4, [sp] - lsls r5, 16 - asrs r5, 16 - str r5, [sp, 0x4] - str r6, [sp, 0x8] - str r7, [sp, 0xC] - movs r4, 0 - str r4, [sp, 0x10] - bl sub_818D778 - lsls r0, 16 - lsrs r0, 16 - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818D7D8 - thumb_func_start sub_818D820 sub_818D820: @ 818D820 push {lr} diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 1e6a98810..7df33e403 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -367,3 +367,8 @@ u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, { return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys); } + +u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag) +{ + return sub_818D778(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE); +} From 63ff09e806b2f8bd38e50fec7aa7d63367060df4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 08:53:31 -0400 Subject: [PATCH 25/62] Nearly finished with battle_dome_cards --- asm/battle_dome_cards.s | 195 +--------------------------------------- src/battle_dome_cards.c | 50 +++++++++++ 2 files changed, 51 insertions(+), 194 deletions(-) diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index 5819bc79c..35657308a 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -5,199 +5,6 @@ .text - thumb_func_start sub_818D820 -sub_818D820: @ 818D820 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl sub_818D5B0 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_818D820 - - thumb_func_start sub_818D834 -sub_818D834: @ 818D834 - push {r4,r5,lr} - sub sp, 0xC - ldr r4, [sp, 0x18] - ldr r5, [sp, 0x1C] - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - str r4, [sp] - str r5, [sp, 0x4] - movs r4, 0 - str r4, [sp, 0x8] - bl sub_818D65C - lsls r0, 16 - lsrs r0, 16 - add sp, 0xC - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_818D834 - - thumb_func_start sub_818D864 -sub_818D864: @ 818D864 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x14 - ldr r4, [sp, 0x2C] - ldr r5, [sp, 0x30] - ldr r6, [sp, 0x34] - ldr r7, [sp, 0x38] - lsls r0, 16 - lsrs r0, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 24 - lsrs r6, 24 - lsls r7, 24 - lsrs r7, 24 - str r4, [sp] - str r5, [sp, 0x4] - str r6, [sp, 0x8] - str r7, [sp, 0xC] - movs r4, 0 - str r4, [sp, 0x10] - bl sub_818D6CC - lsls r0, 16 - lsrs r0, 16 - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818D864 - - thumb_func_start sub_818D8AC -sub_818D8AC: @ 818D8AC - push {r4,r5,lr} - sub sp, 0x14 - adds r5, r1, 0 - ldr r1, [sp, 0x20] - ldr r4, [sp, 0x24] - lsls r0, 16 - lsrs r0, 16 - lsls r5, 24 - lsrs r5, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r4, 16 - lsrs r4, 16 - lsls r2, 16 - asrs r2, 16 - str r2, [sp] - lsls r3, 16 - asrs r3, 16 - str r3, [sp, 0x4] - str r1, [sp, 0x8] - str r4, [sp, 0xC] - movs r1, 0x1 - str r1, [sp, 0x10] - movs r1, 0 - movs r2, 0 - adds r3, r5, 0 - bl sub_818D384 - lsls r0, 16 - lsrs r0, 16 - add sp, 0x14 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_818D8AC - - thumb_func_start sub_818D8F0 -sub_818D8F0: @ 818D8F0 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl sub_818D5B0 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_818D8F0 - - thumb_func_start sub_818D904 -sub_818D904: @ 818D904 - push {r4,lr} - sub sp, 0xC - adds r4, r1, 0 - lsls r0, 16 - lsrs r0, 16 - lsls r4, 24 - lsrs r4, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - str r2, [sp] - str r3, [sp, 0x4] - movs r1, 0x1 - str r1, [sp, 0x8] - movs r1, 0 - movs r2, 0 - adds r3, r4, 0 - bl sub_818D65C - lsls r0, 16 - lsrs r0, 16 - add sp, 0xC - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_818D904 - - thumb_func_start sub_818D938 -sub_818D938: @ 818D938 - push {r4,r5,lr} - sub sp, 0x14 - adds r5, r1, 0 - ldr r1, [sp, 0x20] - ldr r4, [sp, 0x24] - lsls r0, 16 - lsrs r0, 16 - lsls r5, 24 - lsrs r5, 24 - lsls r2, 16 - lsrs r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r1, 24 - lsrs r1, 24 - lsls r4, 24 - lsrs r4, 24 - str r2, [sp] - str r3, [sp, 0x4] - str r1, [sp, 0x8] - str r4, [sp, 0xC] - movs r1, 0x1 - str r1, [sp, 0x10] - movs r1, 0 - movs r2, 0 - adds r3, r5, 0 - bl sub_818D6CC - lsls r0, 16 - lsrs r0, 16 - add sp, 0x14 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_818D938 - thumb_func_start sub_818D97C sub_818D97C: @ 818D97C push {lr} @@ -223,5 +30,5 @@ _0818D9A2: bx r1 .pool thumb_func_end sub_818D97C - + .align 2, 0 @ Don't pad with nop. diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 7df33e403..280eac163 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -20,6 +20,7 @@ extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; extern const struct OamData gUnknown_0860B064; extern const struct OamData gUnknown_0860B06C; +extern const u8 gUnknown_0831F578[]; // Static type declarations @@ -372,3 +373,52 @@ u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, { return sub_818D778(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE); } + +u16 sub_818D820(u16 spriteId) +{ + return sub_818D5B0(spriteId); +} + +u16 sub_818D834(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId) +{ + return sub_818D65C(species, otId, personality, isFrontPic, paletteSlot, windowId, FALSE); +} + +u16 sub_818D864(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId) +{ + return sub_818D6CC(species, otId, personality, isFrontPic, destX, destY, paletteSlot, windowId, FALSE); +} + +u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag) +{ + return sub_818D384(species, 0, 0, isFrontPic, x, y, paletteSlot, paletteTag, TRUE); +} + +u16 sub_818D8F0(u16 spriteId) +{ + return sub_818D5B0(spriteId); +} + +u16 sub_818D904(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId) +{ + return sub_818D65C(species, 0, 0, isFrontPic, paletteSlot, windowId, TRUE); +} + +u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId) +{ + return sub_818D6CC(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE); +} + +//u8 sub_818D97C(u8 a0, u8 a1) +//{ +// u8 id; +// if (a1 == 1 && a0) +// { +// id = gUnknown_0831F578[0x3F]; +// } +// else +// { +// id = gUnknown_0831F578[0x3C]; +// } +// return id; +//} From bff89725ec31f87c296ec45f107f81dfe3cd54d6 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 09:46:17 -0400 Subject: [PATCH 26/62] Add battle_dome_cards header to expose symbols as needed --- asm/battle_dome_cards.s | 34 -------------------- data/data_emerald.s | 9 ------ include/battle_dome_cards.h | 13 ++++++++ ld_script.txt | 2 +- src/battle_dome_cards.c | 64 ++++++++++++++++++++----------------- 5 files changed, 49 insertions(+), 73 deletions(-) delete mode 100644 asm/battle_dome_cards.s create mode 100644 include/battle_dome_cards.h diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s deleted file mode 100644 index 35657308a..000000000 --- a/asm/battle_dome_cards.s +++ /dev/null @@ -1,34 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_818D97C -sub_818D97C: @ 818D97C - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - bne _0818D9A2 - cmp r0, 0 - beq _0818D99C - ldr r0, =gUnknown_0831F578 - adds r0, 0x3F - ldrb r0, [r0] - b _0818D9A2 - .pool -_0818D99C: - ldr r0, =gUnknown_0831F578 - adds r0, 0x3C - ldrb r0, [r0] -_0818D9A2: - pop {r1} - bx r1 - .pool - thumb_func_end sub_818D97C - - .align 2, 0 @ Don't pad with nop. diff --git a/data/data_emerald.s b/data/data_emerald.s index 54bda4a0e..88c57af8d 100644 --- a/data/data_emerald.s +++ b/data/data_emerald.s @@ -3,15 +3,6 @@ .section .rodata -gUnknown_0860B058:: @ 860B058 - .incbin "baserom.gba", 0x60b058, 0xc - -gUnknown_0860B064:: @ 860B064 - .incbin "baserom.gba", 0x60b064, 0x8 - -gUnknown_0860B06C:: @ 860B06C - .incbin "baserom.gba", 0x60b06c, 0x8 - gUnknown_0860B074:: @ 860B074 .incbin "baserom.gba", 0x60b074, 0xa diff --git a/include/battle_dome_cards.h b/include/battle_dome_cards.h new file mode 100644 index 000000000..a0696d156 --- /dev/null +++ b/include/battle_dome_cards.h @@ -0,0 +1,13 @@ +#ifndef GUARD_BATTLE_DOME_CARDS_H +#define GUARD_BATTLE_DOME_CARDS_H + +bool16 dp13_810BB8C(void); +u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); +u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); +u16 sub_818D820(u16 spriteId); +u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag); +u16 sub_818D8F0(u16 spriteId); +u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId); +u8 sub_818D97C(u8 a0, u8 a1); + +#endif //GUARD_BATTLE_DOME_CARDS_H diff --git a/ld_script.txt b/ld_script.txt index 9ba5755c9..8326fe76a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -240,7 +240,6 @@ SECTIONS { asm/battle_controller_recorded_opponent.o(.text); asm/battle_controller_recorded_player.o(.text); src/battle_dome_cards.o(.text); - asm/battle_dome_cards.o(.text); asm/lilycove_lady.o(.text); asm/battle_frontier_1.o(.text); asm/new_menu_helpers.o(.text); @@ -377,6 +376,7 @@ SECTIONS { data/data_860A4AC.o(.rodata); data/battle_controller_recorded_opponent.o(.rodata); data/battle_controller_recorded_player.o(.rodata); + src/battle_dome_cards.o(.rodata); data/data_emerald.o(.rodata); data/battle_controller_player_partner.o(.rodata); data/data_emerald2.o(.rodata); diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 280eac163..c0557ac70 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -7,6 +7,7 @@ #include "species.h" #include "palette.h" #include "decompress.h" +#include "battle_dome_cards.h" extern const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES]; extern const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES]; @@ -18,8 +19,6 @@ extern const union AffineAnimCmd *const gUnknown_082FF694[]; extern const union AnimCmd *const gUnknown_082FF70C[]; extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES]; extern const union AnimCmd *const *const gUnknown_0830536C[]; -extern const struct OamData gUnknown_0860B064; -extern const struct OamData gUnknown_0860B06C; extern const u8 gUnknown_0831F578[]; // Static type declarations @@ -35,17 +34,23 @@ struct BattleDomeCard { // Static RAM declarations static EWRAM_DATA struct SpriteTemplate gUnknown_0203CCEC = {}; -EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; +static EWRAM_DATA struct BattleDomeCard gUnknown_0203CD04[8] = {}; // Static ROM declarations // .rodata -extern const struct BattleDomeCard gUnknown_0860B058; +static const struct BattleDomeCard gUnknown_0860B058 = {}; +static const struct OamData gUnknown_0860B064 = { + .size = 3 +}; +static const struct OamData gUnknown_0860B06C = { + .affineMode = 1, .size = 3 +}; // .text -void nullsub_122(struct Sprite *sprite) +static void nullsub_122(struct Sprite *sprite) { } @@ -61,7 +66,7 @@ bool16 dp13_810BB8C(void) return FALSE; } -bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys) +static bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer, bool8 ignoreDeoxys) { if (!isTrainer) { @@ -102,12 +107,12 @@ bool16 load_pokemon_image_TODO(u16 species, u32 personality, bool8 isFrontPic, u return FALSE; } -bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer) +static bool16 sub_818D09C(u16 species, u32 personality, bool8 isFrontPic, u8 *dest, bool8 isTrainer) { return load_pokemon_image_TODO(species, personality, isFrontPic, dest, isTrainer, FALSE); } -void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) +static void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) { if (!isTrainer) { @@ -137,7 +142,7 @@ void sub_818D0C4(u16 species, u32 otId, u32 personality, u8 paletteSlot, u16 pal } } -void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer) +static void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer) { if (!isTrainer) { @@ -149,7 +154,7 @@ void sub_818D180(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 i } } -void uns_builder_assign_animtable1(bool8 isTrainer) +static void uns_builder_assign_animtable1(bool8 isTrainer) { if (!isTrainer) { @@ -161,7 +166,7 @@ void uns_builder_assign_animtable1(bool8 isTrainer) } } -u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys) +static u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer, bool8 ignoreDeoxys) { u8 i; u8 *framePics; @@ -221,7 +226,7 @@ u16 oamt_spawn_poke_or_trainer_picture(u16 species, u32 otId, u32 personality, b return spriteId; } -u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) +static u16 sub_818D384(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 isTrainer) { return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, isTrainer, FALSE); } @@ -309,7 +314,7 @@ u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, return spriteId; } -u16 sub_818D5B0(u16 spriteId) +static u16 sub_818D5B0(u16 spriteId) { u8 i; u8 *framePics; @@ -339,7 +344,7 @@ u16 sub_818D5B0(u16 spriteId) return 0; } -u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer) +static u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId, bool8 isTrainer) { if (sub_818D09C(species, personality, isFrontPic, (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA), FALSE)) { @@ -349,7 +354,7 @@ u16 sub_818D65C(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 pal return 0; } -u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer) +static u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId, bool8 isTrainer) { u8 *framePics; @@ -364,7 +369,7 @@ u16 sub_818D6CC(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u16 de return 0xFFFF; } -u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) +static u16 sub_818D778(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag, bool8 ignoreDeoxys) { return oamt_spawn_poke_or_trainer_picture(species, otId, personality, isFrontPic, x, y, paletteSlot, paletteTag, FALSE, ignoreDeoxys); } @@ -409,16 +414,17 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS return sub_818D6CC(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE); } -//u8 sub_818D97C(u8 a0, u8 a1) -//{ -// u8 id; -// if (a1 == 1 && a0) -// { -// id = gUnknown_0831F578[0x3F]; -// } -// else -// { -// id = gUnknown_0831F578[0x3C]; -// } -// return id; -//} +u8 sub_818D97C(u8 a0, u8 a1) +{ + if (a1 == 1) + { + switch (a0) + { + default: + return gUnknown_0831F578[0x3F]; + case 0: + return gUnknown_0831F578[0x3C]; + } + } + return a0; +} From 3d32be86fcd40bf5979fff62a87d6390dd4171fe Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 19 Sep 2017 14:12:51 -0500 Subject: [PATCH 27/62] Continue baserom extraction --- asm/battle_2.s | 4 +- asm/battle_message.s | 6 +- data/battle_anim_8170478.s | 227 ++- data/battle_controller_link_opponent.s | 60 +- data/battle_controller_link_partner.s | 60 +- data/battle_controller_opponent.s | 62 +- data/battle_controller_player.s | 63 +- data/battle_controller_player_partner.s | 69 +- data/battle_controller_recorded_opponent.s | 63 +- data/battle_controller_recorded_player.s | 62 +- data/battle_controller_safari.s | 318 ++- data/battle_controller_wally.s | 63 +- data/battle_message.s | 2086 +++++++++++++++----- data/event_scripts.s | 144 +- data/graphics.s | 8 +- src/pokemon_3.c | 20 +- 16 files changed, 2788 insertions(+), 527 deletions(-) diff --git a/asm/battle_2.s b/asm/battle_2.s index dd3e6d38c..1df081959 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -9235,7 +9235,7 @@ _0803B7EA: ldr r1, =gAbsentBankFlags ldrb r1, [r1] strb r1, [r0] - ldr r0, =gUnknown_085CC23E + ldr r0, =gText_EmptyString3 movs r1, 0 bl battle_show_message_maybe ldr r1, =gBattleMainFunc @@ -9506,7 +9506,7 @@ _0803BAB2: ldr r4, =gNoOfAllBanks ldr r0, =gAbsentBankFlags mov r12, r0 - ldr r1, =gUnknown_085CC23E + ldr r1, =gText_EmptyString3 mov r9, r1 ldrb r0, [r4] cmp r2, r0 diff --git a/asm/battle_message.s b/asm/battle_message.s index dec210b25..954be7e89 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -539,7 +539,7 @@ _0814E58A: lsrs r0, 24 cmp r0, 0x1 bhi _0814E5A4 - ldr r7, =gUnknown_085CB4CA + ldr r7, =gText_GotAwaySafely b _0814E6D8 .pool _0814E5A4: @@ -597,7 +597,7 @@ _0814E60E: ldr r7, =gUnknown_085CB538 cmp r1, 0 beq _0814E6D8 - ldr r7, =gUnknown_085CCE53 + ldr r7, =gText_TwoEnemiesDefeated b _0814E6D8 .pool _0814E628: @@ -630,7 +630,7 @@ _0814E660: beq _0814E678 b _0814E6D8 _0814E666: - ldr r7, =gUnknown_085CBA2E + ldr r7, =gText_PlayerDefeatedXY b _0814E6D8 .pool _0814E670: diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index ef23d2e7b..dc50c99aa 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -3,26 +3,237 @@ .section .rodata + .align 2 gUnknown_085E5088:: @ 85E5088 - .incbin "baserom.gba", 0x5e5088, 0xc + .byte 0x0a, 0x02, 0xfd, 0x00, 0x0f, 0x00, 0xfc, 0x00 + .byte 0xf6, 0x02, 0xfc, 0x00 + .align 2 gUnknown_085E5094:: @ 85E5094 - .incbin "baserom.gba", 0x5e5094, 0x60 + .4byte gUnknown_08C1A490, 0xd6ec0100 + .4byte gUnknown_08C1A490, 0xd6ed0100 + .4byte gUnknown_08C1A490, 0xd6ee0100 + .4byte gUnknown_08C1A490, 0xd6ef0100 + .4byte gUnknown_08C1A490, 0xd6f00100 + .4byte gUnknown_08C1A490, 0xd6f10100 + .4byte gUnknown_08C1A490, 0xd6f20100 + .4byte gUnknown_08C1A490, 0xd6f30100 + .4byte gUnknown_08C1A490, 0xd6f40100 + .4byte gUnknown_08C1A490, 0xd6f50100 + .4byte gUnknown_08C1A490, 0xd6f60100 + .4byte gUnknown_08C1A490, 0xd6f70100 + .align 2 gUnknown_085E50F4:: @ 85E50F4 - .incbin "baserom.gba", 0x5e50f4, 0xc0 + .4byte gUnknown_08C1A564, 0x0000d6ec + .4byte gUnknown_08C1A564, 0x0000d6ed + .4byte gUnknown_08C1A564, 0x0000d6ee + .4byte gUnknown_08C1A564, 0x0000d6ef + .4byte gUnknown_08C1A564, 0x0000d6f0 + .4byte gUnknown_08C1A564, 0x0000d6f1 + .4byte gUnknown_08C1A564, 0x0000d6f2 + .4byte gUnknown_08C1A564, 0x0000d6f3 + .4byte gUnknown_08C1A564, 0x0000d6f4 + .4byte gUnknown_08C1A564, 0x0000d6f5 + .4byte gUnknown_08C1A564, 0x0000d6f6 + .4byte gUnknown_08C1A564, 0x0000d6f7 + .align 2 +gUnknown_085E5154:: @ 85E5154 + .2byte 0x0000, 0x0001, 0x0001, 0x0001 + .2byte 0x0002, 0x0001, 0x0000, 0x0041 + .2byte 0x0002, 0x0001, 0x0001, 0x0001 + .2byte 0xfffe, 0x0000 + + .align 2 +gUnknown_085E5170:: @ 85E5170 + .2byte 0x0003, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085E5178:: @ 85E5178 + .2byte 0x0004, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085E5180:: @ 85E5180 + .2byte 0x0005, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085E5188:: @ 85E5188 + .2byte 0x0006, 0x0004, 0x0007, 0x0004 + .2byte 0xfffe, 0x0000 + + .align 2 +gUnknown_085E5194:: @ 85E5194 + .2byte 0x0007, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085E519C:: @ 85E519C + .4byte gUnknown_085E5154 + .4byte gUnknown_085E5170 + .4byte gUnknown_085E5178 + .4byte gUnknown_085E5180 + .4byte gUnknown_085E5188 + .4byte gUnknown_085E5194 + + .align 2 gUnknown_085E51B4:: @ 85E51B4 - .incbin "baserom.gba", 0x5e51b4, 0xc + .byte 0x00, 0x00, 0x00, 0x05, 0x01, 0x02, 0x02, 0x03 + .byte 0x05, 0x05, 0x04, 0x04 + .align 2 gUnknown_085E51C0:: @ 85E51C0 - .incbin "baserom.gba", 0x5e51c0, 0x30 + .4byte sub_8171E50 + .4byte sub_81723D4 + .4byte sub_81721CC + .4byte sub_81722CC + .4byte sub_81726BC + .4byte sub_81721CC + .4byte sub_81720C8 + .4byte sub_81722CC + .4byte sub_8172560 + .4byte sub_8171FC4 + .4byte sub_81723D4 + .4byte sub_81727E8 + .align 2 gUnknown_085E51F0:: @ 85E51F0 - .incbin "baserom.gba", 0x5e51f0, 0x60 + .2byte 0xd6ec @ tileTag + .2byte 0xd6ec @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + .align 2 + .2byte 0xd6ed @ tileTag + .2byte 0xd6ed @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6ee @ tileTag + .2byte 0xd6ee @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6ef @ tileTag + .2byte 0xd6ef @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 gUnknown_085E5250:: @ 85E5250 - .incbin "baserom.gba", 0x5e5250, 0xc0 + .2byte 0xd6f0 @ tileTag + .2byte 0xd6f0 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + .align 2 + .2byte 0xd6f1 @ tileTag + .2byte 0xd6f1 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f2 @ tileTag + .2byte 0xd6f2 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f3 @ tileTag + .2byte 0xd6f3 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f4 @ tileTag + .2byte 0xd6f4 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f5 @ tileTag + .2byte 0xd6f5 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f6 @ tileTag + .2byte 0xd6f6 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 + .2byte 0xd6f7 @ tileTag + .2byte 0xd6f7 @ paletteTag + .4byte gUnknown_08524904 + .4byte gUnknown_085E519C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte SpriteCallbackDummy + + .align 2 gUnknown_085E5310:: @ 85E5310 - .incbin "baserom.gba", 0x5e5310, 0x64 + .2byte 0x7adf, 0x7af0, 0x53d7, 0x3fff, 0x7297, 0x67f5, 0x7b2c, 0x2b7e + .2byte 0x431f, 0x7bdd, 0x2a3f, 0x293f, 0x0000, 0x0201, 0x0403, 0x0101 + .2byte 0x0100, 0x0503, 0x0506, 0x0004 + + .align 2 + .2byte 0x281d @ tileTag + .2byte 0x281d @ paletteTag + .4byte gUnknown_0852490C + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_817330C + + .align 2 +gUnknown_085E5350:: @ 8535350 + .2byte 0x0040, 0x0001, 0xffff, 0x0000 + + .align 2 +gUnknown_085E5358:: @ 8535358 + .4byte gUnknown_085E5350 + + .align 2 + .2byte 0x274a @ tileTag + .2byte 0x274a @ paletteTag + .4byte gUnknown_08524914 + .4byte gUnknown_085E5358 + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_817330C + diff --git a/data/battle_controller_link_opponent.s b/data/battle_controller_link_opponent.s index 71b1f5438..ff6c7023b 100644 --- a/data/battle_controller_link_opponent.s +++ b/data/battle_controller_link_opponent.s @@ -3,6 +3,62 @@ .section .rodata - + .align 2 gLinkOpponentBufferCommands:: @ 831C7B4 - .incbin "baserom.gba", 0x31c7b4, 0xe4 + .4byte dp01t_00_2_getattr + .4byte sub_8065900 + .4byte sub_806590C + .4byte sub_8066284 + .4byte sub_80662F8 + .4byte sub_8066448 + .4byte sub_8066624 + .4byte sub_8066748 + .4byte sub_8066A58 + .4byte sub_8066B94 + .4byte sub_8066C40 + .4byte sub_8066CEC + .4byte sub_8066CF8 + .4byte sub_8066D04 + .4byte sub_8066D10 + .4byte sub_8066D1C + .4byte sub_8066FF4 + .4byte sub_806704C + .4byte sub_8067058 + .4byte sub_8067064 + .4byte sub_8067070 + .4byte sub_806707C + .4byte sub_8067088 + .4byte sub_8067094 + .4byte sub_80670A0 + .4byte sub_8067190 + .4byte sub_806719C + .4byte sub_8067214 + .4byte sub_806727C + .4byte sub_8067288 + .4byte sub_8067294 + .4byte sub_80672A0 + .4byte sub_80672AC + .4byte sub_80672B8 + .4byte sub_80672C4 + .4byte sub_80672D0 + .4byte sub_80672DC + .4byte sub_80672E8 + .4byte sub_8067304 + .4byte sub_806733C + .4byte sub_8067354 + .4byte sub_806737C + .4byte sub_80673EC + .4byte sub_80673F8 + .4byte sub_806743C + .4byte sub_8067498 + .4byte sub_80674D4 + .4byte sub_8067508 + .4byte sub_8067718 + .4byte sub_8067874 + .4byte sub_80678C4 + .4byte sub_80678D0 + .4byte sub_8067930 + .4byte sub_80679A4 + .4byte sub_80679C4 + .4byte sub_80679D0 + .4byte nullsub_92 diff --git a/data/battle_controller_link_partner.s b/data/battle_controller_link_partner.s index 25bcb970b..1990ad870 100644 --- a/data/battle_controller_link_partner.s +++ b/data/battle_controller_link_partner.s @@ -3,7 +3,63 @@ .section .rodata - + .align 2 gLinkPartnerBufferCommands:: @ 85C9A94 - .incbin "baserom.gba", 0x5c9a94, 0xe4 + .4byte dp01t_00_4_getattr + .4byte sub_814C038 + .4byte sub_814C044 + .4byte sub_814CA98 + .4byte sub_814CB0C + .4byte sub_814CC28 + .4byte sub_814CE14 + .4byte sub_814CF30 + .4byte sub_814D0E4 + .4byte sub_814D0F0 + .4byte sub_814D19C + .4byte sub_814D288 + .4byte sub_814D294 + .4byte sub_814D2A0 + .4byte sub_814D2AC + .4byte sub_814D2B8 + .4byte sub_814D590 + .4byte sub_814D5E8 + .4byte sub_814D5F4 + .4byte sub_814D600 + .4byte sub_814D60C + .4byte sub_814D618 + .4byte sub_814D624 + .4byte sub_814D630 + .4byte sub_814D63C + .4byte sub_814D72C + .4byte sub_814D738 + .4byte sub_814D7B0 + .4byte sub_814D818 + .4byte sub_814D824 + .4byte sub_814D830 + .4byte sub_814D83C + .4byte sub_814D848 + .4byte sub_814D854 + .4byte sub_814D860 + .4byte sub_814D86C + .4byte sub_814D878 + .4byte sub_814D884 + .4byte sub_814D8A0 + .4byte sub_814D8D8 + .4byte sub_814D8F0 + .4byte dp01t_29_4_blink + .4byte sub_814D988 + .4byte sub_814D994 + .4byte sub_814D9D8 + .4byte sub_814DA34 + .4byte dp01t_2E_4_battle_intro + .4byte sub_814DAA8 + .4byte sub_814DDD8 + .4byte sub_814DEE4 + .4byte sub_814DF34 + .4byte sub_814DF40 + .4byte sub_814DFA0 + .4byte sub_814E014 + .4byte sub_814E034 + .4byte sub_814E040 + .4byte nullsub_113 diff --git a/data/battle_controller_opponent.s b/data/battle_controller_opponent.s index 7f159fb54..3b7acd003 100644 --- a/data/battle_controller_opponent.s +++ b/data/battle_controller_opponent.s @@ -3,7 +3,65 @@ .section .rodata - + .align 2 gOpponentBufferCommands:: @ 831C6C8 - .incbin "baserom.gba", 0x31c6c8, 0xec + .4byte dp01t_00_7_getattr + .4byte dp01t_01_2_read_pokmon_data_slice + .4byte dp01t_02_7_setattr + .4byte sub_80611B0 + .4byte sub_8061224 + .4byte sub_806137C + .4byte sub_806156C + .4byte sub_8061690 + .4byte sub_80618D8 + .4byte sub_8061AF0 + .4byte sub_8061B9C + .4byte sub_8061C48 + .4byte sub_8061C54 + .4byte sub_8061C60 + .4byte sub_8061C6C + .4byte sub_8061C78 + .4byte sub_8061F34 + .4byte sub_8061F90 + .4byte sub_8061F9C + .4byte sub_8061FAC + .4byte sub_8061FB8 + .4byte sub_806215C + .4byte sub_8062188 + .4byte sub_8062288 + .4byte sub_8062294 + .4byte sub_8062384 + .4byte sub_8062390 + .4byte sub_8062408 + .4byte sub_8062470 + .4byte sub_806247C + .4byte sub_8062488 + .4byte sub_8062494 + .4byte sub_80624A0 + .4byte sub_80624AC + .4byte sub_80624B8 + .4byte sub_80624C4 + .4byte sub_80624D0 + .4byte sub_80624DC + .4byte sub_80624F8 + .4byte sub_8062530 + .4byte sub_8062548 + .4byte dp01t_29_7_blink + .4byte sub_80625E0 + .4byte sub_80625EC + .4byte sub_8062630 + .4byte sub_806268C + .4byte dp01t_2E_7_battle_intro + .4byte sub_80626FC + .4byte dp01t_30_7_0803D67C + .4byte sub_8062A74 + .4byte sub_8062AC4 + .4byte sub_8062AD0 + .4byte dp01t_34_7_move_anim_start_t3 + .4byte sub_8062B98 + .4byte sub_8062BA4 + .4byte sub_8062BB0 + .4byte nullsub_91 + .align 2 + .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20 diff --git a/data/battle_controller_player.s b/data/battle_controller_player.s index 1c7ff56fe..37c877dfd 100644 --- a/data/battle_controller_player.s +++ b/data/battle_controller_player.s @@ -2,7 +2,64 @@ .include "constants/constants.inc" .section .rodata - - + + .align 2 gPlayerBufferCommands:: @ 831C514 - .incbin "baserom.gba", 0x31c514, 0xe4 + .4byte dp01t_00_1_getattr + .4byte sub_805A614 + .4byte dp01t_02_1_setattr + .4byte sub_805B0F0 + .4byte sub_805B164 + .4byte sub_805B1CC + .4byte sub_805B3D4 + .4byte sub_805B4F0 + .4byte dp01t_08_1_8032428 + .4byte sub_805B9F8 + .4byte sub_805BAB8 + .4byte sub_805BBA4 + .4byte sub_805BBC4 + .4byte sub_805BC18 + .4byte sub_805BC78 + .4byte dp01t_0F_1_move_anim + .4byte sub_805BF80 + .4byte dp01t_11_1_message_for_player_only + .4byte dp01t_12_6_battle_menu + .4byte sub_805C0B0 + .4byte dp01t_14_5_move_menu_pokedude + .4byte sub_805C248 + .4byte sub_805C2AC + .4byte sub_805C3EC + .4byte sub_805C410 + .4byte sub_805C528 + .4byte sub_805C5C4 + .4byte sub_805C63C + .4byte sub_805C6A4 + .4byte sub_805C710 + .4byte sub_805C71C + .4byte sub_805C7D0 + .4byte sub_805C800 + .4byte sub_805C80C + .4byte sub_805C820 + .4byte sub_805C834 + .4byte sub_805C848 + .4byte sub_805C85C + .4byte sub_805C878 + .4byte sub_805C8B0 + .4byte sub_805C8C8 + .4byte dp01t_29_1_blink + .4byte sub_805C960 + .4byte sub_805C96C + .4byte sub_805C9B0 + .4byte sub_805CA0C + .4byte dp01t_2E_1_battle_intro + .4byte dp01t_2F_1_pokemon_enter + .4byte sub_805CD74 + .4byte sub_805CE80 + .4byte sub_805CED0 + .4byte dp01t_33_1_enemy_move + .4byte sub_805CF54 + .4byte dp01t_35_1_link_standby_message_and_free_vram + .4byte sub_805D02C + .4byte sub_805D094 + .4byte nullsub_22 + diff --git a/data/battle_controller_player_partner.s b/data/battle_controller_player_partner.s index bc00258ae..35d78ebe0 100644 --- a/data/battle_controller_player_partner.s +++ b/data/battle_controller_player_partner.s @@ -2,9 +2,70 @@ .include "constants/constants.inc" .section .rodata - + + .align 2 gPlayerPartnerBufferCommands:: @ 8617170 - .incbin "baserom.gba", 0x617170, 0xE4 - + .4byte dp01t_00_3_getattr + .4byte sub_81BC484 + .4byte sub_81BC490 + .4byte sub_81BCEE4 + .4byte sub_81BCF58 + .4byte sub_81BD074 + .4byte sub_81BD260 + .4byte sub_81BD37C + .4byte sub_81BD5BC + .4byte sub_81BD5C8 + .4byte sub_81BD674 + .4byte sub_81BD760 + .4byte sub_81BD76C + .4byte sub_81BD778 + .4byte sub_81BD784 + .4byte sub_81BD790 + .4byte sub_81BDA4C + .4byte sub_81BDAA0 + .4byte sub_81BDAAC + .4byte sub_81BDABC + .4byte sub_81BDAC8 + .4byte sub_81BDB70 + .4byte sub_81BDB7C + .4byte sub_81BDC04 + .4byte sub_81BDC10 + .4byte sub_81BDD00 + .4byte sub_81BDD9C + .4byte sub_81BDE14 + .4byte sub_81BDE7C + .4byte sub_81BDE88 + .4byte sub_81BDE94 + .4byte sub_81BDEA0 + .4byte sub_81BDEAC + .4byte sub_81BDEB8 + .4byte sub_81BDEC4 + .4byte sub_81BDED0 + .4byte sub_81BDEDC + .4byte sub_81BDEE8 + .4byte sub_81BDF04 + .4byte sub_81BDF3C + .4byte sub_81BDF54 + .4byte dp01t_29_3_blink + .4byte sub_81BDFEC + .4byte sub_81BDFF8 + .4byte sub_81BE03C + .4byte sub_81BE098 + .4byte dp01t_2E_3_battle_intro + .4byte sub_81BE10C + .4byte dp01t_30_3_80EB11C + .4byte sub_81BE4E0 + .4byte sub_81BE530 + .4byte sub_81BE53C + .4byte sub_81BE59C + .4byte sub_81BE604 + .4byte sub_81BE610 + .4byte sub_81BE61C + .4byte nullsub_128 + + .align 2 @ apparently unused data - .incbin "baserom.gba", 0x617254, 32 + .byte 0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e + .byte 0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35 + .byte 0xc5, 0x2c, 0x15, 0x7f, 0xb5, 0x56, 0x9d, 0x53 + .byte 0x3b, 0x43, 0xda, 0x36, 0x79, 0x2a, 0x0e, 0x53 diff --git a/data/battle_controller_recorded_opponent.s b/data/battle_controller_recorded_opponent.s index 72544fdab..8baa57022 100644 --- a/data/battle_controller_recorded_opponent.s +++ b/data/battle_controller_recorded_opponent.s @@ -2,7 +2,64 @@ .include "constants/constants.inc" .section .rodata - -gRecordedOpponentBufferCommands:: @ 860AE90 - .incbin "baserom.gba", 0x60ae90, 0xe4 + + .align 2 +gRecordedOpponentBufferCommands:: @ 860AE90 + .4byte sub_8187224 + .4byte sub_8187A44 + .4byte sub_8187A50 + .4byte sub_81883C8 + .4byte sub_818843C + .4byte sub_818858C + .4byte sub_8188768 + .4byte sub_818888C + .4byte sub_8188A40 + .4byte sub_8188A4C + .4byte sub_8188AF8 + .4byte sub_8188BA4 + .4byte sub_8188BB0 + .4byte sub_8188BBC + .4byte sub_8188BC8 + .4byte sub_8188BD4 + .4byte sub_8188E90 + .4byte sub_8188EE4 + .4byte sub_8188EF0 + .4byte sub_8188F14 + .4byte sub_8188F20 + .4byte sub_8188F7C + .4byte sub_8188F88 + .4byte sub_8188FC4 + .4byte sub_8188FD0 + .4byte sub_81890C0 + .4byte sub_81890CC + .4byte sub_8189144 + .4byte sub_81891AC + .4byte sub_81891B8 + .4byte sub_81891C4 + .4byte sub_81891D0 + .4byte sub_81891DC + .4byte sub_81891E8 + .4byte sub_81891F4 + .4byte sub_8189200 + .4byte sub_818920C + .4byte sub_8189218 + .4byte sub_8189234 + .4byte sub_818926C + .4byte sub_8189284 + .4byte sub_81892AC + .4byte sub_818931C + .4byte sub_8189328 + .4byte sub_818936C + .4byte sub_81893C8 + .4byte sub_8189404 + .4byte sub_8189438 + .4byte sub_8189648 + .4byte sub_81897A4 + .4byte sub_81897F4 + .4byte sub_8189800 + .4byte sub_8189860 + .4byte sub_81898C8 + .4byte sub_81898D4 + .4byte sub_81898E0 + .4byte nullsub_119 diff --git a/data/battle_controller_recorded_player.s b/data/battle_controller_recorded_player.s index 2710a869b..089e4dcbf 100644 --- a/data/battle_controller_recorded_player.s +++ b/data/battle_controller_recorded_player.s @@ -2,7 +2,63 @@ .include "constants/constants.inc" .section .rodata - - + + .align 2 gRecordedPlayerBufferCommands:: @ 860AF74 - .incbin "baserom.gba", 0x60af74, 0xe4 + .4byte sub_818A5EC + .4byte sub_818AE0C + .4byte sub_818AE18 + .4byte sub_818B86C + .4byte sub_818B8E0 + .4byte sub_818B9FC + .4byte sub_818BBE8 + .4byte sub_818BD04 + .4byte sub_818BFAC + .4byte sub_818BFB8 + .4byte sub_818C064 + .4byte sub_818C150 + .4byte sub_818C15C + .4byte sub_818C168 + .4byte sub_818C174 + .4byte sub_818C180 + .4byte sub_818C43C + .4byte sub_818C490 + .4byte sub_818C4D8 + .4byte sub_818C52C + .4byte sub_818C538 + .4byte sub_818C594 + .4byte sub_818C5A0 + .4byte sub_818C5DC + .4byte sub_818C5E8 + .4byte sub_818C6E8 + .4byte sub_818C6F4 + .4byte sub_818C76C + .4byte sub_818C7D4 + .4byte sub_818C7E0 + .4byte sub_818C7EC + .4byte sub_818C7F8 + .4byte sub_818C804 + .4byte sub_818C810 + .4byte sub_818C81C + .4byte sub_818C828 + .4byte sub_818C834 + .4byte sub_818C840 + .4byte sub_818C85C + .4byte sub_818C894 + .4byte sub_818C8AC + .4byte sub_818C8D4 + .4byte sub_818C944 + .4byte sub_818C950 + .4byte sub_818C994 + .4byte sub_818C9F0 + .4byte dp01t_2E_2_battle_intro + .4byte sub_818CA64 + .4byte sub_818CD30 + .4byte sub_818CE3C + .4byte sub_818CE8C + .4byte sub_818CE98 + .4byte sub_818CEF8 + .4byte sub_818CF60 + .4byte sub_818CF6C + .4byte sub_818CF78 + .4byte nullsub_121 diff --git a/data/battle_controller_safari.s b/data/battle_controller_safari.s index 7c6e251c7..8f8c0b70b 100644 --- a/data/battle_controller_safari.s +++ b/data/battle_controller_safari.s @@ -2,7 +2,317 @@ .include "constants/constants.inc" .section .rodata - - - gSafariBufferCommands:: @ 85CDF20 - .incbin "baserom.gba", 0x5cdf20, 0x380 + + .align 2 +gSafariBufferCommands:: @ 85CDF20 + .4byte sub_81597AC + .4byte sub_81597B8 + .4byte sub_81597C4 + .4byte sub_81597D0 + .4byte sub_81597DC + .4byte sub_81597E8 + .4byte sub_81597F4 + .4byte sub_8159800 + .4byte sub_81598E0 + .4byte sub_81598EC + .4byte sub_81598F8 + .4byte sub_8159904 + .4byte sub_8159910 + .4byte sub_8159964 + .4byte sub_81599C4 + .4byte sub_81599D0 + .4byte dp01t_10_6_message + .4byte dp01t_11_6_message_for_player_only + .4byte sub_8159A94 + .4byte sub_8159AFC + .4byte sub_8159B08 + .4byte sub_8159B14 + .4byte sub_8159B54 + .4byte sub_8159B60 + .4byte sub_8159B6C + .4byte sub_8159B78 + .4byte sub_8159B84 + .4byte sub_8159BC0 + .4byte sub_8159BCC + .4byte sub_8159BD8 + .4byte sub_8159BE4 + .4byte sub_8159BF0 + .4byte sub_8159BFC + .4byte sub_8159C08 + .4byte sub_8159C14 + .4byte sub_8159C20 + .4byte sub_8159C2C + .4byte sub_8159C38 + .4byte sub_8159C44 + .4byte sub_8159C50 + .4byte sub_8159C5C + .4byte sub_8159C68 + .4byte sub_8159C74 + .4byte sub_8159C80 + .4byte dp01t_34_6_move_anim_start_t3 + .4byte sub_8159D20 + .4byte dp01t_2E_6_battle_intro + .4byte sub_8159D90 + .4byte sub_8159DEC + .4byte sub_8159DF8 + .4byte sub_8159E04 + .4byte sub_8159E10 + .4byte sub_8159E1C + .4byte sub_8159E78 + .4byte sub_8159E84 + .4byte sub_8159E90 + .4byte nullsub_115 + + .align 2 +gUnknown_085CE004:: @ 85CE004 + .2byte 0x0000, 0x0004, 0x0010, 0x0004 + .2byte 0x0020, 0x0004, 0x0030, 0x0004 + .2byte 0x0040, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE01C:: @ 85CE01C + .4byte gUnknown_085CE004 + + .align 2 +gUnknown_085CE020:: @ 85CE020 + .2byte 0x2799 @ tileTag + .2byte 0x2799 @ paletteTag + .4byte gUnknown_08524A34 + .4byte gUnknown_085CE01C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_80A77C8 + + .align 2 + .2byte 0x2720 @ tileTag + .2byte 0x2720 @ paletteTag + .4byte gUnknown_08524934 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815A0D4 + + .align 2 + .2byte 0x2721 @ tileTag + .2byte 0x2721 @ paletteTag + .4byte gUnknown_08524904 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_80A78AC + + .align 2 +gUnknown_085CE068:: @ 85CE068 + .2byte 0x0000, 0x0028, 0x0010, 0x0008 + .2byte 0x0020, 0x0028, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE078:: @ 85CE078 + .4byte gUnknown_085CE068 + + .align 2 +gUnknown_085CE07C:: @ 85CE07C + .2byte 0x27ce @ tileTag + .2byte 0x27ce @ paletteTag + .4byte gUnknown_08524914 + .4byte gUnknown_085CE078 + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_80A77C8 + + .align 2 + .2byte 0x27cf @ tileTag + .2byte 0x27cf @ paletteTag + .4byte gUnknown_08524A3C + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815A1B0 + + .align 2 + .2byte 0x27cd @ tileTag + .2byte 0x27cd @ paletteTag + .4byte gUnknown_08524974 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815A254 + + .align 2 +gUnknown_085CE0C4:: @ 85CE0C4 + .2byte 0x0180, 0x0180, 0x0000, 0x0000 + .2byte 0xffe0, 0x0018, 0x0500, 0x0000 + .2byte 0x0018, 0xffe0, 0x0500, 0x0000 + .2byte 0x7ffe, 0x0001, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE0E4:: @ 85CE0E4 + .2byte 0x0030, 0x0030, 0x0000, 0x0000 + .2byte 0x0020, 0x0020, 0x0600, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE0FC:: @ 85CE0FC + .4byte gUnknown_085CE0C4 + .4byte gUnknown_085CE0E4 + + .align 2 +gUnknown_085CE104:: @ 85CE104 + .2byte 0x27cb @ tileTag + .2byte 0x27cb @ paletteTag + .4byte gUnknown_08524AFC + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gUnknown_085CE0FC + .4byte sub_815A2F0 + + .align 2 + .2byte 0x27a8 @ tileTag + .2byte 0x27a8 @ paletteTag + .4byte gUnknown_0852490C + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815A6C4 + + .align 2 +gUnknown_085CE134:: @ 85CE134 + .2byte 0x0000, 0x0003, 0x0010, 0x0003 + .2byte 0x0020, 0x0003, 0x0030, 0x0003 + .2byte 0x0040, 0x0003, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE14C:: @ 85CE14C + .4byte gUnknown_085CE134 + + .align 2 +gUnknown_085CE150:: @ 85CE150 + .2byte 0x272b @ tileTag + .2byte 0x272b @ paletteTag + .4byte gUnknown_08524914 + .4byte gUnknown_085CE14C + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815A7B0 + + .align 2 +gUnknown_085CE168:: @ 85CE168 + .2byte 0x0000, 0x0003, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE170:: @ 85CE170 + .4byte gUnknown_085CE168 + + .align 2 +gUnknown_085CE174:: @ 85CE174 + .2byte 0xfff9, 0xfff9, 0x10fd, 0x0000 + .2byte 0x0007, 0x0007, 0x1003, 0x0000 + .2byte 0x7ffe, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE18C:: @ 85CE18C + .4byte gUnknown_085CE174 + + .align 2 +gUnknown_085CE190:: @ 85CE190 + .2byte 0x27f4 @ tileTag + .2byte 0x27f4 @ paletteTag + .4byte gUnknown_08524974 + .4byte gUnknown_085CE170 + .4byte NULL + .4byte gUnknown_085CE18C + .4byte sub_815A7EC + + .align 2 +gUnknown_085CE1A8:: @ 85CE1A8 + .2byte 0x0000, 0x0008, 0x0010, 0x0010, 0x0020, 0x0004, 0x0030, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_085CE1BC:: @ 85CE1BC + .4byte gUnknown_085CE1A8 + + .align 2 +gUnknown_085CE1C0:: @ 85CE1C0 + .2byte 0x0200, 0x0200, 0x0000, 0x0000 + .2byte 0xffe0, 0xffe0, 0x0800, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE1D8:: @ 85CE1D8 + .4byte gUnknown_085CE1C0 + + .align 2 +gUnknown_085CE1DC:: @ 85CE1DC + .2byte 0x27d0 @ tileTag + .2byte 0x27d0 @ paletteTag + .4byte gUnknown_085249D4 + .4byte gUnknown_085CE1BC + .4byte NULL + .4byte gUnknown_085CE1D8 + .4byte sub_815A8AC + + .align 2 +gUnknown_085CE1F4:: @ 85CE1F4 + .2byte 0x0000, 0x0180, 0x0000, 0x0000 + .2byte 0x0010, 0x0000, 0x1400, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE20C:: @ 85CE20C + .2byte 0x0140, 0x0180, 0x0000, 0x0000 + .2byte 0xfff0, 0x0000, 0x1300, 0x0000 + .2byte 0x7fff, 0x0000, 0x0000, 0x0000 + + .align 2 +gUnknown_085CE224:: @ 85CE224 + .4byte gUnknown_085CE1F4 + .4byte gUnknown_085CE20C + + .align 2 +gUnknown_085CE22C:: @ 85CE22C + .2byte 0x27f3 @ tileTag + .2byte 0x27f3 @ paletteTag + .4byte gUnknown_085249DC + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gUnknown_085CE224 + .4byte sub_815A934 + + .align 2 + .2byte 0x2807 @ tileTag + .2byte 0x2807 @ paletteTag + .4byte gUnknown_08524914 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815AAA4 + + .align 2 + .2byte 0x2807 @ tileTag + .2byte 0x2807 @ paletteTag + .4byte gUnknown_08524914 + .4byte gDummySpriteAnimTable + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815ABD0 + + .align 2 +gUnknown_085CE274:: @ 85CE274 + .2byte 0x0000, 0x0002, 0x0008, 0x0002 + .2byte 0x0010, 0x0002, 0xfffe, 0x0000 + + .align 2 +gUnknown_085CE284:: @ 85CE284 + .4byte gUnknown_085CE274 + + .align 2 +gUnknown_085CE288:: @ 85CE288 + .2byte 0x27f5 @ tileTag + .2byte 0x27f5 @ paletteTag + .4byte gUnknown_08524934 + .4byte gUnknown_085CE284 + .4byte NULL + .4byte gDummySpriteAffineAnimTable + .4byte sub_815ACD0 + + diff --git a/data/battle_controller_wally.s b/data/battle_controller_wally.s index 41c40f9eb..96d34d4a5 100644 --- a/data/battle_controller_wally.s +++ b/data/battle_controller_wally.s @@ -2,8 +2,63 @@ .include "constants/constants.inc" .section .rodata - - -gWallyBufferCommands:: @ 85DFDC0 - .incbin "baserom.gba", 0x5dfdc0, 0xe4 + .align 2 +gWallyBufferCommands:: @ 85DFDC0 + .4byte dp01t_00_5_getattr + .4byte sub_81693C0 + .4byte sub_81693CC + .4byte sub_8169E20 + .4byte sub_8169E2C + .4byte sub_8169E38 + .4byte sub_8169E44 + .4byte sub_8169EC8 + .4byte dp01t_07_6_ + .4byte sub_816A060 + .4byte sub_816A06C + .4byte sub_816A078 + .4byte sub_816A084 + .4byte sub_816A0D8 + .4byte sub_816A138 + .4byte sub_816A144 + .4byte sub_816A3B8 + .4byte dp01t_11_5_message_for_player_only + .4byte dp01t_12_1_battle_menu + .4byte sub_816A4D8 + .4byte sub_816A4E4 + .4byte sub_816A57C + .4byte sub_816A5BC + .4byte sub_816A5C8 + .4byte sub_816A5D4 + .4byte sub_816A6D4 + .4byte sub_816A6E0 + .4byte sub_816A6EC + .4byte sub_816A6F8 + .4byte sub_816A704 + .4byte sub_816A710 + .4byte sub_816A71C + .4byte sub_816A728 + .4byte sub_816A734 + .4byte sub_816A740 + .4byte sub_816A74C + .4byte sub_816A758 + .4byte sub_816A764 + .4byte sub_816A770 + .4byte sub_816A77C + .4byte sub_816A788 + .4byte sub_816A794 + .4byte sub_816A804 + .4byte sub_816A810 + .4byte sub_816A840 + .4byte sub_816A89C + .4byte dp01t_2E_5_battle_intro + .4byte sub_816A90C + .4byte sub_816AC78 + .4byte sub_816ACFC + .4byte sub_816AD08 + .4byte sub_816AD14 + .4byte sub_816AD20 + .4byte sub_816AD7C + .4byte sub_816AD88 + .4byte sub_816AD94 + .4byte nullsub_118 diff --git a/data/battle_message.s b/data/battle_message.s index 93a921b5e..40040d9c2 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -3,599 +3,1662 @@ .section .rodata +gText_Buffer36:: @ 85C9B78 + .string "{STRING 36}$" -.string "{STRING 36}$" -.string "{STRING 0} gained{PLAYER}\n{STRING 52} EXP. Points!\p$" -.string "$" -.string " a boosted$" -.string "{STRING 0} grew to\nLV. {PLAYER}!{UNKNOWN_A}\p$" -.string "{STRING 0} learned\n{PLAYER}!{UNKNOWN_A}\p$" -.string "{STRING 0} is trying to\nlearn {PLAYER}.\p$" -.string "But, {STRING 0} can’t learn\nmore than four moves.\p$" -.string "Delete a move to make\nroom for {PLAYER}?$" -.string "{STRING 0} forgot\n{PLAYER}.\p$" -.string "{PAUSE 32}Stop learning\n{PLAYER}?$" -.string "{STRING 0} did not learn\n{PLAYER}.\p$" -.string "Use next POKéMON?$" -.string "{STRING 15}’s\nattack missed!$" -.string "{STRING 16}\nprotected itself!$" -.string "{STRING 16} avoided\ndamage with {STRING 25}!$" -.string "{STRING 16} makes GROUND\nmoves miss with {STRING 25}!$" -.string "{STRING 16} avoided\nthe attack!$" -.string "It doesn’t affect\n{STRING 16}‥$" -.string "{STRING 15}\nfainted!\p$" -.string "{STRING 16}\nfainted!\p$" -.string "{STRING 35} got ¥{STRING 0}\nfor winning!\p$" -.string "{STRING 35} is out of\nusable POKéMON!\p$" -.string "{STRING 35} whited out!{PAUSE_UNTIL_PRESS}$" -.string "{STRING 19} prevents\nescape with {STRING 26}!\p$" -.string "Can’t escape!\p$" -.string "{STRING 15} can’t escape!$" -.string "Hit {STRING 0} time(s)!$" -.string "{STRING 17}\nfell asleep!$" -.string "{STRING 19}’s {STRING 26}\nmade {STRING 17} sleep!$" -.string "{STRING 16} is\nalready asleep!$" -.string "{STRING 15} is\nalready asleep!$" -.string "{STRING 16}\nwasn’t affected!$" -.string "{STRING 17}\nwas poisoned!$" -.string "{STRING 19}’s {STRING 26}\npoisoned {STRING 17}!$" -.string "{STRING 15} is hurt\nby poison!$" -.string "{STRING 16} is already\npoisoned.$" -.string "{STRING 17} is badly\npoisoned!$" -.string "{STRING 16} had its\nenergy drained!$" -.string "{STRING 17} was burned!$" -.string "{STRING 19}’s {STRING 26}\nburned {STRING 17}!$" -.string "{STRING 15} is hurt\nby its burn!$" -.string "{STRING 16} already\nhas a burn.$" -.string "{STRING 17} was\nfrozen solid!$" -.string "{STRING 19}’s {STRING 26}\nfroze {STRING 17} solid!$" -.string "{STRING 15} is\nfrozen solid!$" -.string "{STRING 16} was\ndefrosted!$" -.string "{STRING 15} was\ndefrosted!$" -.string "{STRING 15} was\ndefrosted by {STRING 20}!$" -.string "{STRING 17} is paralyzed!\nIt may be unable to move!$" -.string "{STRING 19}’s {STRING 26}\nparalyzed {STRING 17}!\lIt may be unable to move!$" -.string "{STRING 15} is paralyzed!\nIt can’t move!$" -.string "{STRING 16} is\nalready paralyzed!$" -.string "{STRING 16} was\nhealed of paralysis!$" -.string "{STRING 16}’s\ndream was eaten!$" -.string "{STRING 15}’s {STRING 0}\nwon’t go higher!$" -.string "{STRING 16}’s {STRING 0}\nwon’t go lower!$" -.string "Your team’s {STRING 0}\nstopped working!$" -.string "The foe’s {STRING 0}\nstopped working!$" -.string "{STRING 15} is\nconfused!$" -.string "{STRING 15} snapped\nout of confusion!$" -.string "{STRING 17} became\nconfused!$" -.string "{STRING 16} is\nalready confused!$" -.string "{STRING 16}\nfell in love!$" -.string "{STRING 15} is in love\nwith {STRING 19}!$" -.string "{STRING 15} is\nimmobilized by love!$" -.string "{STRING 16} was\nblown away!$" -.string "{STRING 15} transformed\ninto the {STRING 0} type!$" -.string "{STRING 15} flinched!$" -.string "{STRING 16} regained\nhealth!$" -.string "{STRING 16}’s\nHP is full!$" -.string "{STRING 42}’s {STRING 20}\nraised SP. DEF!$" -.string "{STRING 42}’s {STRING 20}\nraised SP. DEF a little!$" -.string "{STRING 42}’s {STRING 20}\nraised DEFENSE!$" -.string "{STRING 42}’s {STRING 20}\nraised DEFENSE a little!$" -.string "{STRING 42}’s party is covered\nby a veil!$" -.string "{STRING 16}’s party is protected\nby SAFEGUARD!$" -.string "{STRING 44}’s party is no longer\nprotected by SAFEGUARD!$" -.string "{STRING 15} went\nto sleep!$" -.string "{STRING 15} slept and\nbecame healthy!$" -.string "{STRING 15} whipped\nup a whirlwind!$" -.string "{STRING 15} took\nin sunlight!$" -.string "{STRING 15} lowered\nits head!$" -.string "{STRING 15} is glowing!$" -.string "{STRING 15} flew\nup high!$" -.string "{STRING 15} dug a hole!$" -.string "{STRING 15} hid\nunderwater!$" -.string "{STRING 15} sprang up!$" -.string "{STRING 16} was squeezed by\n{STRING 15}’s BIND!$" -.string "{STRING 16} was trapped\nin the vortex!$" -.string "{STRING 16} was trapped\nby SAND TOMB!$" -.string "{STRING 16} was WRAPPED by\n{STRING 15}!$" -.string "{STRING 15} CLAMPED\n{STRING 16}!$" -.string "{STRING 15} is hurt\nby {STRING 0}!$" -.string "{STRING 15} was freed\nfrom {STRING 0}!$" -.string "{STRING 15} kept going\nand crashed!$" +gText_PkmnGainedEXP:: @ 85C9B7B + .string "{STRING 0} gained{PLAYER}\n{STRING 52} EXP. Points!\p$" -gUnknown_085CA424:: @ 85CA424 +gText_EmptyString4:: @ 85C9B98 + .string "$" -.string "{STRING 42} became\nshrouded in MIST!$" -.string "{STRING 19} is protected\nby MIST!$" +gText_ABoosted:: @ 85C9B99 + .string " a boosted$" -gUnknown_085CA459:: @ 85CA459 +gText_PkmnGrewToLv:: @ 85C9BA4 + .string "{STRING 0} grew to\nLV. {PLAYER}!{UNKNOWN_A}\p$" -.string "{STRING 15} is getting\npumped!$" -.string "{STRING 15} is hit\nwith recoil!$" -.string "{STRING 15} protected\nitself!$" -.string "{STRING 15} is buffeted\nby the sandstorm!$" -.string "{STRING 15} is pelted\nby HAIL!$" -.string "{STRING 40}’s {STRING 0}\nwore off!$" -.string "{STRING 16} was seeded!$" -.string "{STRING 16} evaded\nthe attack!$" -.string "{STRING 15}’s health is\nsapped by LEECH SEED!$" -.string "{STRING 15} is fast\nasleep.$" -.string "{STRING 15} woke up!$" -.string "But {STRING 19}’s UPROAR\nkept it awake!$" -.string "{STRING 15} woke up\nin the UPROAR!$" -.string "{STRING 15} caused\nan UPROAR!$" -.string "{STRING 15} is making\nan UPROAR!$" -.string "{STRING 15} calmed down.$" -.string "But {STRING 16} can’t\nsleep in an UPROAR!$" -.string "{STRING 15} STOCKPILED\n{STRING 0}!$" -.string "{STRING 15} can’t\nSTOCKPILE any more!$" -.string "But {STRING 16} can’t\nsleep in an UPROAR!$" -.string "But the UPROAR kept\n{STRING 16} awake!$" -.string "{STRING 16} stayed awake\nusing its {STRING 25}!$" -.string "{STRING 15} is storing\nenergy!$" -.string "{STRING 15} unleashed\nenergy!$" -.string "{STRING 15} became\nconfused due to fatigue!$" -.string "{STRING 35} picked up\n¥{STRING 0}!\p$" -.string "{STRING 16} is\nunaffected!$" -.string "{STRING 15} transformed\ninto {STRING 0}!$" -.string "{STRING 15} made\na SUBSTITUTE!$" -.string "{STRING 15} already\nhas a SUBSTITUTE!$" -.string "The SUBSTITUTE took damage\nfor {STRING 16}!\p$" -.string "{STRING 16}’s\nSUBSTITUTE faded!\p$" -.string "{STRING 15} must\nrecharge!$" -.string "{STRING 16}’s RAGE\nis building!$" -.string "{STRING 16}’s {STRING 0}\nwas disabled!$" -.string "{STRING 15} is disabled\nno more!$" -.string "{STRING 16} got\nan ENCORE!$" -.string "{STRING 15}’s ENCORE\nended!$" -.string "{STRING 15} took aim\nat {STRING 16}!$" -.string "{STRING 15} SKETCHED\n{STRING 0}!$" -.string "{STRING 15} is trying\nto take its foe with it!$" -.string "{STRING 16} took\n{STRING 15} with it!$" -.string "Reduced {STRING 16}’s\n{STRING 0} by {PLAYER}!$" -.string "{STRING 15} stole\n{STRING 16}’s {STRING 22}!$" -.string "{STRING 16} can’t\nescape now!$" -.string "{STRING 16} fell into\na NIGHTMARE!$" -.string "{STRING 15} is locked\nin a NIGHTMARE!$" -.string "{STRING 15} cut its own HP and\nlaid a CURSE on {STRING 16}!$" -.string "{STRING 15} is afflicted\nby the CURSE!$" -.string "SPIKES were scattered all around\nthe opponent’s side!$" -.string "{STRING 19} is hurt\nby SPIKES!$" -.string "{STRING 15} identified\n{STRING 16}!$" -.string "{STRING 15}’s PERISH count\nfell to {STRING 0}!$" -.string "{STRING 15} braced\nitself!$" -.string "{STRING 16} ENDURED\nthe hit!$" -.string "MAGNITUDE {STRING 0}!$" -.string "{STRING 15} cut its own HP\nand maximized ATTACK!$" -.string "{STRING 15} copied\n{STRING 16}’s stat changes!$" -.string "{STRING 15} got free of\n{STRING 16}’s {STRING 0}!$" -.string "{STRING 15} shed\nLEECH SEED!$" -.string "{STRING 15} blew away\nSPIKES!$" -.string "{STRING 15} fled from\nbattle!$" -.string "{STRING 15} foresaw\nan attack!$" -.string "{STRING 16} took the\n{STRING 0} attack!$" -.string "{STRING 15} chose\n{STRING 20} as its destiny!$" -.string "{STRING 0}’s attack!$" -.string "{STRING 15} became the\ncenter of attention!$" -.string "{STRING 15} began\ncharging power!$" -.string "NATURE POWER turned into\n{STRING 20}!$" -.string "{STRING 15}’s status\nreturned to normal!$" -.string "{STRING 16} was subjected\nto TORMENT!$" -.string "{STRING 15} is tightening\nits focus!$" -.string "{STRING 16} fell for\nthe TAUNT!$" -.string "{STRING 15} is ready to\nhelp {STRING 16}!$" -.string "{STRING 15} switched\nitems with its opponent!$" -.string "{STRING 15} obtained\n{STRING 0}.$" -.string "{STRING 16} obtained\n{PLAYER}.$" -.string "{STRING 15} obtained\n{STRING 0}.\p{STRING 16} obtained\n{PLAYER}.$" -.string "{STRING 15} copied\n{STRING 16}’s {STRING 25}!$" -.string "{STRING 15} made a WISH!$" -.string "{STRING 0}’s WISH\ncame true!$" -.string "{STRING 15} planted its roots!$" -.string "{STRING 15} absorbed\nnutrients with its roots!$" -.string "{STRING 16} anchored\nitself with its roots!$" -.string "{STRING 15} made\n{STRING 16} drowsy!$" -.string "{STRING 15} knocked off\n{STRING 16}’s {STRING 22}!$" -.string "{STRING 15} swapped abilities\nwith its opponent!$" -.string "{STRING 15} sealed the\nopponent’s move(s)!$" -.string "{STRING 15} wants the\nopponent to bear a GRUDGE!$" -.string "{STRING 15}’s {STRING 0} lost\nall its PP due to the GRUDGE!$" -.string "{STRING 15} shrouded\nitself in {STRING 20}!$" -.string "{STRING 15}’s {STRING 20}\nwas bounced back by MAGIC COAT!$" -.string "{STRING 15} waits for a target\nto make a move!$" -.string "{STRING 16} SNATCHED\n{STRING 19}’s move!$" -.string "Electricity’s power was\nweakened!$" -.string "Fire’s power was\nweakened!$" -.string "{STRING 15} found\none {STRING 22}!$" -.string "A soothing aroma wafted\nthrough the area!$" -.string "Items can’t be used now.{PAUSE 64}$" -.string "For {STRING 19},\n{STRING 22} {STRING 0}$" -.string "{STRING 19} used\n{STRING 22} to get pumped!$" -.string "{STRING 15} lost its\nfocus and couldn’t move!$" -.string "{STRING 16} was\ndragged out!\p$" -.string "The wall shattered!$" -.string "But it had no effect!$" -.string "{STRING 18} has no\nmoves left!\p$" -.string "{STRING 18}’s {STRING 20}\nis disabled!\p$" -.string "{STRING 18} can’t use the same\nmove in a row due to the TORMENT!\p$" -.string "{STRING 18} can’t use\n{STRING 20} after the TAUNT!\p$" -.string "{STRING 18} can’t use the\nsealed {STRING 20}!\p$" -.string "{STRING 19}’s {STRING 26}\nmade it rain!$" -.string "{STRING 19}’s {STRING 26}\nraised its SPEED!$" -.string "{STRING 16} was protected\nby {STRING 25}!$" -.string "{STRING 16}’s {STRING 25}\nprevents {STRING 15}\lfrom using {STRING 20}!$" -.string "{STRING 16} restored HP\nusing its {STRING 25}!$" -.string "{STRING 16}’s {STRING 25}\nmade {STRING 20} useless!$" -.string "{STRING 16}’s {STRING 25}\nmade it the {STRING 0} type!$" -.string "{STRING 17}’s {STRING 25}\nprevents paralysis!$" -.string "{STRING 16}’s {STRING 25}\nprevents romance!$" -.string "{STRING 17}’s {STRING 25}\nprevents poisoning!$" -.string "{STRING 16}’s {STRING 25}\nprevents confusion!$" -.string "{STRING 16}’s {STRING 25}\nraised its FIRE power!$" -.string "{STRING 16} anchors\nitself with {STRING 25}!$" -.string "{STRING 19}’s {STRING 26}\ncuts {STRING 16}’s ATTACK!$" -.string "{STRING 19}’s {STRING 26}\nprevents stat loss!$" -.string "{STRING 16}’s {STRING 25}\nhurt {STRING 15}!$" -.string "{STRING 19} TRACED\n{STRING 0}’s {PLAYER}!$" -.string "{STRING 17}’s {STRING 27}\nprevents burns!$" -.string "{STRING 16}’s {STRING 25}\nblocks {STRING 20}!$" -.string "{STRING 19}’s {STRING 26}\nblocks {STRING 20}!$" -.string "{STRING 15}’s {STRING 24}\nrestored its HP a little!$" -.string "{STRING 19}’s {STRING 26}\nwhipped up a sandstorm!$" -.string "{STRING 19}’s {STRING 26}\nintensified the sun’s rays!$" -.string "{STRING 19}’s {STRING 26}\nprevents {STRING 0} loss!$" -.string "{STRING 16}’s {STRING 25}\ninfatuated {STRING 15}!$" -.string "{STRING 16}’s {STRING 25}\nmade {STRING 20} ineffective!$" -.string "{STRING 19}’s {STRING 26}\ncured its {STRING 0} problem!$" -.string "It sucked up the\nLIQUID OOZE!$" -.string "{STRING 19} transformed!$" -.string "{STRING 16}’s {STRING 25}\ntook the attack!$" +gText_PkmnLearnedMove:: @ 85C9BBA + .string "{STRING 0} learned\n{PLAYER}!{UNKNOWN_A}\p$" -BattleText_PreventedSwitch:: @ 85CB2A1 +gText_TryToLearnMove1:: @ 85C9BCC + .string "{STRING 0} is trying to\nlearn {PLAYER}.\p$" -.string "{STRING 0}’s {STRING 23}\nprevents switching!\p$" -.string "{STRING 16}’s {STRING 25}\nprevented {STRING 19}’s\l{STRING 0} from working!$" -.string "{STRING 19}’s {STRING 26}\nmade it ineffective!$" -.string "{STRING 17}’s {STRING 27}\nprevents flinching!$" -.string "{STRING 15}’s {STRING 24}\nprevents {STRING 16}’s\l{STRING 25} from working!$" -.string "{STRING 19}’s {STRING 26}\ncured its {STRING 0} problem!$" -.string "{STRING 19}’s {STRING 26}\nhad no effect on {STRING 17}!$" -.string "sharply $" +gText_TryToLearnMove2:: @ 85C9BE7 + .string "But, {STRING 0} can’t learn\nmore than four moves.\p$" -gUnknown_085CB38A:: @ 85CB38A +gText_TryToLearnMove3:: @ 85C9C12 + .string "Delete a move to make\nroom for {PLAYER}?$" -.string "rose!$" -.string "harshly $" -.string "fell!$" -.string "{STRING 15}’s {STRING 0}\n{PLAYER}$" +gText_PkmnForgotMove:: @ 85C9C35 + .string "{STRING 0} forgot\n{PLAYER}.\p$" -gUnknown_085CB3AA:: @ 85CB3AA +gText_StopLearningMove:: @ 85C9C44 + .string "{PAUSE 32}Stop learning\n{PLAYER}?$" -.string "{STRING 16}’s {STRING 0}\n{PLAYER}$" -.string "Using {STRING 22}, the {STRING 0}\nof {STRING 19} {PLAYER}$" -.string "{STRING 15}’s {STRING 0}\n{PLAYER}$" -.string "{STRING 16}’s {STRING 0}\n{PLAYER}$" -.string "{STRING 15}’s stats won’t\ngo any higher!$" -.string "{STRING 16}’s stats won’t\ngo any lower!$" -.string "A critical hit!$" -.string "It’s a one-hit KO!$" -.string "{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}‥ {PAUSE 15}‥ {PAUSE 15}‥ {PAUSE 15}{PLAY_SE 0x0038}Poof!\p$" -.string "And‥\p$" -.string "HM moves can’t be\nforgotten now.\p$" -.string "It’s not very effective‥$" -.string "It’s super effective!$" +gText_DidNotLearnMove:: @ 85C9C59 + .string "{STRING 0} did not learn\n{PLAYER}.\p$" -gUnknown_085CB4CA:: @ 85CB4CA +gText_UseNextPkmn:: @ 85C9C6F + .string "Use next POKéMON?$" -.string "{PLAY_SE 0x0011}Got away safely!\p$" -.string "{PLAY_SE 0x0011}{STRING 15} fled\nusing its {STRING 22}!\p$" -.string "{PLAY_SE 0x0011}{STRING 15} fled\nusing {STRING 24}!\p$" -.string "{PLAY_SE 0x0011}Wild {STRING 0} fled!$" +gText_AttackMissed:: @ 85C9C81 + .string "{STRING 15}’s\nattack missed!$" + +gText_PkmnProtectedItself:: @ 85C9C95 + .string "{STRING 16}\nprotected itself!$" + +gText_AvoidedDamage:: @ 85C9CAA + .string "{STRING 16} avoided\ndamage with {STRING 25}!$" + +gText_PkmnMakesGroundMiss:: @ 85C9CC5 + .string "{STRING 16} makes GROUND\nmoves miss with {STRING 25}!$" + +gText_PkmnAvoidedAttack:: @ 85C9CE9 + .string "{STRING 16} avoided\nthe attack!$" + +gText_ItDoesntAffect:: @ 85C9D00 + .string "It doesn’t affect\n{STRING 16}…$" + +gText_PkmnFainted:: @ 85C9D16 + .string "{STRING 15}\nfainted!\p$" + +gText_PkmnFainted2:: @ 85C9D23 + .string "{STRING 16}\nfainted!\p$" + +gText_PlayerGotMoney:: @ 85C9D30 + .string "{STRING 35} got ¥{STRING 0}\nfor winning!\p$" + +gText_PlayerWhiteout:: @ 85C9D49 + .string "{STRING 35} is out of\nusable POKéMON!\p$" + +gText_PlayerWhiteout2:: @ 85C9D67 + .string "{STRING 35} whited out!{PAUSE_UNTIL_PRESS}$" + +gText_PreventsEscape:: @ 85C9D78 + .string "{STRING 19} prevents\nescape with {STRING 26}!\p$" + +gText_CantEscape2:: @ 85C9D95 + .string "Can’t escape!\p$" + +gText_PkmnCantEscape2:: @ 85C9DA4 + .string "{STRING 15} can’t escape!$" + +gText_HitXTimes:: @ 85C9DB5 + .string "Hit {STRING 0} time(s)!$" + +gText_PkmnFellAsleep:: @ 85C9DC5 + .string "{STRING 17}\nfell asleep!$" + +gText_PkmnMadeSleep:: @ 85C9DD5 + .string "{STRING 19}’s {STRING 26}\nmade {STRING 17} sleep!$" + +gText_PkmnAlreadyAsleep:: @ 85C9DEC + .string "{STRING 16} is\nalready asleep!$" + +gText_PkmnAlreadyAsleep2:: @ 85C9E02 + .string "{STRING 15} is\nalready asleep!$" + +gText_PkmnWasntAffected:: @ 85C9E18 + .string "{STRING 16}\nwasn’t affected!$" + +gText_PkmnWasPoisoned:: @ 85C9E2C + .string "{STRING 17}\nwas poisoned!$" + +gText_PkmnPoisonedBy:: @ 85C9E3D + .string "{STRING 19}’s {STRING 26}\npoisoned {STRING 17}!$" + +gText_PkmnHurtByPoison:: @ 85C9E52 + .string "{STRING 15} is hurt\nby poison!$" + +gText_PkmnAlreadyPoisoned:: @ 85C9E68 + .string "{STRING 16} is already\npoisoned.$" + +gText_PkmnBadlyPoisoned:: @ 85C9E80 + .string "{STRING 17} is badly\npoisoned!$" + +gText_PkmnEnergyDrained:: @ 85C9E96 + .string "{STRING 16} had its\nenergy drained!$" + +gText_PkmnWasBurned:: @ 85C9EB1 + .string "{STRING 17} was burned!$" + +gText_PkmnBurnedBy:: @ 85C9EC0 + .string "{STRING 19}’s {STRING 26}\nburned {STRING 17}!$" + +gText_PkmnHurtByBurn:: @ 85C9ED3 + .string "{STRING 15} is hurt\nby its burn!$" + +gText_PkmnAlreadyHasBurn:: @ 85C9EEB + .string "{STRING 16} already\nhas a burn.$" + +gText_PkmnWasFrozen:: @ 85C9F02 + .string "{STRING 17} was\nfrozen solid!$" + +gText_PkmnFrozenBy:: @ 85C9F17 + .string "{STRING 19}’s {STRING 26}\nfroze {STRING 17} solid!$" + +gText_PkmnIsFrozen:: @ 85C9F2F + .string "{STRING 15} is\nfrozen solid!$" + +gText_PkmnWasDefrosted:: @ 85C9F43 + .string "{STRING 16} was\ndefrosted!$" + +gText_PkmnWasDefrosted2:: @ 85C9F55 + .string "{STRING 15} was\ndefrosted!$" + +gText_PkmnWasDefrostedBy:: @ 85C9F67 + .string "{STRING 15} was\ndefrosted by {STRING 20}!$" + +gText_PkmnWasParalyzed:: @ 85C9F7F + .string "{STRING 17} is paralyzed!\nIt may be unable to move!$" + +gText_PkmnWasParalyzedBy:: @ 85C9FAA + .string "{STRING 19}’s {STRING 26}\nparalyzed {STRING 17}!\lIt may be unable to move!$" + +gText_PkmnIsParalyzed:: @ 85C9FDA + .string "{STRING 15} is paralyzed!\nIt can’t move!$" + +gText_PkmnIsAlreadyParalyzed:: @ 85C9FFA + .string "{STRING 16} is\nalready paralyzed!$" + +gText_PkmnHealedParalysis:: @ 85CA013 + .string "{STRING 16} was\nhealed of paralysis!$" + +gText_PkmnDreamEaten:: @ 85CA02F + .string "{STRING 16}’s\ndream was eaten!$" + +gText_StatsWontIncrease:: @ 85CA045 + .string "{STRING 15}’s {STRING 0}\nwon’t go higher!$" + +gText_StatsWontDecrease:: @ 85CA05E + .string "{STRING 16}’s {STRING 0}\nwon’t go lower!$" + +gText_TeamStoppedWorking:: @ 85CA076 + .string "Your team’s {STRING 0}\nstopped working!$" + +gText_FoeStoppedWorking:: @ 85CA096 + .string "The foe’s {STRING 0}\nstopped working!$" + +gText_PkmnIsConfused:: @ 85CA0B4 + .string "{STRING 15} is\nconfused!$" + +gText_PkmnHealedConfusion:: @ 85CA0C4 + .string "{STRING 15} snapped\nout of confusion!$" + +gText_PkmnWasConfused:: @ 85CA0E1 + .string "{STRING 17} became\nconfused!$" + +gText_PkmnAlreadyConfused:: @ 85CA0F5 + .string "{STRING 16} is\nalready confused!$" + +gText_PkmnFellInLove:: @ 85CA10D + .string "{STRING 16}\nfell in love!$" + +gText_PkmnInLove:: @ 85CA11E + .string "{STRING 15} is in love\nwith {STRING 19}!$" + +gText_PkmnImmobilizedByLove:: @ 85CA135 + .string "{STRING 15} is\nimmobilized by love!$" + +gText_PkmnBlownAway:: @ 85CA150 + .string "{STRING 16} was\nblown away!$" + +gText_PkmnChangedType:: @ 85CA163 + .string "{STRING 15} transformed\ninto the {STRING 0} type!$" + +gText_PkmnFlinched:: @ 85CA184 + .string "{STRING 15} flinched!$" + +gText_PkmnRegainedHealth:: @ 85CA191 + .string "{STRING 16} regained\nhealth!$" + +gText_PkmnHPFull:: @ 85CA1A5 + .string "{STRING 16}’s\nHP is full!$" + +gText_PkmnRaisedSpDef:: @ 85CA1B6 + .string "{STRING 42}’s {STRING 20}\nraised SP. DEF!$" + +gText_PkmnRaisedSpDefALittle:: @ 85CA1CE + .string "{STRING 42}’s {STRING 20}\nraised SP. DEF a little!$" + +gText_PkmnRaisedDef:: @ 85CA1EF + .string "{STRING 42}’s {STRING 20}\nraised DEFENSE!$" + +gText_PkmnRaisedDefALittle:: @ 85CA207 + .string "{STRING 42}’s {STRING 20}\nraised DEFENSE a little!$" + +gText_PkmnCoveredByVeil:: @ 85CA228 + .string "{STRING 42}’s party is covered\nby a veil!$" + +gText_PkmnUsedSafeguard:: @ 85CA249 + .string "{STRING 16}’s party is protected\nby SAFEGUARD!$" + +gText_PkmnSafeguardExpired:: @ 85CA26F + .string "{STRING 44}’s party is no longer\nprotected by SAFEGUARD!$" + +gText_PkmnWentToSleep:: @ 85CA29F + .string "{STRING 15} went\nto sleep!$" + +gText_PkmnSleptHealthy:: @ 85CA2B1 + .string "{STRING 15} slept and\nbecame healthy!$" + +gText_PkmnWhippedWhirlwind:: @ 85CA2CE + .string "{STRING 15} whipped\nup a whirlwind!$" + +gText_PkmnTookSunlight:: @ 85CA2E9 + .string "{STRING 15} took\nin sunlight!$" + +gText_PkmnLoweredHead:: @ 85CA2FE + .string "{STRING 15} lowered\nits head!$" + +gText_PkmnIsGlowing:: @ 85CA313 + .string "{STRING 15} is glowing!$" + +gText_PkmnFlewHigh:: @ 85CA322 + .string "{STRING 15} flew\nup high!$" + +gText_PkmnDugHole:: @ 85CA333 + .string "{STRING 15} dug a hole!$" + +gText_PkmnHidUnderwater:: @ 85CA342 + .string "{STRING 15} hid\nunderwater!$" + +gText_PkmnSprangUp:: @ 85CA355 + .string "{STRING 15} sprang up!$" + +gText_PkmnSqueezedByBind:: @ 85CA363 + .string "{STRING 16} was squeezed by\n{STRING 15}’s BIND!$" + +gText_PkmnTrappedInVortex:: @ 85CA381 + .string "{STRING 16} was trapped\nin the vortex!$" + +gText_PkmnTrappedBySandTomb:: @ 85CA39F + .string "{STRING 16} was trapped\nby SAND TOMB!$" + +gText_PkmnWrappedBy:: @ 85CA3BC + .string "{STRING 16} was WRAPPED by\n{STRING 15}!$" + +gText_PkmnClamped:: @ 85CA3D2 + .string "{STRING 15} CLAMPED\n{STRING 16}!$" + +gText_PkmnHurtBy:: @ 85CA3E1 + .string "{STRING 15} is hurt\nby {STRING 0}!$" + +gText_PkmnFreedFrom:: @ 85CA3F3 + .string "{STRING 15} was freed\nfrom {STRING 0}!$" + +gText_PkmnCrashed:: @ 85CA409 + .string "{STRING 15} kept going\nand crashed!$" + +gText_PkmnShroudedInMist:: @ 85CA424 + .string "{STRING 42} became\nshrouded in MIST!$" + +gText_PkmnProtectedByMist:: @ 85CA440 + .string "{STRING 19} is protected\nby MIST!$" + +gText_PkmnGettingPumped:: @ 85CA459 + .string "{STRING 15} is getting\npumped!$" + +gText_PkmnHitWithRecoil:: @ 85CA46F + .string "{STRING 15} is hit\nwith recoil!$" + +gText_PkmnProtectedItself2:: @ 85CA486 + .string "{STRING 15} protected\nitself!$" + +gText_PkmnBuffetedBySandstorm:: @ 85CA49B + .string "{STRING 15} is buffeted\nby the sandstorm!$" + +gText_PkmnPeltedByHail:: @ 85CA4BC + .string "{STRING 15} is pelted\nby HAIL!$" + +gText_PkmnsXWoreOff:: @ 85CA4D2 + .string "{STRING 40}’s {STRING 0}\nwore off!$" + +gText_PkmnSeeded:: @ 85CA4E4 + .string "{STRING 16} was seeded!$" + +gText_PkmnEvadedAttack:: @ 85CA4F3 + .string "{STRING 16} evaded\nthe attack!$" + +gText_PkmnSappedByLeechSeed:: @ 85CA509 + .string "{STRING 15}’s health is\nsapped by LEECH SEED!$" + +gText_PkmnFastAsleep:: @ 85CA52E + .string "{STRING 15} is fast\nasleep.$" + +gText_PkmnWokeUp:: @ 85CA541 + .string "{STRING 15} woke up!$" + +gText_PkmnUproarKeptAwake:: @ 85CA54D + .string "But {STRING 19}’s UPROAR\nkept it awake!$" + +gText_PkmnWokeUpInUproar:: @ 85CA56C + .string "{STRING 15} woke up\nin the UPROAR!$" + +gText_PkmnCausedUproar:: @ 85CA586 + .string "{STRING 15} caused\nan UPROAR!$" + +gText_PkmnMakingUproar:: @ 85CA59B + .string "{STRING 15} is making\nan UPROAR!$" + +gText_PkmnCalmedDown:: @ 85CA5B3 + .string "{STRING 15} calmed down.$" + +gText_PkmnCantSleepInUproar:: @ 85CA5C3 + .string "But {STRING 16} can’t\nsleep in an UPROAR!$" + +gText_PkmnStockpiled:: @ 85CA5E4 + .string "{STRING 15} STOCKPILED\n{STRING 0}!$" + +gText_PkmnCantStockpile:: @ 85CA5F6 + .string "{STRING 15} can’t\nSTOCKPILE any more!$" + +gText_PkmnCantSleepInUproar2:: @ 85CA613 + .string "But {STRING 16} can’t\nsleep in an UPROAR!$" + +gText_UproarKeptPkmnAwake:: @ 85CA634 + .string "But the UPROAR kept\n{STRING 16} awake!$" + +gText_PkmnStayedAwakeUsing:: @ 85CA652 + .string "{STRING 16} stayed awake\nusing its {STRING 25}!$" + +gText_PkmnStoringEnergy:: @ 85CA670 + .string "{STRING 15} is storing\nenergy!$" + +gText_PkmnUnleashedEnergy:: @ 85CA686 + .string "{STRING 15} unleashed\nenergy!$" + +gText_PkmnFatigueConfusion:: @ 85CA69B + .string "{STRING 15} became\nconfused due to fatigue!$" + +gText_PkmnPickedUpItem:: @ 85CA6BE + .string "{STRING 35} picked up\n¥{STRING 0}!\p$" + +gText_PkmnUnaffected:: @ 85CA6D1 + .string "{STRING 16} is\nunaffected!$" + +gText_PkmnTransformedInto:: @ 85CA6E3 + .string "{STRING 15} transformed\ninto {STRING 0}!$" + +gText_PkmnMadeSubstitute:: @ 85CA6FB + .string "{STRING 15} made\na SUBSTITUTE!$" + +gText_PkmnHasSubstitute:: @ 85CA711 + .string "{STRING 15} already\nhas a SUBSTITUTE!$" + +gText_SubstituteDamaged:: @ 85CA72E + .string "The SUBSTITUTE took damage\nfor {STRING 16}!\p$" + +gText_PkmnSubstituteFaded:: @ 85CA752 + .string "{STRING 16}’s\nSUBSTITUTE faded!\p$" + +gText_PkmnMustRecharge:: @ 85CA76A + .string "{STRING 15} must\nrecharge!$" + +gText_PkmnRageBuilding:: @ 85CA76C + .string "{STRING 16}’s RAGE\nis building!$" + +gText_PkmnMoveWasDisabled:: @ 85CA793 + .string "{STRING 16}’s {STRING 0}\nwas disabled!$" + +gText_PkmnMoveDisabledNoMore:: @ 85CA7A9 + .string "{STRING 15} is disabled\nno more!$" + +gText_PkmnGotEncore:: @ 85CA7C1 + .string "{STRING 16} got\nan ENCORE!$" + +gText_PkmnEncoreEnded:: @ 85CA7D3 + .string "{STRING 15}’s ENCORE\nended!$" + +gText_PkmnTookAim:: @ 85CA7E6 + .string "{STRING 15} took aim\nat {STRING 16}!$" + +gText_PkmnSketchedMove:: @ 85CA7F9 + .string "{STRING 15} SKETCHED\n{STRING 0}!$" + +gText_PkmnTryingToTakeFoe:: @ 85CA809 + .string "{STRING 15} is trying\nto take its foe with it!$" + +gText_PkmnTookFoe:: @ 85CA82F + .string "{STRING 16} took\n{STRING 15} with it!$" + +gText_PkmnReducedPP:: @ 85CA843 + .string "Reduced {STRING 16}’s\n{STRING 0} by {PLAYER}!$" + +gText_PkmnStoleItem:: @ 85CA85A + .string "{STRING 15} stole\n{STRING 16}’s {STRING 22}!$" + +gText_PkmnCantEscape:: @ 85CA86C + .string "{STRING 16} can’t\nescape now!$" + +gText_PkmnFellIntoNightmare:: @ 85CA881 + .string "{STRING 16} fell into\na NIGHTMARE!$" + +gText_PkmnLockedInNightmare:: @ 85CA89B + .string "{STRING 15} is locked\nin a NIGHTMARE!$" + +gText_PkmnLaidCurse:: @ 85CA8B8 + .string "{STRING 15} cut its own HP and\nlaid a CURSE on {STRING 16}!$" + +gText_PkmnAfflictedByCurse:: @ 85CA8E2 + .string "{STRING 15} is afflicted\nby the CURSE!$" + +gText_SpikesScattered:: @ 85CA900 + .string "SPIKES were scattered all around\nthe opponent’s side!$" + +gText_PkmnHurtBySpikes:: @ 85CA936 + .string "{STRING 19} is hurt\nby SPIKES!$" + +gText_PkmnIdentified:: @ 85CA94C + .string "{STRING 15} identified\n{STRING 16}!$" + +gText_PkmnPerishCountFell:: @ 85CA95E + .string "{STRING 15}’s PERISH count\nfell to {STRING 0}!$" + +gText_PkmnBracedItself:: @ 85CA97C + .string "{STRING 15} braced\nitself!$" + +gText_PkmnEnduredHit:: @ 85CA98E + .string "{STRING 16} ENDURED\nthe hit!$" + +gText_MagnitudeStrength:: @ 85CA9A2 + .string "MAGNITUDE {STRING 0}!$" + +gText_PkmnCutHPMaxedAttack:: @ 85CA9B0 + .string "{STRING 15} cut its own HP\nand maximized ATTACK!$" + +gText_PkmnCopiedStatChanges:: @ 85CA9D8 + .string "{STRING 15} copied\n{STRING 16}’s stat changes!$" + +gText_PkmnGotFree:: @ 85CA9F5 + .string "{STRING 15} got free of\n{STRING 16}’s {STRING 0}!$" + +gText_PkmnShedLeechSeed:: @ 85CAA0D + .string "{STRING 15} shed\nLEECH SEED!$" + +gText_PkmnBlewAwaySpikes:: @ 85CAA21 + .string "{STRING 15} blew away\nSPIKES!$" + +gText_PkmnFledFromBattle:: @ 85CAA36 + .string "{STRING 15} fled from\nbattle!$" + +gText_PkmnForesawAttack:: @ 85CAA4B + .string "{STRING 15} foresaw\nan attack!$" + +gText_PkmnTookAttack:: @ 85CAA61 + .string "{STRING 16} took the\n{STRING 0} attack!$" + +gText_PkmnChoseXAsDestiny:: @ 85CAA78 + .string "{STRING 15} chose\n{STRING 20} as its destiny!$" + +gText_PkmnAttack:: @ 85CAA94 + .string "{STRING 0}’s attack!$" + +gText_PkmnCenterAttention:: @ 85CAAA1 + .string "{STRING 15} became the\ncenter of attention!$" + +gText_PkmnChargingPower:: @ 85CAAC4 + .string "{STRING 15} began\ncharging power!$" + +gText_NaturePowerTurnedInto:: @ 85CAADD + .string "NATURE POWER turned into\n{STRING 20}!$" + +gText_PkmnStatusNormal:: @ 85CAAFA + .string "{STRING 15}’s status\nreturned to normal!$" + +gText_PkmnSubjectedToTorment:: @ 85CAB1A + .string "{STRING 16} was subjected\nto TORMENT!$" + +gText_PkmnTighteningFocus:: @ 85CAB37 + .string "{STRING 15} is tightening\nits focus!$" + +gText_PkmnFellForTaunt:: @ 85CAB53 + .string "{STRING 16} fell for\nthe TAUNT!$" + +gText_PkmnReadyToHelp:: @ 85CAB6A + .string "{STRING 15} is ready to\nhelp {STRING 16}!$" + +gText_PkmnSwitchedItems:: @ 85CAB82 + .string "{STRING 15} switched\nitems with its opponent!$" + +gText_PkmnObtainedX:: @ 85CABA7 + .string "{STRING 15} obtained\n{STRING 0}.$" + +gText_PkmnObtainedX2:: @ 85CABB7 + .string "{STRING 16} obtained\n{PLAYER}.$" + +gText_PkmnObtainedXYObtainedZ:: @ 85CABC7 + .string "{STRING 15} obtained\n{STRING 0}.\p{STRING 16} obtained\n{PLAYER}.$" + +gText_PkmnCopiedFoe:: @ 85CAB82 + .string "{STRING 15} copied\n{STRING 16}’s {STRING 25}!$" + +gText_PkmnMadeWish:: @ 85CABFA + .string "{STRING 15} made a WISH!$" + +gText_PkmnWishCameTrue:: @ 85CAC0A + .string "{STRING 0}’s WISH\ncame true!$" + +gText_PkmnPlantedRoots:: @ 85CAC1F + .string "{STRING 15} planted its roots!$" + +gText_PkmnAbsorbedNutrients:: @ 85CAC35 + .string "{STRING 15} absorbed\nnutrients with its roots!$" + +gText_PkmnAnchoredItself:: @ 85CAC5B + .string "{STRING 16} anchored\nitself with its roots!$" + +gText_PkmnWasMadeDrowsy:: @ 85CAC7E + .string "{STRING 15} made\n{STRING 16} drowsy!$" + +gText_PkmnKnockedOff:: @ 85CAC91 + .string "{STRING 15} knocked off\n{STRING 16}’s {STRING 22}!$" + +gText_PkmnSwappedAbilities:: @ 85CACA9 + .string "{STRING 15} swapped abilities\nwith its opponent!$" + +gText_PkmnSealedOpponentMove:: @ 85CACD1 + .string "{STRING 15} sealed the\nopponent’s move(s)!$" + +gText_PkmnWantsGrudge:: @ 85CACF3 + .string "{STRING 15} wants the\nopponent to bear a GRUDGE!$" + +gText_PkmnLostPPGrudge:: @ 85CAD1B + .string "{STRING 15}’s {STRING 0} lost\nall its PP due to the GRUDGE!$" + +gText_PkmnShroudedItself:: @ 85CAD46 + .string "{STRING 15} shrouded\nitself in {STRING 20}!$" + +gText_PkmnMoveBounced:: @ 85CAD60 + .string "{STRING 15}’s {STRING 20}\nwas bounced back by MAGIC COAT!$" + +gText_PkmnWaitsForTarget:: @ 85CAD88 + .string "{STRING 15} waits for a target\nto make a move!$" + +gText_PkmnSnatchedMove:: @ 85CADAE + .string "{STRING 16} SNATCHED\n{STRING 19}’s move!$" + +gText_ElectricityWeakened:: @ 85CADC5 + .string "Electricity’s power was\nweakened!$" + +gText_FireWeakened:: @ 85CADE7 + .string "Fire’s power was\nweakened!$" + +gText_XFoundOneY:: @ 85CAE02 + .string "{STRING 15} found\none {STRING 22}!$" + +gText_SoothingAroma:: @ 85CAE13 + .string "A soothing aroma wafted\nthrough the area!$" + +gText_ItemsCantBeUsedNow:: @ 85CAE3D + .string "Items can’t be used now.{PAUSE 64}$" + +gText_ForXCommaYZ:: @ 85CAE59 + .string "For {STRING 19},\n{STRING 22} {STRING 0}$" + +gText_PkmnUsedXToGetPumped:: @ 85CAE67 + .string "{STRING 19} used\n{STRING 22} to get pumped!$" + +gText_PkmnLostFocus:: @ 85CAE81 + .string "{STRING 15} lost its\nfocus and couldn’t move!$" + +gText_PkmnWasDraggedOut:: @ 85CAEA6 + .string "{STRING 16} was\ndragged out!\p$" + +gText_TheWallShattered:: @ 85CAEBB + .string "The wall shattered!$" + +gText_ButNoEffect:: @ 85CAECF + .string "But it had no effect!$" + +gText_PkmnHasNoMovesLeft:: @ 85CAEE5 + .string "{STRING 18} has no\nmoves left!\p$" + +gText_PkmnMoveIsDisabled:: @ 85CAEFC + .string "{STRING 18}’s {STRING 20}\nis disabled!\p$" + +gText_PkmnCantUseMoveTorment:: @ 85CAF12 + .string "{STRING 18} can’t use the same\nmove in a row due to the TORMENT!\p$" + +gText_PkmnCantUseMoveTaunt:: @ 85CAF4B + .string "{STRING 18} can’t use\n{STRING 20} after the TAUNT!\p$" + +gText_PkmnCantUseMoveSealed:: @ 85CAF6D + .string "{STRING 18} can’t use the\nsealed {STRING 20}!\p$" + +gText_PkmnMadeItRain:: @ 85CAF8A + .string "{STRING 19}’s {STRING 26}\nmade it rain!$" + +gText_PkmnRaisedSpeed:: @ 85CAFA0 + .string "{STRING 19}’s {STRING 26}\nraised its SPEED!$" + +gText_PkmnProtectedBy:: @ 85CAFBA + .string "{STRING 16} was protected\nby {STRING 25}!$" + +gText_PkmnPreventsUsage:: @ 85CAFD2 + .string "{STRING 16}’s {STRING 25}\nprevents {STRING 15}\lfrom using {STRING 20}!$" + +gText_PkmnRestoredHPUsing:: @ 85CAFF5 + .string "{STRING 16} restored HP\nusing its {STRING 25}!$" + +gText_PkmnsXMadeYUseless:: @ 85CB012 + .string "{STRING 16}’s {STRING 25}\nmade {STRING 20} useless!$" + +gText_PkmnChangedTypeWith:: @ 85CB02B + .string "{STRING 16}’s {STRING 25}\nmade it the {STRING 0} type!$" + +gText_PkmnPreventsParalysisWith:: @ 85CB048 + .string "{STRING 17}’s {STRING 25}\nprevents paralysis!$" + +gText_PkmnPreventsRomanceWith:: @ 85CB064 + .string "{STRING 16}’s {STRING 25}\nprevents romance!$" + +gText_PkmnPreventsPoisoningWith:: @ 85CB07E + .string "{STRING 17}’s {STRING 25}\nprevents poisoning!$" + +gText_PkmnPreventsConfusionWith:: @ 85CB09A + .string "{STRING 16}’s {STRING 25}\nprevents confusion!$" + +gText_PkmnRaisedFirePowerWith:: @ 85CB0B6 + .string "{STRING 16}’s {STRING 25}\nraised its FIRE power!$" + +gText_PkmnAnchorsItselfWith:: @ 85CB0D5 + .string "{STRING 16} anchors\nitself with {STRING 25}!$" + +gText_PkmnCutsAttackWith:: @ 85CB0F0 + .string "{STRING 19}’s {STRING 26}\ncuts {STRING 16}’s ATTACK!$" + +gText_PkmnPreventsStatLossWith:: @ 85CB10A + .string "{STRING 19}’s {STRING 26}\nprevents stat loss!$" + +gText_PkmnHurtsWith:: @ 85CB126 + .string "{STRING 16}’s {STRING 25}\nhurt {STRING 15}!$" + +gText_PkmnTraced:: @ 85CB137 + .string "{STRING 19} TRACED\n{STRING 0}’s {PLAYER}!$" + +gText_PkmnsXPreventsBurns:: @ 85CB14A + .string "{STRING 17}’s {STRING 27}\nprevents burns!$" + +gText_PkmnsXBlocksY:: @ 85CB162 + .string "{STRING 16}’s {STRING 25}\nblocks {STRING 20}!$" + +gText_PkmnsXBlocksY2:: @ 85CB175 + .string "{STRING 19}’s {STRING 26}\nblocks {STRING 20}!$" + +gText_PkmnsXRestoredHPALittle2:: @ 85CB188 + .string "{STRING 15}’s {STRING 24}\nrestored its HP a little!$" + +gText_PkmnsXWhippedUpSandstorm:: @ 85CB1AA + .string "{STRING 19}’s {STRING 26}\nwhipped up a sandstorm!$" + +gText_PkmnsXIntensifiedSun:: @ 85CB1CA + .string "{STRING 19}’s {STRING 26}\nintensified the sun’s rays!$" + +gText_PkmnsXPreventsYLoss:: @ 85CB1EE + .string "{STRING 19}’s {STRING 26}\nprevents {STRING 0} loss!$" + +gText_PkmnsXInfatuatedY:: @ 85CB208 + .string "{STRING 16}’s {STRING 25}\ninfatuated {STRING 15}!$" + +gText_PkmnsXMadeYIneffective:: @ 85CB21F + .string "{STRING 16}’s {STRING 25}\nmade {STRING 20} ineffective!$" + +gText_PkmnsXCuredYProblem:: @ 85CB23C + .string "{STRING 19}’s {STRING 26}\ncured its {STRING 0} problem!$" + +gText_ItSuckedLiquidOoze:: @ 85CB25A + .string "It sucked up the\nLIQUID OOZE!$" + +gText_PkmnTransformed:: @ 85CB278 + .string "{STRING 19} transformed!$" + +gText_PkmnsXTookAttack:: @ 85CB288 + .string "{STRING 16}’s {STRING 25}\ntook the attack!$" + +gText_PkmnsXPreventsSwitching:: @ 85CB2A1 + .string "{STRING 0}’s {STRING 23}\nprevents switching!\p$" + +gText_PreventedFromWorking:: @ 85CB2BE + .string "{STRING 16}’s {STRING 25}\nprevented {STRING 19}’s\l{STRING 0} from working!$" + +gText_PkmnsXMadeItIneffective:: @ 85CB2E6 + .string "{STRING 19}’s {STRING 26}\nmade it ineffective!$" + +gText_PkmnsXPreventsFlinching:: @ 85CB303 + .string "{STRING 17}’s {STRING 27}\nprevents flinching!$" + +gText_PkmnsXPreventsYsZ:: @ 85CB31F + .string "{STRING 15}’s {STRING 24}\nprevents {STRING 16}’s\l{STRING 25} from working!$" + +gText_PkmnsXCuredItsYProblem:: @ 85CB346 + .string "{STRING 19}’s {STRING 26}\ncured its {STRING 0} problem!$" + +gText_PkmnsXHadNoEffectOnY:: @ 85CB364 + .string "{STRING 19}’s {STRING 26}\nhad no effect on {STRING 17}!$" + +gText_StatSharply:: @ 85CB381 + .string "sharply $" + +gText_StatRose:: @ 85CB38A + .string "rose!$" + +gText_StatHarshly:: @ 85CB390 + .string "harshly $" + +gText_StatFell:: @ 85CB399 + .string "fell!$" + +gText_PkmnsStatChanged:: @ 85CB39F + .string "{STRING 15}’s {STRING 0}\n{PLAYER}$" + +gText_PkmnsStatChanged2:: @ 85CB3AA + .string "{STRING 16}’s {STRING 0}\n{PLAYER}$" + +gText_UsingXTheYOfZN:: @ 85CB3B5 + .string "Using {STRING 22}, the {STRING 0}\nof {STRING 19} {PLAYER}$" + +gText_PkmnsStatChanged3:: @ 85CB3CF + .string "{STRING 15}’s {STRING 0}\n{PLAYER}$" + +gText_PkmnsStatChanged4:: @ 85CB3DA + .string "{STRING 16}’s {STRING 0}\n{PLAYER}$" + +gText_StatsWontIncrease2:: @ 85CB3E5 + .string "{STRING 15}’s stats won’t\ngo any higher!$" + +gText_StatsWontDecrease2:: @ 85CB405 + .string "{STRING 16}’s stats won’t\ngo any lower!$" + +gText_CriticalHit:: @ 85CB424 + .string "A critical hit!$" + +gText_OneHitKO:: @ 85CB434 + .string "It’s a one-hit KO!$" + +gText_123Poof:: @ 85CB447 + .string "{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p$" + +gText_AndEllipsis:: @ 85CB473 + .string "And…\p$" + +gText_HMMovesCantBeForgotten:: @ 85CB479 + .string "HM moves can’t be\nforgotten now.\p$" + +gText_NotVeryEffective:: @ 85CB49B + .string "It’s not very effective…$" + +gText_SuperEffective:: @ 85CB4B4 + .string "It’s super effective!$" + +gText_GotAwaySafely:: @ 85CB4CA + .string "{PLAY_SE 0x0011}Got away safely!\p$" + +gText_PkmnFledUsingIts:: @ 85CB4E0 + .string "{PLAY_SE 0x0011}{STRING 15} fled\nusing its {STRING 22}!\p$" + +gText_PkmnFledUsing:: @ 85CB4FB + .string "{PLAY_SE 0x0011}{STRING 15} fled\nusing {STRING 24}!\p$" + +gText_WildPkmnFled:: @ 85CB512 + .string "{PLAY_SE 0x0011}Wild {STRING 0} fled!$" gUnknown_085CB524:: @ 85CB524 - -.string "Player defeated\n{STRING 32}!$" + .string "Player defeated\n{STRING 32}!$" gUnknown_085CB538:: @ 85CB538 - -.string "Player beat {STRING 32}\nand {STRING 33}!$" + .string "Player beat {STRING 32}\nand {STRING 33}!$" gUnknown_085CB54F:: @ 85CB54F - -.string "Player lost against\n{STRING 32}!$" + .string "Player lost against\n{STRING 32}!$" gUnknown_085CB567:: @ 85CB567 - -.string "Player lost to {STRING 32}\nand {STRING 33}!$" + .string "Player lost to {STRING 32}\nand {STRING 33}!$" gUnknown_085CB581:: @ 85CB581 - -.string "Player battled to a draw against\n{STRING 32}!$" + .string "Player battled to a draw against\n{STRING 32}!$" gUnknown_085CB5A6:: @ 85CB5A6 - -.string "Player battled to a draw against\n{STRING 32} and {STRING 33}!$" + .string "Player battled to a draw against\n{STRING 32} and {STRING 33}!$" gUnknown_085CB5D2:: @ 85CB5D2 - -.string "{PLAY_SE 0x0011}{STRING 32} fled!$" + .string "{PLAY_SE 0x0011}{STRING 32} fled!$" gUnknown_085CB5DF:: @ 85CB5DF + .string "{PLAY_SE 0x0011}{STRING 32} and\n{STRING 33} fled!$" -.string "{PLAY_SE 0x0011}{STRING 32} and\n{STRING 33} fled!$" -.string "No! There’s no running\nfrom a TRAINER battle!\p$" -.string "Can’t escape!\p$" -.string "PROF. BIRCH: Don’t leave me like this!\p$" -.string "But nothing happened!$" -.string "But it failed!$" -.string "It hurt itself in its\nconfusion!$" -.string "The MIRROR MOVE failed!$" -.string "It started to rain!$" -.string "A downpour started!$" -.string "Rain continues to fall.$" -.string "The downpour continues.$" -.string "The rain stopped.$" -.string "A sandstorm brewed!$" -.string "The sandstorm rages.$" -.string "The sandstorm subsided.$" -.string "The sunlight got bright!$" -.string "The sunlight is strong.$" -.string "The sunlight faded.$" -.string "It started to hail!$" -.string "Hail continues to fall.$" -.string "The hail stopped.$" -.string "But it failed to SPIT UP\na thing!$" -.string "But it failed to SWALLOW\na thing!$" -.string "The wind turned into a\nHEAT WAVE!$" -.string "All stat changes were\neliminated!$" -.string "Coins scattered everywhere!$" -.string "It was too weak to make\na SUBSTITUTE!$" -.string "The battlers shared\ntheir pain!$" -.string "A bell chimed!$" -.string "All affected POKéMON will\nfaint in three turns!$" -.string "There’s no PP left for\nthis move!\p$" -.string "But there was no PP left\nfor the move!$" -.string "{STRING 15} ignored\norders while asleep!$" -.string "{STRING 15} ignored\norders!$" -.string "{STRING 15} began to nap!$" -.string "{STRING 15} is\nloafing around!$" -.string "{STRING 15} won’t\nobey!$" -.string "{STRING 15} turned away!$" -.string "{STRING 15} pretended\nnot to notice!$" -.string "{STRING 28} {STRING 29} is\nabout to use {PLAYER}.\pWill {STRING 35} change\nPOKéMON?$" -.string "{STRING 15} learned\n{STRING 0}!$" +gText_NoRunningFromTrainers:: @ 85CB5F3 + .string "No! There’s no running\nfrom a TRAINER battle!\p$" -gUnknown_085CBA2E:: @ 85CBA2E +gText_CantEscape:: @ 85CB622 + .string "Can’t escape!\p$" -.string "Player defeated\n{STRING 28} {STRING 29}!\p$" -.string "{STRING 35} crept closer to\n{RIVAL}!$" -.string "{STRING 35} can’t get any closer!$" -.string "{RIVAL} is watching\ncarefully!$" -.string "{RIVAL} is curious about\nthe {STRING 0}!$" -.string "{RIVAL} is enthralled by\nthe {STRING 0}!$" -.string "{RIVAL} completely ignored\nthe {STRING 0}!$" -.string "{STRING 35} threw a {POKEBLOCK}\nat the {RIVAL}!$" -.string "{PLAY_SE 0x0049}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p$" -.string "{RIVAL} appeared!\p$" +gText_DontLeaveBirch:: @ 85CB631 + .string "PROF. BIRCH: Don’t leave me like this!\p$" + +gText_ButNothingHappened:: @ 85CB659 + .string "But nothing happened!$" + +gText_ButItFailed:: @ 85CB66F + .string "But it failed!$" + +gText_ItHurtConfusion:: @ 85CB67E + .string "It hurt itself in its\nconfusion!$" + +gText_MirrorMoveFailed:: @ 85CB69F + .string "The MIRROR MOVE failed!$" + +gText_StartedToRain:: @ 85CB6B7 + .string "It started to rain!$" + +gText_DownpourStarted:: @ 85CB6CB + .string "A downpour started!$" + +gText_RainContinues:: @ 85CB6DF + .string "Rain continues to fall.$" + +gText_DownpourContinues:: @ 85CB6F7 + .string "The downpour continues.$" + +gText_RainStopped:: @ 85CB70F + .string "The rain stopped.$" + +gText_SandstormBrewed:: @ 85CB721 + .string "A sandstorm brewed!$" + +gText_SandstormRages:: @ 85CB735 + .string "The sandstorm rages.$" + +gText_SandstormSubsided:: @ 85CB74A + .string "The sandstorm subsided.$" + +gText_SunlightGotBright:: @ 85CB762 + .string "The sunlight got bright!$" + +gText_SunlightStrong:: @ 85CB77B + .string "The sunlight is strong.$" + +gText_SunlightFaded:: @ 85CB793 + .string "The sunlight faded.$" + +gText_StartedHail:: @ 85CB7A7 + .string "It started to hail!$" + +gText_HailContinues:: @ 85CB7BB + .string "Hail continues to fall.$" + +gText_HailStopped:: @ 85CB7D3 + .string "The hail stopped.$" + +gText_FailedToSpitUp:: @ 85CB7E5 + .string "But it failed to SPIT UP\na thing!$" + +gText_FailedToSwallow:: @ 85CB807 + .string "But it failed to SWALLOW\na thing!$" + +gText_WindBecameHeatWave:: @ 85CB829 + .string "The wind turned into a\nHEAT WAVE!$" + +gText_StatChangesGone:: @ 85CB84B + .string "All stat changes were\neliminated!$" + +gText_CoinsScattered:: @ 85CB86D + .string "Coins scattered everywhere!$" + +gText_TooWeakForSubstitute:: @ 85CB889 + .string "It was too weak to make\na SUBSTITUTE!$" + +gText_SharedPain:: @ 85CB8AF + .string "The battlers shared\ntheir pain!$" + +gText_BellChimed:: @ 85CB8CF + .string "A bell chimed!$" + +gText_FaintInThree:: @ 85CB8DE + .string "All affected POKéMON will\nfaint in three turns!$" + +gText_NoPPLeft:: @ 85CB90E + .string "There’s no PP left for\nthis move!\p$" + +gText_ButNoPPLeft:: @ 85CB931 + .string "But there was no PP left\nfor the move!$" + +gText_PkmnIgnoresAsleep:: @ 85CB958 + .string "{STRING 15} ignored\norders while asleep!$" + +gText_PkmnIgnoredOrders:: @ 85CB978 + .string "{STRING 15} ignored\norders!$" + +gText_PkmnBeganToNap:: @ 85CB98B + .string "{STRING 15} began to nap!$" + +gText_PkmnLoafing:: @ 85CB99C + .string "{STRING 15} is\nloafing around!$" + +gText_PkmnWontObey:: @ 85CB9B2 + .string "{STRING 15} won’t\nobey!$" + +gText_PkmnTurnedAway:: @ 85CB9C1 + .string "{STRING 15} turned away!$" + +gText_PkmnPretendNotNotice:: @ 85CB9D1 + .string "{STRING 15} pretended\nnot to notice!$" + +gText_EnemyAboutToSwitchPkmn:: @ 85CB9ED + .string "{STRING 28} {STRING 29} is\nabout to use {PLAYER}.\pWill {STRING 35} change\nPOKéMON?$" + +gText_PkmnLearnedMove2:: @ 85CBA1F + .string "{STRING 15} learned\n{STRING 0}!$" + +gText_PlayerDefeatedXY:: @ 85CBA2E + .string "Player defeated\n{STRING 28} {STRING 29}!\p$" + +gText_CreptCloser:: @ 85CBA46 + .string "{STRING 35} crept closer to\n{RIVAL}!$" + +gText_CantGetCloser:: @ 85CBA5D + .string "{STRING 35} can’t get any closer!$" + +gText_PkmnWatchingCarefully:: @ 85CBA76 + .string "{RIVAL} is watching\ncarefully!$" + +gText_PkmnCuriousAboutX:: @ 85CBA90 + .string "{RIVAL} is curious about\nthe {STRING 0}!$" + +gText_PkmnEnthralledByX:: @ 85CBAAC + .string "{RIVAL} is enthralled by\nthe {STRING 0}!$" + +gText_PkmnIgnoredX:: @ 85CBAC8 + .string "{RIVAL} completely ignored\nthe {STRING 0}!$" + +gText_ThrewPokeblockAtPkmn:: @ 85CBAE6 + .string "{STRING 35} threw a {POKEBLOCK}\nat the {RIVAL}!$" + +gText_OutOfSafariBalls:: @ 85CBB02 + .string "{PLAY_SE 0x0049}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p$" + + .string "{RIVAL} appeared!\p$" gUnknown_085CBB47:: @ 85CBB47 - -.string "Wild {RIVAL} appeared!\p$" + .string "Wild {RIVAL} appeared!\p$" gUnknown_085CBB5A:: @ 85CBB5A - -.string "Wild {RIVAL} appeared!\p$" + .string "Wild {RIVAL} appeared!\p$" gUnknown_085CBB6D:: @ 85CBB6D - -.string "Wild {RIVAL} appeared!{PAUSE 127}$" + .string "Wild {RIVAL} appeared!{PAUSE 127}$" gUnknown_085CBB82:: @ 85CBB82 - -.string "Wild {RIVAL} and\n{AQUA} appeared!\p$" + .string "Wild {RIVAL} and\n{AQUA} appeared!\p$" gUnknown_085CBB9C:: @ 85CBB9C - -.string "{STRING 28} {STRING 29}\nwould like to battle!\p$" + .string "{STRING 28} {STRING 29}\nwould like to battle!\p$" gUnknown_085CBBB9:: @ 85CBBB9 - -.string "{STRING 32}\nwants to battle!$" + .string "{STRING 32}\nwants to battle!$" gUnknown_085CBBCD:: @ 85CBBCD - -.string "{STRING 32} and {STRING 33}\nwant to battle!$" + .string "{STRING 32} and {STRING 33}\nwant to battle!$" gUnknown_085CBBE7:: @ 85CBBE7 - -.string "{STRING 28} {STRING 29} sent\nout {RIVAL}!$" + .string "{STRING 28} {STRING 29} sent\nout {RIVAL}!$" gUnknown_085CBBFA:: @ 85CBBFA - -.string "{STRING 28} {STRING 29} sent\nout {RIVAL} and {AQUA}!$" + .string "{STRING 28} {STRING 29} sent\nout {RIVAL} and {AQUA}!$" gUnknown_085CBC14:: @ 85CBC14 - -.string "{STRING 28} {STRING 29} sent\nout {STRING 0}!$" + .string "{STRING 28} {STRING 29} sent\nout {STRING 0}!$" gUnknown_085CBC27:: @ 85CBC27 - -.string "{STRING 32} sent out\n{RIVAL}!$" + .string "{STRING 32} sent out\n{RIVAL}!$" gUnknown_085CBC37:: @ 85CBC37 - -.string "{STRING 32} sent out\n{RIVAL} and {AQUA}!$" + .string "{STRING 32} sent out\n{RIVAL} and {AQUA}!$" gUnknown_085CBC4E:: @ 85CBC4E - -.string "{STRING 32} sent out {STRING 10}!\n{STRING 33} sent out {STRING 12}!$" + .string "{STRING 32} sent out {STRING 10}!\n{STRING 33} sent out {STRING 12}!$" gUnknown_085CBC6E:: @ 85CBC6E - -.string "{STRING 32} sent out\n{STRING 0}!$" + .string "{STRING 32} sent out\n{STRING 0}!$" gUnknown_085CBC7E:: @ 85CBC7E - -.string "{STRING 34} sent out\n{STRING 0}!$" + .string "{STRING 34} sent out\n{STRING 0}!$" gUnknown_085CBC8E:: @ 85CBC8E - -.string "Go! {STRING 5}!$" + .string "Go! {STRING 5}!$" gUnknown_085CBC96:: @ 85CBC96 - -.string "Go! {STRING 5} and\n{VERSION}!$" + .string "Go! {STRING 5} and\n{VERSION}!$" gUnknown_085CBCA5:: @ 85CBCA5 - -.string "Go! {STRING 0}!$" + .string "Go! {STRING 0}!$" gUnknown_085CBCAD:: @ 85CBCAD - -.string "Do it! {STRING 0}!$" + .string "Do it! {STRING 0}!$" gUnknown_085CBCB8:: @ 85CBCB8 - -.string "Go for it, {STRING 0}!$" + .string "Go for it, {STRING 0}!$" gUnknown_085CBCC7:: @ 85CBCC7 - -.string "Your foe’s weak!\nGet ’em, {STRING 0}!$" + .string "Your foe’s weak!\nGet ’em, {STRING 0}!$" gUnknown_085CBCE5:: @ 85CBCE5 - -.string "{STRING 31} sent out {STRING 11}!\nGo! {STRING 9}!$" + .string "{STRING 31} sent out {STRING 11}!\nGo! {STRING 9}!$" gUnknown_085CBCFD:: @ 85CBCFD - -.string "{STRING 0}, that’s enough!\nCome back!$" + .string "{STRING 0}, that’s enough!\nCome back!$" gUnknown_085CBD1B:: @ 85CBD1B - -.string "{STRING 0}, come back!$" + .string "{STRING 0}, come back!$" gUnknown_085CBD2A:: @ 85CBD2A - -.string "{STRING 0}, OK!\nCome back!$" + .string "{STRING 0}, OK!\nCome back!$" gUnknown_085CBD3D:: @ 85CBD3D - -.string "{STRING 0}, good!\nCome back!$" + .string "{STRING 0}, good!\nCome back!$" gUnknown_085CBD52:: @ 85CBD52 - -.string "{STRING 28} {STRING 29}\nwithdrew {STRING 0}!$" + .string "{STRING 28} {STRING 29}\nwithdrew {STRING 0}!$" gUnknown_085CBD65:: @ 85CBD65 - -.string "{STRING 32} withdrew\n{STRING 0}!$" + .string "{STRING 32} withdrew\n{STRING 0}!$" gUnknown_085CBD75:: @ 85CBD75 - -.string "{STRING 34} withdrew\n{STRING 0}!$" + .string "{STRING 34} withdrew\n{STRING 0}!$" gUnknown_085CBD85:: @ 85CBD85 - -.string "Wild $" + .string "Wild $" gUnknown_085CBD8B:: @ 85CBD8B + .string "Foe $" -.string "Foe $" -.string "$" + .string "$" gUnknown_085CBD91:: @ 85CBD91 - -.string "Foe$" + .string "Foe$" gUnknown_085CBD95:: @ 85CBD95 - -.string "Ally$" + .string "Ally$" gUnknown_085CBD9A:: @ 85CBD9A - -.string "Foe$" + .string "Foe$" gUnknown_085CBD9E:: @ 85CBD9E - -.string "Ally$" + .string "Ally$" gUnknown_085CBDA3:: @ 85CBDA3 - -.string "Foe$" + .string "Foe$" gUnknown_085CBDA7:: @ 85CBDA7 - -.string "Ally$" + .string "Ally$" gUnknown_085CBDAC:: @ 85CBDAC - -.string "{STRING 15} used\n{PLAYER}$" + .string "{STRING 15} used\n{PLAYER}$" gUnknown_085CBDB7:: @ 85CBDB7 - -.string "!$" + .string "!$" gUnknown_085CBDB9:: @ 85CBDB9 - -.string "!$" + .string "!$" gUnknown_085CBDBB:: @ 85CBDBB - -.string "!$" + .string "!$" gUnknown_085CBDBD:: @ 85CBDBD - -.string "!$" + .string "!$" gUnknown_085CBDBF:: @ 85CBDBF - .incbin "baserom.gba", 0x5cbdbf, 0x41 + .string "!$" +gUnknown_085CBDC1:: @ 85CBDC1 + .string "HP$" + +gUnknown_085CBDC4:: @ 85CBDC4 + .string "ATTACK$" + +gUnknown_085CBDCB:: @ 85CBDCB + .string "DEFENSE$" + +gUnknown_085CBDD3:: @ 85CBDD3 + .string "SPEED$" + +gUnknown_085CBDD9:: @ 85CBDD9 + .string "SP. ATK$" + +gUnknown_085CBDE1:: @ 85CBDE1 + .string "SP. DEF$" + +gUnknown_085CBDE9:: @ 85CBDE9 + .string "accuracy$" + +gUnknown_085CBDF2:: @ 85CBDF2 + .string "evasiveness$" + + .align 2 gStatNamesTable:: @ 85CBE00 - .incbin "baserom.gba", 0x5cbe00, 0x6c + .4byte gUnknown_085CBDC1 + .4byte gUnknown_085CBDC4 + .4byte gUnknown_085CBDCB + .4byte gUnknown_085CBDD3 + .4byte gUnknown_085CBDD9 + .4byte gUnknown_085CBDE1 + .4byte gUnknown_085CBDE9 + .4byte gUnknown_085CBDF2 +gUnknown_085CBE20:: @ 85CBE20 + .string "was too spicy!$" + +gUnknown_085CBE2F:: @ 85CBE2F + .string "was too dry!$" + +gUnknown_085CBE3C:: @ 85CBE3C + .string "was too sweet!$" + +gUnknown_085CBE4B:: @ 85CBE4B + .string "was too bitter!$" + +gUnknown_085CBE5B:: @ 85CBE5B + .string "was too sour!$" + + .align 2 gUnknown_085CBE6C:: @ 85CBE6C - .incbin "baserom.gba", 0x5cbe6c, 0x1a9 - -gUnknown_085CC015:: @ 85CC015 + .4byte gUnknown_085CBE20 + .4byte gUnknown_085CBE2F + .4byte gUnknown_085CBE3C + .4byte gUnknown_085CBE4B + .4byte gUnknown_085CBE5B -.string "someone’s$" +gText_XUsedY:: @ 85CBE80 + .string "{STRING 35} used\n{STRING 22}!$" + +gText_WallyUsedY:: @ 85CBE8C + .string "WALLY used\n{STRING 22}!$" + +gText_XYUsedZ:: @ 85CBE9B + .string "{STRING 28} {STRING 29}\nused {STRING 22}!$" + +gText_TrainerBlockedBall:: @ 85CBEAA + .string "The TRAINER blocked the BALL!$" + +gText_DontBeAThief:: @ 85CBEC8 + .string "Don’t be a thief!$" + +gText_ItDodgedBall:: @ 85CBEDA + .string "It dodged the thrown BALL!\nThis POKéMON can’t be caught!$" + +gText_YouMissedPkmn:: @ 85CBF13 + .string "You missed the POKéMON!$" + +gText_PkmnBrokeFree:: @ 85CBF2B + .string "Oh, no!\nThe POKéMON broke free!$" + +gText_ItAppearedCaught:: @ 85CBF4B + .string "Aww!\nIt appeared to be caught!$" + +gText_AarghAlmostHadIt:: @ 85CBF6A + .string "Aargh!\nAlmost had it!$" + +gText_ShootSoClose:: @ 85CBF80 + .string "Shoot!\nIt was so close, too!$" + +gText_GotchaPkmnCaught:: @ 85CBF9D + .string "Gotcha!\n{RIVAL} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p$" + +gText_GotchaPkmnCaught2:: @ 85CBFBB + .string "Gotcha!\n{RIVAL} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}$" + +gText_GiveNicknameCaptured:: @ 85CBFDB + .string "Give a nickname to the\ncaptured {RIVAL}?$" + +gText_PkmnSentToPC:: @ 85CBFFF + .string "{RIVAL} was sent to\n{STRING 39} PC.$" + +gUnknown_085CC015:: @ 85CC015 + .string "someone’s$" gUnknown_085CC01F:: @ 85CC01F + .string "LANETTE’s$" -.string "LANETTE’s$" -.string "{RIVAL}’s data was\nadded to the POKéDEX.\p$" -.string "It is raining.$" -.string "A sandstorm is raging.$" -.string "The BOX is full!\nYou can’t catch any more!\p$" +gText_PkmnDataAddedToDex:: @ 85CC029 + .string "{RIVAL}’s data was\nadded to the POKéDEX.\p$" + +gText_ItIsRaining:: @ 85CC04E + .string "It is raining.$" + +gText_SandstormIsRaging:: @ 85CC05D + .string "A sandstorm is raging.$" + +gText_BoxIsFull:: @ 85CC074 + .string "The BOX is full!\nYou can’t catch any more!\p$" gUnknown_085CC0A0:: @ 85CC0A0 - -.string "ENIGMA BERRY$" + .string "ENIGMA BERRY$" gUnknown_085CC0AD:: @ 85CC0AD + .string " BERRY$" -.string " BERRY$" -.string "{STRING 19}’s {STRING 22}\ncured paralysis!$" -.string "{STRING 19}’s {STRING 22}\ncured poison!$" -.string "{STRING 19}’s {STRING 22}\nhealed its burn!$" -.string "{STRING 19}’s {STRING 22}\ndefrosted it!$" -.string "{STRING 19}’s {STRING 22}\nwoke it from its sleep!$" -.string "{STRING 19}’s {STRING 22}\nsnapped it out of confusion!$" -.string "{STRING 19}’s {STRING 22}\ncured its {STRING 0} problem!$" -.string "{STRING 19}’s {STRING 22}\nnormalized its status!$" -.string "{STRING 19}’s {STRING 22}\nrestored health!$" -.string "{STRING 19}’s {STRING 22}\nrestored {STRING 0}’s PP!$" -.string "{STRING 19}’s {STRING 22}\nrestored its status!$" -.string "{STRING 19}’s {STRING 22}\nrestored its HP a little!$" -.string "{STRING 22} allows the\nuse of only {STRING 20}!\p$" -.string "{STRING 16} hung on\nusing its {STRING 22}!$" +gText_PkmnsXCuredParalysis:: @ 85CC0B4 + .string "{STRING 19}’s {STRING 22}\ncured paralysis!$" -gUnknown_085CC23E:: @ 85CC23E +gText_PkmnsXCuredPoison:: @ 85CC0CD + .string "{STRING 19}’s {STRING 22}\ncured poison!$" -.string "$" -.string "You throw a BALL now, right?\nI‥ I’ll do my best!$" +gText_PkmnsXHealedBurn:: @ 85CC0E3 + .string "{STRING 19}’s {STRING 22}\nhealed its burn!$" +gText_PkmnsXDefrostedIt:: @ 85CC0FC + .string "{STRING 19}’s {STRING 22}\ndefrosted it!$" + +gText_PkmnsXWokeIt:: @ 85CC112 + .string "{STRING 19}’s {STRING 22}\nwoke it from its sleep!$" + +gText_PkmnsXSnappedOut:: @ 85CC132 + .string "{STRING 19}’s {STRING 22}\nsnapped it out of confusion!$" + +gText_PkmnsXCuredProblem:: @ 85CC157 + .string "{STRING 19}’s {STRING 22}\ncured its {STRING 0} problem!$" + +gText_PkmnsXNormalizedStatus:: @ 85CC175 + .string "{STRING 19}’s {STRING 22}\nnormalized its status!$" + +gText_PkmnsXRestoredHealth:: @ 85CC194 + .string "{STRING 19}’s {STRING 22}\nrestored health!$" + +gText_PkmnsXRestoredPP:: @ 85CC1AD + .string "{STRING 19}’s {STRING 22}\nrestored {STRING 0}’s PP!$" + +gText_PkmnsXRestoredStatus:: @ 85CC1C7 + .string "{STRING 19}’s {STRING 22}\nrestored its status!$" + +gText_PkmnsXRestoredHPALittle:: @ 85CC1E4 + .string "{STRING 19}’s {STRING 22}\nrestored its HP a little!$" + +gText_XAllowsOnlyY:: @ 85CC206 + .string "{STRING 22} allows the\nuse of only {STRING 20}!\p$" + +gText_PkmnHungOnWithX:: @ 85CC225 + .string "{STRING 16} hung on\nusing its {STRING 22}!$" + +gText_EmptyString3:: @ 85CC23E + .string "$" + +gText_YouThrowABallNowRight:: @ 85CC23F + .string "You throw a BALL now, right?\nI… I’ll do my best!$" + + .align 2 gUnknown_085CC270:: @ 85CC270 - .incbin "baserom.gba", 0x5cc270, 0x5c4 + .4byte gText_Buffer36 + .4byte gText_PkmnGainedEXP + .4byte gText_PkmnGrewToLv + .4byte gText_PkmnLearnedMove + .4byte gText_TryToLearnMove1 + .4byte gText_TryToLearnMove2 + .4byte gText_TryToLearnMove3 + .4byte gText_PkmnForgotMove + .4byte gText_StopLearningMove + .4byte gText_DidNotLearnMove + .4byte gText_PkmnLearnedMove2 + .4byte gText_AttackMissed + .4byte gText_PkmnProtectedItself + .4byte gText_StatsWontIncrease2 + .4byte gText_AvoidedDamage + .4byte gText_ItDoesntAffect + .4byte gText_PkmnFainted + .4byte gText_PkmnFainted2 + .4byte gText_PlayerGotMoney + .4byte gText_PlayerWhiteout + .4byte gText_PlayerWhiteout2 + .4byte gText_PreventsEscape + .4byte gText_HitXTimes + .4byte gText_PkmnFellAsleep + .4byte gText_PkmnMadeSleep + .4byte gText_PkmnAlreadyAsleep + .4byte gText_PkmnAlreadyAsleep2 + .4byte gText_PkmnWasntAffected + .4byte gText_PkmnWasPoisoned + .4byte gText_PkmnPoisonedBy + .4byte gText_PkmnHurtByPoison + .4byte gText_PkmnAlreadyPoisoned + .4byte gText_PkmnBadlyPoisoned + .4byte gText_PkmnEnergyDrained + .4byte gText_PkmnWasBurned + .4byte gText_PkmnBurnedBy + .4byte gText_PkmnHurtByBurn + .4byte gText_PkmnWasFrozen + .4byte gText_PkmnFrozenBy + .4byte gText_PkmnIsFrozen + .4byte gText_PkmnWasDefrosted + .4byte gText_PkmnWasDefrosted2 + .4byte gText_PkmnWasDefrostedBy + .4byte gText_PkmnWasParalyzed + .4byte gText_PkmnWasParalyzedBy + .4byte gText_PkmnIsParalyzed + .4byte gText_PkmnIsAlreadyParalyzed + .4byte gText_PkmnHealedParalysis + .4byte gText_PkmnDreamEaten + .4byte gText_StatsWontIncrease + .4byte gText_StatsWontDecrease + .4byte gText_TeamStoppedWorking + .4byte gText_FoeStoppedWorking + .4byte gText_PkmnIsConfused + .4byte gText_PkmnHealedConfusion + .4byte gText_PkmnWasConfused + .4byte gText_PkmnAlreadyConfused + .4byte gText_PkmnFellInLove + .4byte gText_PkmnInLove + .4byte gText_PkmnImmobilizedByLove + .4byte gText_PkmnBlownAway + .4byte gText_PkmnChangedType + .4byte gText_PkmnFlinched + .4byte gText_PkmnRegainedHealth + .4byte gText_PkmnHPFull + .4byte gText_PkmnRaisedSpDef + .4byte gText_PkmnRaisedDef + .4byte gText_PkmnCoveredByVeil + .4byte gText_PkmnUsedSafeguard + .4byte gText_PkmnSafeguardExpired + .4byte gText_PkmnWentToSleep + .4byte gText_PkmnSleptHealthy + .4byte gText_PkmnWhippedWhirlwind + .4byte gText_PkmnTookSunlight + .4byte gText_PkmnLoweredHead + .4byte gText_PkmnIsGlowing + .4byte gText_PkmnFlewHigh + .4byte gText_PkmnDugHole + .4byte gText_PkmnSqueezedByBind + .4byte gText_PkmnTrappedInVortex + .4byte gText_PkmnWrappedBy + .4byte gText_PkmnClamped + .4byte gText_PkmnHurtBy + .4byte gText_PkmnFreedFrom + .4byte gText_PkmnCrashed + .4byte gText_PkmnShroudedInMist + .4byte gText_PkmnProtectedByMist + .4byte gText_PkmnGettingPumped + .4byte gText_PkmnHitWithRecoil + .4byte gText_PkmnProtectedItself2 + .4byte gText_PkmnBuffetedBySandstorm + .4byte gText_PkmnPeltedByHail + .4byte gText_PkmnSeeded + .4byte gText_PkmnEvadedAttack + .4byte gText_PkmnSappedByLeechSeed + .4byte gText_PkmnFastAsleep + .4byte gText_PkmnWokeUp + .4byte gText_PkmnUproarKeptAwake + .4byte gText_PkmnWokeUpInUproar + .4byte gText_PkmnCausedUproar + .4byte gText_PkmnMakingUproar + .4byte gText_PkmnCalmedDown + .4byte gText_PkmnCantSleepInUproar + .4byte gText_PkmnStockpiled + .4byte gText_PkmnCantStockpile + .4byte gText_PkmnCantSleepInUproar2 + .4byte gText_UproarKeptPkmnAwake + .4byte gText_PkmnStayedAwakeUsing + .4byte gText_PkmnStoringEnergy + .4byte gText_PkmnUnleashedEnergy + .4byte gText_PkmnFatigueConfusion + .4byte gText_PkmnPickedUpItem + .4byte gText_PkmnUnaffected + .4byte gText_PkmnTransformedInto + .4byte gText_PkmnMadeSubstitute + .4byte gText_PkmnHasSubstitute + .4byte gText_SubstituteDamaged + .4byte gText_PkmnSubstituteFaded + .4byte gText_PkmnMustRecharge + .4byte gText_PkmnRageBuilding + .4byte gText_PkmnMoveWasDisabled + .4byte gText_PkmnMoveIsDisabled + .4byte gText_PkmnMoveDisabledNoMore + .4byte gText_PkmnGotEncore + .4byte gText_PkmnEncoreEnded + .4byte gText_PkmnTookAim + .4byte gText_PkmnSketchedMove + .4byte gText_PkmnTryingToTakeFoe + .4byte gText_PkmnTookFoe + .4byte gText_PkmnReducedPP + .4byte gText_PkmnStoleItem + .4byte gText_PkmnCantEscape + .4byte gText_PkmnFellIntoNightmare + .4byte gText_PkmnLockedInNightmare + .4byte gText_PkmnLaidCurse + .4byte gText_PkmnAfflictedByCurse + .4byte gText_SpikesScattered + .4byte gText_PkmnHurtBySpikes + .4byte gText_PkmnIdentified + .4byte gText_PkmnPerishCountFell + .4byte gText_PkmnBracedItself + .4byte gText_PkmnEnduredHit + .4byte gText_MagnitudeStrength + .4byte gText_PkmnCutHPMaxedAttack + .4byte gText_PkmnCopiedStatChanges + .4byte gText_PkmnGotFree + .4byte gText_PkmnShedLeechSeed + .4byte gText_PkmnBlewAwaySpikes + .4byte gText_PkmnFledFromBattle + .4byte gText_PkmnForesawAttack + .4byte gText_PkmnTookAttack + .4byte gText_PkmnAttack + .4byte gText_PkmnCenterAttention + .4byte gText_PkmnChargingPower + .4byte gText_NaturePowerTurnedInto + .4byte gText_PkmnStatusNormal + .4byte gText_PkmnHasNoMovesLeft + .4byte gText_PkmnSubjectedToTorment + .4byte gText_PkmnCantUseMoveTorment + .4byte gText_PkmnTighteningFocus + .4byte gText_PkmnFellForTaunt + .4byte gText_PkmnCantUseMoveTaunt + .4byte gText_PkmnReadyToHelp + .4byte gText_PkmnSwitchedItems + .4byte gText_PkmnCopiedFoe + .4byte gText_PkmnMadeWish + .4byte gText_PkmnWishCameTrue + .4byte gText_PkmnPlantedRoots + .4byte gText_PkmnAbsorbedNutrients + .4byte gText_PkmnAnchoredItself + .4byte gText_PkmnWasMadeDrowsy + .4byte gText_PkmnKnockedOff + .4byte gText_PkmnSwappedAbilities + .4byte gText_PkmnSealedOpponentMove + .4byte gText_PkmnCantUseMoveSealed + .4byte gText_PkmnWantsGrudge + .4byte gText_PkmnLostPPGrudge + .4byte gText_PkmnShroudedItself + .4byte gText_PkmnMoveBounced + .4byte gText_PkmnWaitsForTarget + .4byte gText_PkmnSnatchedMove + .4byte gText_PkmnMadeItRain + .4byte gText_PkmnRaisedSpeed + .4byte gText_PkmnProtectedBy + .4byte gText_PkmnPreventsUsage + .4byte gText_PkmnRestoredHPUsing + .4byte gText_PkmnChangedTypeWith + .4byte gText_PkmnPreventsParalysisWith + .4byte gText_PkmnPreventsRomanceWith + .4byte gText_PkmnPreventsPoisoningWith + .4byte gText_PkmnPreventsConfusionWith + .4byte gText_PkmnRaisedFirePowerWith + .4byte gText_PkmnAnchorsItselfWith + .4byte gText_PkmnCutsAttackWith + .4byte gText_PkmnPreventsStatLossWith + .4byte gText_PkmnHurtsWith + .4byte gText_PkmnTraced + .4byte gText_StatSharply + .4byte gText_StatRose + .4byte gText_StatHarshly + .4byte gText_StatFell + .4byte gText_PkmnsStatChanged + .4byte gText_PkmnsStatChanged2 + .4byte gText_PkmnsStatChanged3 + .4byte gText_PkmnsStatChanged4 + .4byte gText_CriticalHit + .4byte gText_OneHitKO + .4byte gText_123Poof + .4byte gText_AndEllipsis + .4byte gText_NotVeryEffective + .4byte gText_SuperEffective + .4byte gText_GotAwaySafely + .4byte gText_WildPkmnFled + .4byte gText_NoRunningFromTrainers + .4byte gText_CantEscape + .4byte gText_DontLeaveBirch + .4byte gText_ButNothingHappened + .4byte gText_ButItFailed + .4byte gText_ItHurtConfusion + .4byte gText_MirrorMoveFailed + .4byte gText_StartedToRain + .4byte gText_DownpourStarted + .4byte gText_RainContinues + .4byte gText_DownpourContinues + .4byte gText_RainStopped + .4byte gText_SandstormBrewed + .4byte gText_SandstormRages + .4byte gText_SandstormSubsided + .4byte gText_SunlightGotBright + .4byte gText_SunlightStrong + .4byte gText_SunlightFaded + .4byte gText_StartedHail + .4byte gText_HailContinues + .4byte gText_HailStopped + .4byte gText_FailedToSpitUp + .4byte gText_FailedToSwallow + .4byte gText_WindBecameHeatWave + .4byte gText_StatChangesGone + .4byte gText_CoinsScattered + .4byte gText_TooWeakForSubstitute + .4byte gText_SharedPain + .4byte gText_BellChimed + .4byte gText_FaintInThree + .4byte gText_NoPPLeft + .4byte gText_ButNoPPLeft + .4byte gText_XUsedY + .4byte gText_WallyUsedY + .4byte gText_TrainerBlockedBall + .4byte gText_DontBeAThief + .4byte gText_ItDodgedBall + .4byte gText_YouMissedPkmn + .4byte gText_PkmnBrokeFree + .4byte gText_ItAppearedCaught + .4byte gText_AarghAlmostHadIt + .4byte gText_ShootSoClose + .4byte gText_GotchaPkmnCaught + .4byte gText_GotchaPkmnCaught2 + .4byte gText_GiveNicknameCaptured + .4byte gText_PkmnSentToPC + .4byte gText_PkmnDataAddedToDex + .4byte gText_ItIsRaining + .4byte gText_SandstormIsRaging + .4byte gText_CantEscape2 + .4byte gText_PkmnIgnoresAsleep + .4byte gText_PkmnIgnoredOrders + .4byte gText_PkmnBeganToNap + .4byte gText_PkmnLoafing + .4byte gText_PkmnWontObey + .4byte gText_PkmnTurnedAway + .4byte gText_PkmnPretendNotNotice + .4byte gText_EnemyAboutToSwitchPkmn + .4byte gText_CreptCloser + .4byte gText_CantGetCloser + .4byte gText_PkmnWatchingCarefully + .4byte gText_PkmnCuriousAboutX + .4byte gText_PkmnEnthralledByX + .4byte gText_PkmnIgnoredX + .4byte gText_ThrewPokeblockAtPkmn + .4byte gText_OutOfSafariBalls + .4byte gText_PkmnsXCuredParalysis + .4byte gText_PkmnsXCuredPoison + .4byte gText_PkmnsXHealedBurn + .4byte gText_PkmnsXDefrostedIt + .4byte gText_PkmnsXWokeIt + .4byte gText_PkmnsXSnappedOut + .4byte gText_PkmnsXCuredProblem + .4byte gText_PkmnsXRestoredHealth + .4byte gText_PkmnsXRestoredPP + .4byte gText_PkmnsXRestoredStatus + .4byte gText_PkmnsXRestoredHPALittle + .4byte gText_XAllowsOnlyY + .4byte gText_PkmnHungOnWithX + .4byte gText_EmptyString3 + .4byte gText_PkmnsXPreventsBurns + .4byte gText_PkmnsXBlocksY + .4byte gText_PkmnsXRestoredHPALittle2 + .4byte gText_PkmnsXWhippedUpSandstorm + .4byte gText_PkmnsXPreventsYLoss + .4byte gText_PkmnsXInfatuatedY + .4byte gText_PkmnsXMadeYIneffective + .4byte gText_PkmnsXCuredYProblem + .4byte gText_ItSuckedLiquidOoze + .4byte gText_PkmnTransformed + .4byte gText_ElectricityWeakened + .4byte gText_FireWeakened + .4byte gText_PkmnHidUnderwater + .4byte gText_PkmnSprangUp + .4byte gText_HMMovesCantBeForgotten + .4byte gText_XFoundOneY + .4byte gText_PlayerDefeatedXY + .4byte gText_SoothingAroma + .4byte gText_ItemsCantBeUsedNow + .4byte gText_ForXCommaYZ + .4byte gText_UsingXTheYOfZN + .4byte gText_PkmnUsedXToGetPumped + .4byte gText_PkmnsXMadeYUseless + .4byte gText_PkmnTrappedBySandTomb + .4byte gText_EmptyString4 + .4byte gText_ABoosted + .4byte gText_PkmnsXIntensifiedSun + .4byte gText_PkmnMakesGroundMiss + .4byte gText_YouThrowABallNowRight + .4byte gText_PkmnsXTookAttack + .4byte gText_PkmnChoseXAsDestiny + .4byte gText_PkmnLostFocus + .4byte gText_UseNextPkmn + .4byte gText_PkmnFledUsingIts + .4byte gText_PkmnFledUsing + .4byte gText_PkmnWasDraggedOut + .4byte gText_PreventedFromWorking + .4byte gText_PkmnsXNormalizedStatus + .4byte gText_XYUsedZ + .4byte gText_BoxIsFull + .4byte gText_PkmnAvoidedAttack + .4byte gText_PkmnsXMadeItIneffective + .4byte gText_PkmnsXPreventsFlinching + .4byte gText_PkmnAlreadyHasBurn + .4byte gText_StatsWontDecrease2 + .4byte gText_PkmnsXBlocksY2 + .4byte gText_PkmnsXWoreOff + .4byte gText_PkmnRaisedDefALittle + .4byte gText_PkmnRaisedSpDefALittle + .4byte gText_TheWallShattered + .4byte gText_PkmnsXPreventsYsZ + .4byte gText_PkmnsXCuredItsYProblem + .4byte gText_PkmnCantEscape2 + .4byte gText_PkmnObtainedX + .4byte gText_PkmnObtainedX2 + .4byte gText_PkmnObtainedXYObtainedZ + .4byte gText_ButNoEffect + .4byte gText_PkmnsXHadNoEffectOnY + .4byte gText_TwoEnemiesDefeated + .4byte gText_String48 + .4byte gText_PkmnIncapableOfPower + .4byte gText_GlintAppearsInEye + .4byte gText_PkmnGettingIntoPosition + .4byte gText_PkmnBeganGrowlingDeeply + .4byte gText_PkmnEagerForMore + .4byte gText_DefeatedOpponentByReferee + .4byte gText_LostToOpponentByReferee + .4byte gText_TiedOpponentByReferee + .4byte gText_QuestionForfeitMatch + .4byte gText_ForfeitedMatch + .4byte gText_PkmnTransferredSomeonesPC + .4byte gText_PkmnTransferredLanettesPC + .4byte gText_PkmnBoxSomeonesPCFull + .4byte gText_PkmnBoxLanettesPCFull + .4byte gText_String37 + .4byte gText_String49 + .align 2 gUnknown_085CC834:: @ 85CC834 .incbin "baserom.gba", 0x5cc834, 0x14e @@ -603,36 +1666,28 @@ gUnknown_085CC982:: @ 85CC982 .incbin "baserom.gba", 0x5cc982, 0xe gUnknown_085CC990:: @ 85CC990 - -.string "What?\n{STR_VAR_1} is evolving!$" + .string "What?\n{STR_VAR_1} is evolving!$" gUnknown_085CC9A6:: @ 85CC9A6 - -.string "Congratulations! Your {STR_VAR_1}\nevolved into {STR_VAR_2}!{UNKNOWN_A}\p$" + .string "Congratulations! Your {STR_VAR_1}\nevolved into {STR_VAR_2}!{UNKNOWN_A}\p$" gUnknown_085CC9D3:: @ 85CC9D3 - -.string "Huh? {STR_VAR_1}\nstopped evolving!\p$" + .string "Huh? {STR_VAR_1}\nstopped evolving!\p$" gUnknown_085CC9EE:: @ 85CC9EE - -.string "‥‥?\p$" + .string "……?\p$" gUnknown_085CC9F3:: @ 85CC9F3 - -.string "What will\n{STRING 18} do?$" + .string "What will\n{STRING 18} do?$" gUnknown_085CCA04:: @ 85CCA04 - -.string "What will\n{STRING 35} do?$" + .string "What will\n{STRING 35} do?$" gUnknown_085CCA15:: @ 85CCA15 - -.string "What will\nWALLY do?$" + .string "What will\nWALLY do?$" gUnknown_085CCA29:: @ 85CCA29 - -.string "{PAUSE 16}Link standby‥$" + .string "{PAUSE 16}Link standby…$" gUnknown_085CCA3A:: @ 85CCA3A .incbin "baserom.gba", 0x5cca3a, 0x1a @@ -742,12 +1797,93 @@ gUnknown_085CCE17:: @ 85CCE17 gUnknown_085CCE38:: @ 85CCE38 .incbin "baserom.gba", 0x5cce38, 0x1b -gUnknown_085CCE53:: @ 85CCE53 - .incbin "baserom.gba", 0x5cce53, 0x375 +gText_TwoEnemiesDefeated:: @ 85CCE53 + .string "{STRING 28} {STRING 29} and\n{STRING 46} {STRING 47}\lwere defeated!\p$" +gText_String48:: @ 85CCE73 + .string "{STRING 48}$" + +gText_PkmnIncapableOfPower:: @ 85CCE76 + .string "{STRING 15} appears incapable\nof using its power!$" + +gText_GlintAppearsInEye:: @ 85CCE9F + .string "A glint appears in\n{STRING 19}’s eyes!$" + +gText_PkmnGettingIntoPosition:: @ 85CCEBD + .string "{STRING 19} is getting into\nposition!$" + +gText_PkmnBeganGrowlingDeeply:: @ 85CCEDA + .string "{STRING 19} began growling deeply!$" + +gText_PkmnEagerForMore:: @ 85CCEF4 + .string "{STRING 19} is eager for more!$" + +gUnknown_085CCF0A:: @ 85CCF0A + .2byte 0x016E, 0x016F, 0x0170, 0x0171 + +gText_RefIfNothingIsDecided:: @ 85CCF12 + .string "REFEREE: If nothing is decided in\n3 turns, we will go to judging!$" + +gText_RefThatsIt:: @ 85CCF54 + .string "REFEREE: That’s it! We will now go to\njudging to determine the winner!$" + +gText_RefJudgeMind:: @ 85CCF9B + .string "REFEREE: Judging category 1, Mind!\nThe POKéMON showing the most guts!\p$" + +gText_RefJudgeSkill:: @ 85CCFE2 + .string "REFEREE: Judging category 2, Skill!\nThe POKéMON using moves the best!\p$" + +gText_RefJudgeBody:: @ 85CD029 + .string "REFEREE: Judging category 3, Body!\nThe POKéMON with the most vitality!\p$" + +gText_RefJudgement1:: @ 85CD071 + .string "REFEREE: Judgment: {STRING 0} to {PLAYER}!\nThe winner is {STRING 35}’s {STRING 5}!\p$" + +gText_RefJudgement2:: @ 85CD0A6 + .string "REFEREE: Judgment: {STRING 0} to {PLAYER}!\nThe winner is {STRING 29}’s {RIVAL}!\p$" + +gText_RefJudgement3:: @ 85CD0DB + .string "REFEREE: Judgment: 3 to 3!\nWe have a draw!\p$" + +gText_DefeatedOpponentByReferee:: @ 85CD107 + .string "{STRING 5} defeated the opponent\n{RIVAL} in a REFEREE’s decision!$" + +gText_LostToOpponentByReferee:: @ 85CD13C + .string "{STRING 5} lost to the opponent\n{RIVAL} in a REFEREE’s decision!$" + +gText_TiedOpponentByReferee:: @ 85CD170 + .string "{STRING 5} tied the opponent\n{RIVAL} in a REFEREE’s decision!$" + +gText_RefCommenceBattle:: @ 85CD1A1 + .string "REFEREE: {STRING 5} VS {RIVAL}!\nCommence battling!$" + + .align 2 gUnknown_085CD1C8:: @ 85CD1C8 - .incbin "baserom.gba", 0x5cd1c8, 0x84 + .4byte gText_RefIfNothingIsDecided + .4byte gText_RefThatsIt + .4byte gText_RefJudgeMind + .4byte gText_RefJudgeSkill + .4byte gText_RefJudgeBody + .4byte gText_RefJudgement1 + .4byte gText_RefJudgement2 + .4byte gText_RefJudgement3 + .4byte gText_RefCommenceBattle +gText_QuestionForfeitMatch:: @ 85CD1EC + .string "Would you like to forfeit the match\nand quit now?$" + +gText_ForfeitedMatch:: @ 85CD21E + .string "{STRING 35} forfeited the match!$" + +gText_String37:: @ 85CD236 + .string "{STRING 37}$" + +gText_String49:: @ 85CD239 + .string "{STRING 49}$" + + .string "{PLAY_SE 0x0011}{STRING 28} {STRING 29} fled!$" + + .align 2 gUnknown_085CD24C:: @ 85CD24C .incbin "baserom.gba", 0x5cd24c, 0x1b diff --git a/data/event_scripts.s b/data/event_scripts.s index f058d75db..3303bedae 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -181,7 +181,149 @@ gUnknown_08272604:: @ 8272604 .incbin "baserom.gba", 0x272604, 0x6b gUnknown_0827266F:: @ 827266F - .incbin "baserom.gba", 0x27266f, 0x1044 + .string "Which PC should be accessed?$" + + .string "Accessed SOMEONE’S PC.$" + + .string "POKéMON Storage System opened.$" + + .string "Accessed {PLAYER}’s PC.$" + + .string "Accessed LANETTE’s PC.$" + + .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to rest your POKéMON?$" + + .string "Okay, I’ll take your POKéMON\nfor a few seconds.$" + + .string "Thank you for waiting.\pWe’ve restored your POKéMON\nto full health.$" + + .string "We hope to see you again!$" + + .string "Hello, and welcome to\nthe POKéMON CENTER.\pWe restore your tired POKéMON\nto full health.\pWould you like to…$" + + .string "Th-that card…\nCould it be… The GOLD CARD?!\pOh, the gold color is brilliant!\nThe four stars seem to sparkle!\pI’ve seen several TRAINERS with\na SILVER CARD before, but, {PLAYER},\lyou’re the first TRAINER I’ve ever\lseen with a GOLD CARD!\pOkay, {PLAYER}, please allow me\nthe honor of resting your POKéMON!$" + + .string "I’m delighted to see you, {PLAYER}!\nYou want the usual, am I right?$" + + .string "Okay, I’ll take your POKéMON\nfor a few seconds.$" + + .string "Thank you for waiting.$" + + .string "We hope to see you again!$" + + .string "Welcome!\pHow may I serve you?$" + + .string "Please come again!$" + + .string "{PLAYER}{STRING 5}, welcome!\pWhat can I do for you?$" + + .string "Obtained the {STR_VAR_2}!$" + + .string "The BAG is full…$" + + .string "{PLAYER} put away the {STR_VAR_2}\nin the {STR_VAR_3} POCKET.$" + + .string "{PLAYER} found one {STR_VAR_2}!$" + + .string "Too bad!\nThe BAG is full…$" + + .string "{PLAYER} put away the {STR_VAR_2}\nin the BAG.$" + + .string "Obtained the {STR_VAR_2}!$" + + .string "Too bad! There’s no room left for\nanother {STR_VAR_2}…$" + + .string "The {STR_VAR_2} was transferred\nto the PC.$" + + .string "“Selected items for your convenience!”\nPOKéMON MART$" + + .string "“Rejuvenate your tired partners!”\nPOKéMON CENTER$" + + .string "{STR_VAR_1} might like this program.\n… … … … … … … … … … … … … … … …\pBetter get going!$" + + .string "Welcome to LILYCOVE DEPARTMENT STORE.\pWhich floor would you like?$" + + .string "The sandstorm is vicious.\nIt’s impossible to keep going.$" + + .string "An item in the BAG can be\nregistered to SELECT for easy use.$" + + .string "There’s an e-mail from POKéMON TRAINER\nSCHOOL.\p… … … … … …\pA POKéMON may learn up to four moves.\pA TRAINER’s expertise is tested on the\nmove sets chosen for POKéMON.\p… … … … … …$" + + .string "{PLAYER} booted up the PC.$" + + .string "The link was canceled.$" + + .string "Want to give a nickname to\nthe {STR_VAR_2} you received?$" + + .string "{PLAYER} is out of usable\nPOKéMON!\p{PLAYER} whited out!$" + + .string "Registered {STR_VAR_1} {STR_VAR_2}\nin the POKéNAV.$" + + .string "Do you know the TM SECRET POWER?\pOur group, we love the TM SECRET\nPOWER.\pOne of our members will give it to you.\nCome back and show me if you get it.\pWe’ll accept you as a member and sell\nyou good stuff in secrecy.$" + + .string "Your POKéMON may be infected with\nPOKéRUS.\pLittle is known about the POKéRUS\nexcept that they are microscopic life-\lforms that attach to POKéMON.\pWhile infected, POKéMON are said to\ngrow exceptionally well.$" + + .string "The water is dyed a deep blue…\nWould you like to SURF?$" + + .string "{STR_VAR_1} used SURF!$" + + .string "It sounded as if a door opened\nsomewhere far away.$" + + .string "There is a big hole in the wall.$" + + .string "I’m terribly sorry.\nThe POKéMON WIRELESS CLUB is\lundergoing adjustments now.$" + + .string "It appears to be undergoing\nadjustments…$" + + .string "I’m terribly sorry. The TRADE CENTER\nis undergoing inspections.$" + + .string "I’m terribly sorry. The RECORD CORNER\nis under preparation.$" + + .string "{PLAYER} handed over the\n{STR_VAR_1}.$" + + .string "Thank you for accessing the\nMYSTERY GIFT System.$" + + .string "{PLAYER} found one {STR_VAR_1}\n{STR_VAR_2}!$" + + .string "The weird tree doesn’t like the\nWAILMER PAIL!\pThe weird tree attacked!$" + + .string "The {STR_VAR_1} flew away!$" + +gText_PkmnTransferredSomeonesPC:: @ 8273216 + .string "{STR_VAR_2} was transferred to\nSOMEONE’S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" + +gText_PkmnTransferredLanettesPC:: @ 8273256 + .string "{STR_VAR_2} was transferred to\nLANETTE’S PC.\pIt was placed in \nBOX “{STR_VAR_1}.”$" + +gText_PkmnBoxSomeonesPCFull:: @ 8273296 + .string "BOX “{STR_VAR_3}” on\nSOMEONE’S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" + +gText_PkmnBoxLanettesPCFull:: @ 82732D9 + .string "BOX “{STR_VAR_3}” on\nLANETTE’S PC was full.\p{STR_VAR_2} was transferred to\nBOX “{STR_VAR_1}.”$" + + .string "There’s no more room for POKéMON!\pThe POKéMON BOXES are full and\ncan’t accept any more!$" + + .string "Do you want to give a nickname to\nthis {STR_VAR_1}?$" + + .string "There is a questionnaire.\nWould you like to fill it out?$" + + .string "Thank you for taking the time to\nfill out our questionnaire.\pYour feedback will be used for\nfuture reference.$" + + .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY GIFT.\pFrom now on, you should be\nreceiving MYSTERY GIFTS!$" + + .string "Once you save your game, you can\naccess the MYSTERY GIFT.$" + + .string "Oh, hello!\nYou know those words?\pThat means you must know about\nthe MYSTERY EVENT.$" + + .string "Once you save your game, you can\naccess the MYSTERY EVENT.$" + + .string "Thank you for using the MYSTERY\nEVENT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + + .string "It appears to be for use at\nthe LILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + + .string "The massive downpour appears to\nhave stopped…$" + + .string "The intense sunshine appears to\nhave subsided…$" gUnknown_082736B3:: @ 82736B3 .incbin "baserom.gba", 0x2736b3, 0x9 diff --git a/data/graphics.s b/data/graphics.s index bf080fd95..98365f5e8 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -55,7 +55,13 @@ gUnknown_08C1A12C:: @ 8C1A12C .incbin "baserom.gba", 0xc1a12c, 0x188 gUnknown_08C1A2B4:: @ 8C1A2B4 - .incbin "baserom.gba", 0xc1a2b4, 0x2404 + .incbin "baserom.gba", 0xc1a2b4, 0x1DC + +gUnknown_08C1A490:: @ 8C1A490 + .incbin "baserom.gba", 0xc1a490, 0xD4 + +gUnknown_08C1A564:: @ 8C1A564 + .incbin "baserom.gba", 0xc1a564, 0x2154 gUnknown_08C1C6B8:: @ 8C1C6B8 .incbin "baserom.gba", 0xc1c6b8, 0x9f4 diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 2d1dfb8b7..2c3e84de9 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -46,16 +46,16 @@ extern const struct SpindaSpot gSpindaSpotGraphics[]; extern const u8* const gStatNamesTable[]; extern const u8 gSpeciesNames[][11]; extern const u8 gUnknown_08329EC8[]; -extern const u8 gUnknown_085CB38A[]; -extern const u8 gUnknown_085CB3AA[]; -extern const u8 gUnknown_085CA459[]; -extern const u8 gUnknown_085CA424[]; +extern const u8 gText_StatRose[]; +extern const u8 gText_PkmnsStatChanged2[]; +extern const u8 gText_PkmnGettingPumped[]; +extern const u8 gText_PkmnShroudedInMist[]; extern const s8 gNatureStatTable[][5]; extern const s8 gUnknown_08329ECE[][3]; extern const u32 gBitTable[]; extern const u32 gTMHMLearnsets[][2]; extern const u8 BattleText_Wally[]; -extern const u8 BattleText_PreventedSwitch[]; +extern const u8 gText_PkmnsXPreventsSwitching[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const u16 gHMMoves[]; @@ -215,8 +215,8 @@ void sub_806CF24(s32 stat) { gBankTarget = gBankInMenu; StringCopy(gBattleTextBuff1, gStatNamesTable[gUnknown_08329EC8[stat]]); - StringCopy(gBattleTextBuff2, gUnknown_085CB38A); - StrCpyDecodeToDisplayedStringBattle(gUnknown_085CB3AA); + StringCopy(gBattleTextBuff2, gText_StatRose); + StrCpyDecodeToDisplayedStringBattle(gText_PkmnsStatChanged2); } u8 *sub_806CF78(u16 itemId) @@ -251,7 +251,7 @@ u8 *sub_806CF78(u16 itemId) else { gBankAttacker = gBankInMenu; - StrCpyDecodeToDisplayedStringBattle(gUnknown_085CA459); + StrCpyDecodeToDisplayedStringBattle(gText_PkmnGettingPumped); } } } @@ -259,7 +259,7 @@ u8 *sub_806CF78(u16 itemId) if (itemEffect[3] & 0x80) { gBankAttacker = gBankInMenu; - StrCpyDecodeToDisplayedStringBattle(gUnknown_085CA424); + StrCpyDecodeToDisplayedStringBattle(gText_PkmnShroudedInMist); } return gDisplayedStringBattle; @@ -1374,7 +1374,7 @@ void sub_806E994(void) gBattleTextBuff2[2] = gBankInMenu; gBattleTextBuff2[3] = pokemon_order_func(gBattlePartyID[gBankInMenu]); gBattleTextBuff2[4] = EOS; - StrCpyDecodeBattle(BattleText_PreventedSwitch, gStringVar4); + StrCpyDecodeBattle(gText_PkmnsXPreventsSwitching, gStringVar4); } struct PokeItem From e7e1938094081ba2e20232caca0239cb2290251f Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 16:17:23 -0400 Subject: [PATCH 28/62] Start decompilation of lilycove_lady --- asm/lilycove_lady.s | 95 +-------------------------------------------- include/global.h | 35 ++++++++++++++++- include/vars.h | 2 + ld_script.txt | 1 + src/lilycove_lady.c | 57 +++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 src/lilycove_lady.c diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index fca8cb29b..76ba3e423 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -4,99 +4,6 @@ .syntax unified .text - - thumb_func_start GetLilycoveLadyId -GetLilycoveLadyId: @ 818D9AC - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end GetLilycoveLadyId - - thumb_func_start sub_818D9C0 -sub_818D9C0: @ 818D9C0 - push {r4,r5,lr} - ldr r5, =0x00004010 - ldr r4, =gUnknown_0860B07E - bl GetLilycoveLadyId - lsls r0, 24 - lsrs r0, 23 - adds r0, r4 - ldrh r1, [r0] - adds r0, r5, 0 - bl VarSet - bl GetLilycoveLadyId - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _0818DA20 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00003b58 - adds r1, r0 - ldr r0, =0x00004011 - ldr r2, =gUnknown_0860B074 - ldrb r1, [r1, 0xD] - lsls r1, 1 - adds r1, r2 - ldrh r1, [r1] - bl VarSet - ldr r1, =gScriptResult - movs r0, 0x1 - b _0818DA24 - .pool -_0818DA20: - ldr r1, =gScriptResult - movs r0, 0 -_0818DA24: - strh r0, [r1] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818D9C0 - - thumb_func_start SetLilycoveLady -SetLilycoveLady: @ 818DA30 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r1, [r0, 0xB] - lsls r1, 8 - ldrb r0, [r0, 0xA] - orrs r0, r1 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 17 - adds r1, r0, 0 - cmp r0, 0x1 - beq _0818DA68 - cmp r0, 0x1 - bgt _0818DA5C - cmp r0, 0 - beq _0818DA62 - b _0818DA72 - .pool -_0818DA5C: - cmp r1, 0x2 - beq _0818DA6E - b _0818DA72 -_0818DA62: - bl SetLilycoveQuizLady - b _0818DA72 -_0818DA68: - bl SetLilycoveFavourLady - b _0818DA72 -_0818DA6E: - bl SetLilycoveContestLady -_0818DA72: - pop {r0} - bx r0 - thumb_func_end SetLilycoveLady thumb_func_start sub_818DA78 sub_818DA78: @ 818DA78 @@ -1927,5 +1834,5 @@ sub_818E990: @ 818E990 .pool thumb_func_end sub_818E990 - + .align 2, 0 @ Don't pad with nop. diff --git a/include/global.h b/include/global.h index e694a5974..764eff563 100644 --- a/include/global.h +++ b/include/global.h @@ -655,6 +655,39 @@ struct DaycareData #define FLAGS_COUNT 300 #define VARS_COUNT 256 +enum { + LILYCOVE_LADY_QUIZ, + LILYCOVE_LADY_FAVOUR, + LILYCOVE_LADY_CONTEST +}; + +typedef union // TODO +{ + struct + { + /*0x000*/ u8 id; + /*0x001*/ u8 language; + } quiz; + + struct + { + /*0x000*/ u8 id; + } flavor; + + struct + { + /*0x000*/ u8 id; + /*0x001*/ u8 filler_001[12]; + /*0x00d*/ u8 category; // maybe? + } contest; + + struct + { + /*0x000*/ u8 id; + /*0x001*/ u8 filler_001[535]; + } common; +} LilycoveLady; + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -738,7 +771,7 @@ struct SaveBlock1 /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[52]; - /*0x3B58*/ u8 lilycoveLady[536]; // TODO: convert to a union + /*0x3B58*/ LilycoveLady lilycoveLady; // TODO: convert to a union /*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct // sizeof: 0x3D88 }; diff --git a/include/vars.h b/include/vars.h index 5da960640..7c0edeb77 100644 --- a/include/vars.h +++ b/include/vars.h @@ -12,6 +12,8 @@ #define VAR_0x4008 0x4008 #define VAR_0x4009 0x4009 #define VAR_0x400A 0x400A +#define VAR_0x4010 0x4010 +#define VAR_0x4011 0x4011 #define VAR_0x401F 0x401F #define VAR_RECYCLE_GOODS 0x4020 #define VAR_REPEL_STEP_COUNT 0x4021 diff --git a/ld_script.txt b/ld_script.txt index 8a3f3e139..cc43127e8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -240,6 +240,7 @@ SECTIONS { asm/battle_controller_recorded_opponent.o(.text); asm/battle_controller_recorded_player.o(.text); asm/battle_dome_cards.o(.text); + src/lilycove_lady.o(.text); asm/lilycove_lady.o(.text); asm/battle_frontier_1.o(.text); asm/new_menu_helpers.o(.text); diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c new file mode 100644 index 000000000..7f4c4824a --- /dev/null +++ b/src/lilycove_lady.c @@ -0,0 +1,57 @@ +// +// Created by Scott Norton on 9/19/17. +// + +#include "global.h" +#include "event_data.h" +#include "lilycove_lady.h" + +void SetLilycoveQuizLady(void); +void SetLilycoveFavourLady(void); +void SetLilycoveContestLady(void); + +extern const u16 gUnknown_0860B074[]; +extern const u16 gUnknown_0860B07E[]; + +u8 GetLilycoveLadyId(void) +{ + return gSaveBlock1Ptr->lilycoveLady.common.id; +} + +void sub_818D9C0(void) +{ + LilycoveLady *lilycoveLady; + + VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]); + if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST) + { + lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; + VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]); + gScriptResult = TRUE; + } + else + { + gScriptResult = FALSE; + } +} + +void SetLilycoveLady(void) +{ + u16 id; + + id = ((gSaveBlock2Ptr->playerTrainerId[1] << 8) | gSaveBlock2Ptr->playerTrainerId[0]); + id %= 6; + id >>= 1; + switch (id) + { + case LILYCOVE_LADY_QUIZ: + SetLilycoveQuizLady(); + break; + case LILYCOVE_LADY_FAVOUR: + SetLilycoveFavourLady(); + break; + case LILYCOVE_LADY_CONTEST: + SetLilycoveContestLady(); + break; + } +} From 99a7fcfdfa723390ecb25ec6819359b3521c8f34 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 16:21:50 -0400 Subject: [PATCH 29/62] sub_818DA78, SetLilycoveLadyRandomly --- asm/lilycove_lady.s | 66 --------------------------------------------- src/lilycove_lady.c | 39 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 66 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 76ba3e423..51e288331 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,72 +5,6 @@ .text - thumb_func_start sub_818DA78 -sub_818DA78: @ 818DA78 - push {lr} - bl GetLilycoveLadyId - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0818DA9C - cmp r0, 0x1 - bgt _0818DA90 - cmp r0, 0 - beq _0818DA96 - b _0818DAA6 -_0818DA90: - cmp r0, 0x2 - beq _0818DAA2 - b _0818DAA6 -_0818DA96: - bl sub_818E004 - b _0818DAA6 -_0818DA9C: - bl sub_818DBC4 - b _0818DAA6 -_0818DAA2: - bl sub_818E674 -_0818DAA6: - pop {r0} - bx r0 - thumb_func_end sub_818DA78 - -@ unused - thumb_func_start SetLilycoveLadyRandomly -SetLilycoveLadyRandomly: @ 818DAAC - push {lr} - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x1 - beq _0818DADC - cmp r0, 0x1 - bgt _0818DAD0 - cmp r0, 0 - beq _0818DAD6 - b _0818DAE6 -_0818DAD0: - cmp r1, 0x2 - beq _0818DAE2 - b _0818DAE6 -_0818DAD6: - bl SetLilycoveQuizLady - b _0818DAE6 -_0818DADC: - bl SetLilycoveFavourLady - b _0818DAE6 -_0818DAE2: - bl SetLilycoveContestLady -_0818DAE6: - pop {r0} - bx r0 - thumb_func_end SetLilycoveLadyRandomly - thumb_func_start sub_818DAEC sub_818DAEC: @ 818DAEC push {r4,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 7f4c4824a..ab1c24914 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -4,11 +4,15 @@ #include "global.h" #include "event_data.h" +#include "rng.h" #include "lilycove_lady.h" void SetLilycoveQuizLady(void); void SetLilycoveFavourLady(void); void SetLilycoveContestLady(void); +void sub_818E004(void); +void sub_818DBC4(void); +void sub_818E674(void); extern const u16 gUnknown_0860B074[]; extern const u16 gUnknown_0860B07E[]; @@ -55,3 +59,38 @@ void SetLilycoveLady(void) break; } } + +void sub_818DA78(void) +{ + switch (GetLilycoveLadyId()) + { + case LILYCOVE_LADY_QUIZ: + sub_818E004(); + break; + case LILYCOVE_LADY_FAVOUR: + sub_818DBC4(); + break; + case LILYCOVE_LADY_CONTEST: + sub_818E674(); + break; + } +} + +void SetLilycoveLadyRandomly(void) +{ + u8 id; + + id = Random() % 3; + switch (id) + { + case LILYCOVE_LADY_QUIZ: + SetLilycoveQuizLady(); + break; + case LILYCOVE_LADY_FAVOUR: + SetLilycoveFavourLady(); + break; + case LILYCOVE_LADY_CONTEST: + SetLilycoveContestLady(); + break; + } +} From 0d0532731f99036d09d6bb2788de0221b6886105 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 16:24:42 -0400 Subject: [PATCH 30/62] sub_818DAEC, sub_818DB04 --- asm/lilycove_lady.s | 34 ---------------------------------- src/lilycove_lady.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 51e288331..fbdcc10dd 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,40 +5,6 @@ .text - thumb_func_start sub_818DAEC -sub_818DAEC: @ 818DAEC - push {r4,lr} - ldr r4, =gScriptResult - bl GetLilycoveLadyId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DAEC - - thumb_func_start sub_818DB04 -sub_818DB04: @ 818DB04 - push {lr} - adds r1, r0, 0 - movs r2, 0 - b _0818DB14 -_0818DB0C: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - adds r1, 0x2 -_0818DB14: - ldrh r0, [r1] - cmp r0, 0 - bne _0818DB0C - adds r0, r2, 0 - pop {r1} - bx r1 - thumb_func_end sub_818DB04 - thumb_func_start sub_818DB20 sub_818DB20: @ 818DB20 push {r4-r6,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index ab1c24914..579eca5cb 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -94,3 +94,16 @@ void SetLilycoveLadyRandomly(void) break; } } + +void sub_818DAEC(void) +{ + gScriptResult = GetLilycoveLadyId(); +} + +u8 sub_818DB04(u16 *data) +{ + u8 len; + + for (len = 0; *data != 0; len ++, data ++); + return len; +} From b26eb6713bb866f1173b4c7192ce231d894d19ea Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 16:32:33 -0400 Subject: [PATCH 31/62] sub_818DB20 --- asm/lilycove_lady.s | 42 ------------------------------------------ include/global.h | 6 +++++- src/lilycove_lady.c | 20 +++++++++++++++++--- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index fbdcc10dd..83c6df670 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,48 +5,6 @@ .text - thumb_func_start sub_818DB20 -sub_818DB20: @ 818DB20 - push {r4-r6,lr} - bl Random - ldr r5, =gUnknown_0203CD64 - ldr r4, [r5] - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x6 - bl __umodsi3 - strb r0, [r4, 0xC] - ldr r6, =gUnknown_0860B2EC - ldr r0, [r5] - ldrb r0, [r0, 0xC] - lsls r0, 2 - adds r0, r6 - ldr r0, [r0] - bl sub_818DB04 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl Random - lsls r0, 16 - lsrs r0, 16 - adds r1, r4, 0 - bl __modsi3 - lsls r0, 24 - ldr r2, [r5] - ldrb r1, [r2, 0xC] - lsls r1, 2 - adds r1, r6 - ldr r1, [r1] - lsrs r0, 23 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2, 0x10] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DB20 - thumb_func_start SetLilycoveFavourLady SetLilycoveFavourLady: @ 818DB7C push {lr} diff --git a/include/global.h b/include/global.h index 764eff563..92435ce28 100644 --- a/include/global.h +++ b/include/global.h @@ -672,7 +672,11 @@ typedef union // TODO struct { /*0x000*/ u8 id; - } flavor; + /*0x001*/ u8 filler_001[11]; + /*0x00c*/ u8 unk_00c; + /*0x00d*/ u8 filler_00d[3]; + /*0x010*/ u16 unk_010; + } favour; struct { diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 579eca5cb..2e0d336dd 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -14,8 +14,11 @@ void sub_818E004(void); void sub_818DBC4(void); void sub_818E674(void); -extern const u16 gUnknown_0860B074[]; -extern const u16 gUnknown_0860B07E[]; +extern const u16 gUnknown_0860B074[5]; +extern const u16 gUnknown_0860B07E[3]; +extern const u16 *const gUnknown_0860B2EC[6]; + +EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL; u8 GetLilycoveLadyId(void) { @@ -100,10 +103,21 @@ void sub_818DAEC(void) gScriptResult = GetLilycoveLadyId(); } -u8 sub_818DB04(u16 *data) +u8 sub_818DB04(const u16 *data) { u8 len; for (len = 0; *data != 0; len ++, data ++); return len; } + +void sub_818DB20(void) +{ + u8 size; + u8 idx; + + gUnknown_0203CD64->favour.unk_00c = Random() % 6; + size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]); + idx = Random() % size; + gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx]; +} From 4e8a2c6934c4f8a44ed8d350fe96996beda21d0e Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 16:55:53 -0400 Subject: [PATCH 32/62] SetLilycoveFavourLady --- asm/lilycove_lady.s | 49 --------------------------------------------- include/global.h | 10 +++++++-- src/lilycove_lady.c | 21 +++++++++++++++++++ 3 files changed, 29 insertions(+), 51 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 83c6df670..36a5401e9 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,55 +5,6 @@ .text - thumb_func_start SetLilycoveFavourLady -SetLilycoveFavourLady: @ 818DB7C - push {lr} - ldr r2, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - movs r3, 0 - movs r1, 0x1 - strb r1, [r0] - ldr r0, [r2] - strb r3, [r0, 0x1] - ldr r1, [r2] - movs r0, 0xFF - strb r0, [r1, 0x4] - ldr r0, [r2] - strb r3, [r0, 0x2] - ldr r0, [r2] - strb r3, [r0, 0x3] - ldr r1, [r2] - strh r3, [r1, 0xE] - ldr r0, =gGameLanguage - ldrb r0, [r0] - strb r0, [r1, 0x12] - bl sub_818DB20 - pop {r0} - bx r0 - .pool - thumb_func_end SetLilycoveFavourLady - - thumb_func_start sub_818DBC4 -sub_818DBC4: @ 818DBC4 - ldr r3, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r3] - movs r2, 0 - movs r1, 0x1 - strb r1, [r0] - ldr r0, [r3] - strb r2, [r0, 0x1] - bx lr - .pool - thumb_func_end sub_818DBC4 - thumb_func_start sub_818DBE8 sub_818DBE8: @ 818DBE8 push {lr} diff --git a/include/global.h b/include/global.h index 92435ce28..0fc860e68 100644 --- a/include/global.h +++ b/include/global.h @@ -672,10 +672,16 @@ typedef union // TODO struct { /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[11]; + /*0x001*/ u8 unk_001; + /*0x002*/ u8 unk_002; + /*0x003*/ u8 unk_003; + /*0x004*/ u8 unk_004; + /*0x005*/ u8 filler_005[7]; /*0x00c*/ u8 unk_00c; - /*0x00d*/ u8 filler_00d[3]; + /*0x00d*/ u8 filler_00d; + /*0x00e*/ u16 unk_00e; /*0x010*/ u16 unk_010; + /*0x012*/ u8 language; } favour; struct diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 2e0d336dd..aec55a574 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -3,6 +3,7 @@ // #include "global.h" +#include "main.h" #include "event_data.h" #include "rng.h" #include "lilycove_lady.h" @@ -121,3 +122,23 @@ void sub_818DB20(void) idx = Random() % size; gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx]; } + +void SetLilycoveFavourLady(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; + gUnknown_0203CD64->favour.unk_001 = 0; + gUnknown_0203CD64->favour.unk_004 = 0xFF; + gUnknown_0203CD64->favour.unk_002 = 0; + gUnknown_0203CD64->favour.unk_003= 0; + gUnknown_0203CD64->favour.unk_00e = 0; + gUnknown_0203CD64->favour.language = gGameLanguage; + sub_818DB20(); +} + +void sub_818DBC4(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; + gUnknown_0203CD64->favour.unk_001 = 0; +} From b8e733283e31c4863f774c6cf2bbb17ba369681f Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 17:04:17 -0400 Subject: [PATCH 33/62] Another handful of favour lady functions --- asm/lilycove_lady.s | 59 --------------------------------------------- src/lilycove_lady.c | 30 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 59 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 36a5401e9..c905b3e2a 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,65 +5,6 @@ .text - thumb_func_start sub_818DBE8 -sub_818DBE8: @ 818DBE8 - push {lr} - ldr r1, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0x1] - cmp r0, 0x2 - bne _0818DC0C - movs r0, 0x2 - b _0818DC16 - .pool -_0818DC0C: - cmp r0, 0x1 - beq _0818DC14 - movs r0, 0 - b _0818DC16 -_0818DC14: - movs r0, 0x1 -_0818DC16: - pop {r1} - bx r1 - thumb_func_end sub_818DBE8 - - thumb_func_start sub_818DC1C -sub_818DC1C: @ 818DC1C - lsls r0, 24 - ldr r1, =gUnknown_0860B224 - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .pool - thumb_func_end sub_818DC1C - - thumb_func_start sub_818DC2C -sub_818DC2C: @ 818DC2C - push {r4,lr} - ldr r1, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldr r4, =gStringVar1 - ldrb r0, [r0, 0xC] - bl sub_818DC1C - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DC2C - thumb_func_start sub_818DC60 sub_818DC60: @ 818DC60 push {r4,r5,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index aec55a574..16461728c 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -6,6 +6,7 @@ #include "main.h" #include "event_data.h" #include "rng.h" +#include "string_util.h" #include "lilycove_lady.h" void SetLilycoveQuizLady(void); @@ -17,6 +18,7 @@ void sub_818E674(void); extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; +extern const u8 *const gUnknown_0860B224[]; extern const u16 *const gUnknown_0860B2EC[6]; EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL; @@ -142,3 +144,31 @@ void sub_818DBC4(void) gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; gUnknown_0203CD64->favour.unk_001 = 0; } + +u8 sub_818DBE8(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + if (gUnknown_0203CD64->favour.unk_001 == 2) + { + return 2; + } + else if (gUnknown_0203CD64->favour.unk_001 == 1) + { + return 1; + } + else + { + return 0; + } +} + +const u8 *sub_818DC1C(u8 idx) +{ + return gUnknown_0860B224[idx]; +} + +void sub_818DC2C(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c)); +} From 3b3423d1a751134ff7941b41bad72e0e75314647 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 19 Sep 2017 17:07:36 -0400 Subject: [PATCH 34/62] sub_818DC60 --- asm/lilycove_lady.s | 33 --------------------------------- include/global.h | 3 +-- src/lilycove_lady.c | 15 ++++++++++++++- 3 files changed, 15 insertions(+), 36 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c905b3e2a..75f9458a3 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,39 +5,6 @@ .text - thumb_func_start sub_818DC60 -sub_818DC60: @ 818DC60 - push {r4,r5,lr} - ldr r5, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r2, =0x00003b58 - adds r0, r1, r2 - str r0, [r5] - ldrb r0, [r0, 0x4] - cmp r0, 0xFF - bne _0818DC84 - movs r0, 0 - b _0818DC9C - .pool -_0818DC84: - ldr r4, =gStringVar3 - ldr r0, =0x00003b5c - adds r1, r0 - adds r0, r4, 0 - bl StringCopy7 - ldr r0, [r5] - ldrb r1, [r0, 0x12] - adds r0, r4, 0 - bl ConvertInternationalString - movs r0, 0x1 -_0818DC9C: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818DC60 - thumb_func_start sub_818DCAC sub_818DCAC: @ 818DCAC push {r4,lr} diff --git a/include/global.h b/include/global.h index 0fc860e68..42629cf48 100644 --- a/include/global.h +++ b/include/global.h @@ -675,8 +675,7 @@ typedef union // TODO /*0x001*/ u8 unk_001; /*0x002*/ u8 unk_002; /*0x003*/ u8 unk_003; - /*0x004*/ u8 unk_004; - /*0x005*/ u8 filler_005[7]; + /*0x004*/ u8 unk_004[8]; /*0x00c*/ u8 unk_00c; /*0x00d*/ u8 filler_00d; /*0x00e*/ u16 unk_00e; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 16461728c..578280115 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -7,6 +7,7 @@ #include "event_data.h" #include "rng.h" #include "string_util.h" +#include "text.h" #include "lilycove_lady.h" void SetLilycoveQuizLady(void); @@ -130,7 +131,7 @@ void SetLilycoveFavourLady(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; gUnknown_0203CD64->favour.unk_001 = 0; - gUnknown_0203CD64->favour.unk_004 = 0xFF; + gUnknown_0203CD64->favour.unk_004[0] = EOS; gUnknown_0203CD64->favour.unk_002 = 0; gUnknown_0203CD64->favour.unk_003= 0; gUnknown_0203CD64->favour.unk_00e = 0; @@ -172,3 +173,15 @@ void sub_818DC2C(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c)); } + +bool8 sub_818DC60(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + if (gUnknown_0203CD64->favour.unk_004[0] != EOS) + { + StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004); + ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language); + return TRUE; + } + return FALSE; +} From fcc94f9722609ffa67c045cf8a7539690a68b080 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 19 Sep 2017 19:31:53 -0500 Subject: [PATCH 35/62] Extract baseroms from battle_message and rename strings --- asm/battle_1.s | 14 +- asm/battle_2.s | 6 +- asm/battle_4.s | 10 +- asm/battle_controller_player.s | 14 +- asm/battle_controller_safari.s | 4 +- asm/battle_controller_wally.s | 4 +- asm/battle_frontier_1.s | 6 +- asm/battle_frontier_2.s | 42 +-- asm/battle_interface.s | 4 +- asm/battle_message.s | 178 +++++------ asm/evolution_scene.s | 60 ++-- charmap.txt | 14 +- data/battle_message.s | 525 +++++++++++++++++++++------------ src/pokemon_2.c | 6 +- src/pokemon_3.c | 4 +- 15 files changed, 525 insertions(+), 366 deletions(-) diff --git a/asm/battle_1.s b/asm/battle_1.s index 8b0c99138..d1a4e6ea0 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1886,7 +1886,7 @@ sub_8035C4C: @ 8035C4C ldrb r2, [r0] cmp r2, 0x3 bne _08035C68 - ldr r0, =gUnknown_085CCBAD + ldr r0, =gText_Draw movs r1, 0x15 bl battle_show_message_maybe b _08035D68 @@ -1962,10 +1962,10 @@ _08035CE2: cmp r0, 0 beq _08035D36 _08035CFC: - ldr r0, =gUnknown_085CCB9E + ldr r0, =gText_Win movs r1, 0x17 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCBA5 + ldr r0, =gText_Loss movs r1, 0x16 bl battle_show_message_maybe b _08035D68 @@ -1983,19 +1983,19 @@ _08035D20: cmp r0, 0 beq _08035D58 _08035D36: - ldr r0, =gUnknown_085CCB9E + ldr r0, =gText_Win movs r1, 0x16 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCBA5 + ldr r0, =gText_Loss movs r1, 0x17 bl battle_show_message_maybe b _08035D68 .pool _08035D58: - ldr r0, =gUnknown_085CCB9E + ldr r0, =gText_Win movs r1, 0x17 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCBA5 + ldr r0, =gText_Loss movs r1, 0x16 bl battle_show_message_maybe _08035D68: diff --git a/asm/battle_2.s b/asm/battle_2.s index 1df081959..cc9af9b3f 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -4995,7 +4995,7 @@ _08039470: beq _0803947E b _0803975E _0803947E: - ldr r0, =gUnknown_085CD28F + ldr r0, =gText_RecordBattleToPass movs r1, 0 bl battle_show_message_maybe ldr r1, =gBattleCommunication @@ -5018,7 +5018,7 @@ _080394AC: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldr r4, =gBattleCommunication @@ -5213,7 +5213,7 @@ _08039678: bne _080396A0 movs r0, 0x37 bl PlaySE - ldr r0, =gUnknown_085CD2CB + ldr r0, =gText_BattleRecordedOnPass _08039686: bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle diff --git a/asm/battle_4.s b/asm/battle_4.s index 8651b9724..9106fa174 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -14790,7 +14790,7 @@ _0804E084: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldr r1, =gBattleScripting @@ -15154,7 +15154,7 @@ _0804E3E0: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldrb r0, [r5, 0x1F] @@ -16078,7 +16078,7 @@ _0804EBD8: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldrb r0, [r5] @@ -17915,7 +17915,7 @@ _0804FC32: bl sub_81A5D44 b _0804FD70 _0804FC38: - ldr r1, =gUnknown_085CD1C8 + ldr r1, =gRefereeStringsTable ldr r0, =gBattlescriptCurrInstr ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -30831,7 +30831,7 @@ _08056C2C: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldr r1, =gBattleCommunication diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 0e9318dc9..eb4caa013 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -1245,7 +1245,7 @@ _08057F80: ldrb r0, [r0] movs r1, 0x1B bl battle_menu_cursor_related_2 - ldr r0, =gUnknown_085CCACA + ldr r0, =gText_BattleSwitchWhich movs r1, 0xB bl battle_show_message_maybe ldr r1, =gBattleBankFunc @@ -4377,7 +4377,7 @@ _08059AF4: sub_8059B18: @ 8059B18 push {r4,lr} ldr r4, =gDisplayedStringBattle - ldr r1, =gUnknown_085CCA6F + ldr r1, =gText_MoveInterfacePP adds r0, r4, 0 bl StringCopy adds r0, r4, 0 @@ -4449,7 +4449,7 @@ sub_8059BB0: @ 8059BB0 ldr r0, =gBattleBufferA + 4 adds r4, r0 ldr r6, =gDisplayedStringBattle - ldr r1, =gUnknown_085CCA73 + ldr r1, =gText_MoveInterfaceType adds r0, r6, 0 bl StringCopy movs r1, 0xFC @@ -4716,7 +4716,7 @@ b_link_standby_message: @ 8059DC0 strh r1, [r0] ldr r0, =gUnknown_02022E16 strh r1, [r0] - ldr r0, =gUnknown_085CCA29 + ldr r0, =gText_LinkStandby movs r1, 0 bl battle_show_message_maybe _08059DE0: @@ -8532,7 +8532,7 @@ dp01t_12_6_battle_menu: @ 805C044 ldr r1, =sub_805C004 str r1, [r0] bl sub_817F2A8 - ldr r0, =gUnknown_085CCA3A + ldr r0, =gText_BattleMenu movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -8550,7 +8550,7 @@ _0805C062: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, =gUnknown_085CC9F3 + ldr r0, =gText_WhatWillPkmnDo bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x1 @@ -8578,7 +8578,7 @@ sub_805C0B0: @ 805C0B0 movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldr r1, =gUnknown_03005D74 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 1aff72176..6ca6e9d4e 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -860,7 +860,7 @@ sub_8159A94: @ 8159A94 adds r0, r1 ldr r1, =sub_8159A54 str r1, [r0] - ldr r0, =gUnknown_085CCA54 + ldr r0, =gText_SafariZoneMenu movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -878,7 +878,7 @@ _08159AAE: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, =gUnknown_085CCA04 + ldr r0, =gText_WhatWillPkmnDo2 bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x1 diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index ddb97f927..98d3e7c68 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3674,7 +3674,7 @@ dp01t_12_1_battle_menu: @ 816A470 adds r0, r1 ldr r1, =sub_816A430 str r1, [r0] - ldr r0, =gUnknown_085CCA3A + ldr r0, =gText_BattleMenu movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -3692,7 +3692,7 @@ _0816A48A: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, =gUnknown_085CCA15 + ldr r0, =gText_WhatWillWallyDo bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x1 diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 135918627..5fb146afc 100755 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -1802,7 +1802,7 @@ _0818F974: sub_818F9B0: @ 818F9B0 push {lr} ldr r0, =gStringVar1 - ldr r2, =gUnknown_085CCD20 + ldr r2, =gRoundsStringTable ldr r1, =gSaveBlock2Ptr ldr r1, [r1] ldr r3, =0x00000cb2 @@ -1821,7 +1821,7 @@ sub_818F9B0: @ 818F9B0 sub_818F9E0: @ 818F9E0 push {lr} ldr r0, =gStringVar1 - ldr r2, =gUnknown_085CCD20 + ldr r2, =gRoundsStringTable ldr r1, =gSaveBlock2Ptr ldr r1, [r1] ldr r3, =0x00000cb2 @@ -10605,7 +10605,7 @@ _081944FC: movs r2, 0 movs r1, 0x2 strb r1, [r0, 0x5] - ldr r0, =gUnknown_085CCCEE + ldr r0, =gText_BattleTourney str r0, [sp, 0x4] add r0, sp, 0x4 strb r1, [r0, 0x4] diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index a8494efe6..40f084a0f 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -18104,7 +18104,7 @@ _081A3E38: cmp r5, r4 bne _081A3E50 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB79 + ldr r1, =gText_SpaceAndSpace bl StringAppend b _081A3EC8 .pool @@ -18112,7 +18112,7 @@ _081A3E50: cmp r5, r4 ble _081A3EC8 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB7F + ldr r1, =gText_CommaSpace bl StringAppend b _081A3EC8 .pool @@ -18120,17 +18120,17 @@ _081A3E68: cmp r4, r5 bne _081A3E80 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB79 + ldr r1, =gText_SpaceAndSpace bl StringAppend b _081A3E88 .pool _081A3E80: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB7F + ldr r1, =gText_CommaSpace bl StringAppend _081A3E88: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB86 + ldr r1, =gText_NewLine bl StringAppend b _081A3EC8 .pool @@ -18138,17 +18138,17 @@ _081A3EA0: cmp r4, r5 bne _081A3EB8 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB79 + ldr r1, =gText_SpaceAndSpace bl StringAppend b _081A3EC0 .pool _081A3EB8: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB7F + ldr r1, =gText_CommaSpace bl StringAppend _081A3EC0: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB84 + ldr r1, =gText_ScrollTextUp bl StringAppend _081A3EC8: ldr r0, =gStringVar1 @@ -18495,10 +18495,10 @@ _081A416A: cmp r4, 0 bne _081A41A4 ldr r4, =gStringVar1 - ldr r1, =gUnknown_085CCB82 + ldr r1, =gText_Space2 adds r0, r4, 0 bl StringAppend - ldr r1, =gUnknown_085CCB88 + ldr r1, =gText_Are adds r0, r4, 0 bl StringAppend b _081A4202 @@ -18509,17 +18509,17 @@ _081A41A4: cmp r0, 0 beq _081A41C0 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB84 + ldr r1, =gText_ScrollTextUp bl StringAppend b _081A41C8 .pool _081A41C0: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB82 + ldr r1, =gText_Space2 bl StringAppend _081A41C8: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085CCB8C + ldr r1, =gText_Are2 bl StringAppend b _081A4202 .pool @@ -20577,30 +20577,30 @@ _081A5328: movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x1] - ldr r0, =gUnknown_085CCDB2 + ldr r0, =gText_JapaneseHonorific bl StrCpyDecodeToDisplayedStringBattle ldr r4, =gDisplayedStringBattle adds r0, r4, 0 movs r1, 0xF bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDB5 + ldr r0, =gText_Vs movs r1, 0x10 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDB8 + ldr r0, =gText_RivalBuffer bl StrCpyDecodeToDisplayedStringBattle adds r0, r4, 0 movs r1, 0x11 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDBB + ldr r0, =gText_Mind movs r1, 0x12 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDC0 + ldr r0, =gText_Skill movs r1, 0x13 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDC6 + ldr r0, =gText_Body movs r1, 0x14 bl battle_show_message_maybe - ldr r0, =gUnknown_085CCDCB + ldr r0, =gText_Judgement bl StrCpyDecodeToDisplayedStringBattle adds r0, r4, 0 movs r1, 0x15 @@ -20684,7 +20684,7 @@ _081A544C: _081A5464: movs r3, 0x1 bl sub_81A5558 - ldr r0, =gUnknown_085CCDCB + ldr r0, =gText_Judgement bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x15 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index fb6a48194..e5f031962 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -4375,7 +4375,7 @@ sub_8074770: @ 8074770 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085CCB2C + ldr r0, =gText_SafariBalls add r1, sp, 0x4 str r1, [sp] movs r1, 0 @@ -4419,7 +4419,7 @@ sub_80747D8: @ 80747D8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, =gUnknown_085CCB3C + ldr r1, =gText_SafariBallLeft add r0, sp, 0x4 bl StringCopy ldr r1, =gNumSafariBalls diff --git a/asm/battle_message.s b/asm/battle_message.s index 954be7e89..60051a8f5 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -136,12 +136,12 @@ _0814E1CC: movs r0, 0x80 lsls r0, 17 ands r2, r0 - ldr r7, =gUnknown_085CBBCD + ldr r7, =gText_TwoTrainersWantToBattle cmp r2, 0 bne _0814E200 b _0814E6D8 _0814E200: - ldr r7, =gUnknown_085CD318 + ldr r7, =gText_TwoTrainersWantToBattle3 b _0814E6D8 .pool _0814E214: @@ -151,19 +151,19 @@ _0814E214: lsls r0, 4 cmp r1, r0 bne _0814E22C - ldr r7, =gUnknown_085CBB9C + ldr r7, =gText_TrainerXYWantsToBattle b _0814E6D8 .pool _0814E22C: movs r0, 0x80 lsls r0, 17 ands r2, r0 - ldr r7, =gUnknown_085CBBB9 + ldr r7, =gText_TrainerXWantsToBattle cmp r2, 0 bne _0814E23A b _0814E6D8 _0814E23A: - ldr r7, =gUnknown_085CD301 + ldr r7, =gText_TrainerWantsToBattle b _0814E6D8 .pool _0814E248: @@ -175,12 +175,12 @@ _0814E248: movs r0, 0x80 lsls r0, 8 ands r2, r0 - ldr r7, =gUnknown_085CBB9C + ldr r7, =gText_TrainerXYWantsToBattle cmp r2, 0 bne _0814E260 b _0814E6D8 _0814E260: - ldr r7, =gUnknown_085CCE17 + ldr r7, =gText_TwoTrainersWantToBattle2 b _0814E6D8 .pool _0814E26C: @@ -189,7 +189,7 @@ _0814E26C: ands r0, r2 cmp r0, 0 beq _0814E280 - ldr r7, =gUnknown_085CBB5A + ldr r7, =gText_WildPkmnAppeared2 b _0814E6D8 .pool _0814E280: @@ -197,19 +197,19 @@ _0814E280: ands r0, r2 cmp r0, 0 beq _0814E290 - ldr r7, =gUnknown_085CBB82 + ldr r7, =gText_TwoWildPkmnAppeared b _0814E6D8 .pool _0814E290: movs r0, 0x80 lsls r0, 2 ands r2, r0 - ldr r7, =gUnknown_085CBB47 + ldr r7, =gText_WildPkmnAppeared cmp r2, 0 bne _0814E29E b _0814E6D8 _0814E29E: - ldr r7, =gUnknown_085CBB6D + ldr r7, =gText_WildPkmnAppearedPause b _0814E6D8 .pool _0814E2AC: @@ -230,7 +230,7 @@ _0814E2AC: ands r0, r1 cmp r0, 0 beq _0814E2DC - ldr r7, =gUnknown_085CCE38 + ldr r7, =gText_TrainerXYSentOutZGoN b _0814E6D8 .pool _0814E2DC: @@ -239,22 +239,22 @@ _0814E2DC: ands r0, r1 cmp r0, 0 beq _0814E2F0 - ldr r7, =gUnknown_085CBC96 + ldr r7, =gText_GoTwoPkmn b _0814E6D8 .pool _0814E2F0: movs r0, 0x40 ands r1, r0 - ldr r7, =gUnknown_085CBC96 + ldr r7, =gText_GoTwoPkmn cmp r1, 0 bne _0814E2FC b _0814E6D8 _0814E2FC: - ldr r7, =gUnknown_085CBCE5 + ldr r7, =gText_EnemySentOutPkmnGoPkmn b _0814E6D8 .pool _0814E308: - ldr r7, =gUnknown_085CBC8E + ldr r7, =gText_GoPkmn b _0814E6D8 .pool _0814E310: @@ -275,7 +275,7 @@ _0814E310: cmp r0, 0 beq _0814E33C _0814E330: - ldr r7, =gUnknown_085CCDDE + ldr r7, =gText_TwoTrainersSentPkmn b _0814E6D8 .pool _0814E33C: @@ -283,18 +283,18 @@ _0814E33C: ands r0, r1 cmp r0, 0 beq _0814E34C - ldr r7, =gUnknown_085CBC4E + ldr r7, =gText_TwoTrainersSentOutPkmn b _0814E6D8 .pool _0814E34C: ldr r0, =0x02000002 ands r1, r0 - ldr r7, =gUnknown_085CBBFA + ldr r7, =gText_TrainerXYSentOutTwoPkmn cmp r1, 0 bne _0814E358 b _0814E6D8 _0814E358: - ldr r7, =gUnknown_085CBC37 + ldr r7, =gText_TrainerXSentOutTwoPkmn b _0814E6D8 .pool _0814E368: @@ -306,12 +306,12 @@ _0814E368: ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 - ldr r7, =gUnknown_085CBC27 + ldr r7, =gText_TrainerXSentOutPkmn cmp r1, r0 beq _0814E380 b _0814E6D8 _0814E380: - ldr r7, =gUnknown_085CBBE7 + ldr r7, =gText_TrainerXYSentOutPkmn b _0814E6D8 .pool _0814E394: @@ -327,7 +327,7 @@ _0814E394: ldrb r2, [r0] cmp r2, 0 bne _0814E3BC - ldr r7, =gUnknown_085CBCFD + ldr r7, =gText_PkmnThatsEnough b _0814E6D8 .pool _0814E3BC: @@ -340,16 +340,16 @@ _0814E3BC: cmp r0, 0 beq _0814E3D8 _0814E3CC: - ldr r7, =gUnknown_085CBD1B + ldr r7, =gText_PkmnComeBack b _0814E6D8 .pool _0814E3D8: - ldr r7, =gUnknown_085CBD3D + ldr r7, =gText_PkmnGoodComeBack cmp r2, 0x2 beq _0814E3E0 b _0814E6D8 _0814E3E0: - ldr r7, =gUnknown_085CBD2A + ldr r7, =gText_PkmnOkComeBack b _0814E6D8 .pool _0814E3EC: @@ -370,16 +370,16 @@ _0814E406: ldr r0, [r2] movs r1, 0x40 ands r0, r1 - ldr r7, =gUnknown_085CBD65 + ldr r7, =gText_TrainerXWithdrewPkmn cmp r0, 0 bne _0814E414 b _0814E6D8 _0814E414: - ldr r7, =gUnknown_085CBD75 + ldr r7, =gText_TrainerXWithdrewPkmn2 b _0814E6D8 .pool _0814E428: - ldr r7, =gUnknown_085CBD52 + ldr r7, =gText_TrainerXYWithdrewPkmn b _0814E6D8 .pool _0814E430: @@ -402,22 +402,22 @@ _0814E430: cmp r0, 0 beq _0814E468 _0814E456: - ldr r7, =gUnknown_085CBCA5 + ldr r7, =gText_GoPkmn2 b _0814E6D8 .pool _0814E468: cmp r2, 0x1 bne _0814E474 - ldr r7, =gUnknown_085CBCAD + ldr r7, =gText_DoItPkmn b _0814E6D8 .pool _0814E474: - ldr r7, =gUnknown_085CBCC7 + ldr r7, =gText_YourFoesWeakGetEmPkmn cmp r2, 0x2 beq _0814E47C b _0814E6D8 _0814E47C: - ldr r7, =gUnknown_085CBCB8 + ldr r7, =gText_GoForItPkmn b _0814E6D8 .pool _0814E488: @@ -440,7 +440,7 @@ _0814E4AC: ands r1, r0 cmp r1, 0 beq _0814E4BC - ldr r7, =gUnknown_085CBC7E + ldr r7, =gText_TrainerXSentOutPkmn3 b _0814E6D8 .pool _0814E4BC: @@ -448,12 +448,12 @@ _0814E4BC: ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 - ldr r7, =gUnknown_085CBC6E + ldr r7, =gText_TrainerXSentOutPkmn2 cmp r1, r0 beq _0814E4CC b _0814E6D8 _0814E4CC: - ldr r7, =gUnknown_085CBC14 + ldr r7, =gText_TrainerXYSentOutPkmn2 b _0814E6D8 .pool _0814E4DC: @@ -465,7 +465,7 @@ _0814E4DC: mov r1, r9 ldrb r0, [r1, 0x17] _0814E4EA: - ldr r7, =gUnknown_085CCE04 + ldr r7, =gText_TrainerXYSentOutPkmn3 cmp r0, 0x1 beq _0814E4F2 b _0814E6D8 @@ -489,7 +489,7 @@ _0814E4F8: ldrb r2, [r1] lsls r1, r2, 4 adds r1, r2 - ldr r2, =gUnknown_085CCBBC + ldr r2, =gText_UnknownMoveTypes adds r1, r2 bl StringCopy b _0814E544 @@ -505,7 +505,7 @@ _0814E534: _0814E544: ldr r0, =gBattleTextBuff2 bl sub_814F950 - ldr r7, =gUnknown_085CBDAC + ldr r7, =gText_XUsedY2 b _0814E6D8 .pool _0814E55C: @@ -547,12 +547,12 @@ _0814E5A4: ldr r0, [r0] movs r1, 0x40 ands r0, r1 - ldr r7, =gUnknown_085CB5D2 + ldr r7, =gText_WildFled cmp r0, 0 bne _0814E5B4 b _0814E6D8 _0814E5B4: - ldr r7, =gUnknown_085CB5DF + ldr r7, =gText_TwoWildFled b _0814E6D8 .pool _0814E5C4: @@ -594,18 +594,18 @@ _0814E60E: movs r0, 0x80 lsls r0, 16 ands r1, r0 - ldr r7, =gUnknown_085CB538 + ldr r7, =gText_PlayerBeatTwo cmp r1, 0 beq _0814E6D8 ldr r7, =gText_TwoEnemiesDefeated b _0814E6D8 .pool _0814E628: - ldr r7, =gUnknown_085CB567 + ldr r7, =gText_PlayerLostToTwo b _0814E6D8 .pool _0814E630: - ldr r7, =gUnknown_085CB5A6 + ldr r7, =gText_PlayerBattledToDrawVsTwo b _0814E6D8 .pool _0814E638: @@ -634,11 +634,11 @@ _0814E666: b _0814E6D8 .pool _0814E670: - ldr r7, =gUnknown_085CD24C + ldr r7, =gText_PlayerLostAgainst2 b _0814E6D8 .pool _0814E678: - ldr r7, =gUnknown_085CD267 + ldr r7, =gText_PlayerBattledToDraw2 b _0814E6D8 .pool _0814E680: @@ -657,15 +657,15 @@ _0814E698: beq _0814E6B0 b _0814E6D8 _0814E69E: - ldr r7, =gUnknown_085CB524 + ldr r7, =gText_PlayerDefeated b _0814E6D8 .pool _0814E6A8: - ldr r7, =gUnknown_085CB54F + ldr r7, =gText_PlayerLostAgainst b _0814E6D8 .pool _0814E6B0: - ldr r7, =gUnknown_085CB581 + ldr r7, =gText_PlayerBattledToDraw b _0814E6D8 .pool _0814E6B8: @@ -679,7 +679,7 @@ _0814E6B8: b _0814E6DE .pool _0814E6CC: - ldr r1, =gUnknown_085CC270 + ldr r1, =gBattleStringsTable adds r0, r6, 0 subs r0, 0xC lsls r0, 2 @@ -1104,10 +1104,10 @@ _0814EAF8: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814EB36 - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix b _0814EB36 .pool _0814EB2C: @@ -1229,10 +1229,10 @@ _0814EC38: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814EC56 - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814EC56: ldrb r1, [r4] adds r0, r1, 0 @@ -1294,10 +1294,10 @@ _0814ECD4: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814ECF2 - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814ECF2: ldrb r1, [r4] adds r0, r1, 0 @@ -1359,10 +1359,10 @@ _0814ED70: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814ED8E - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814ED8E: ldrb r1, [r4] adds r0, r1, 0 @@ -1424,10 +1424,10 @@ _0814EE0C: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814EE2A - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814EE2A: ldrb r1, [r4] adds r0, r1, 0 @@ -1489,10 +1489,10 @@ _0814EEA8: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814EEC6 - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814EEC6: ldrb r1, [r4] adds r0, r1, 0 @@ -1569,7 +1569,7 @@ _0814EF6A: ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 - ldr r1, =gUnknown_085CCBBC + ldr r1, =gText_UnknownMoveTypes adds r4, r0, r1 b _0814F5C0 .pool @@ -1626,7 +1626,7 @@ _0814EFEC: adds r1, r0 mov r0, sp bl StringCopy - ldr r1, =gUnknown_085CC0AD + ldr r1, =gText_BerrySuffix mov r0, sp bl StringAppend b _0814F5BE @@ -1652,13 +1652,13 @@ _0814F014: adds r1, r0 mov r0, sp bl StringCopy - ldr r1, =gUnknown_085CC0AD + ldr r1, =gText_BerrySuffix mov r0, sp bl StringAppend b _0814F5BE .pool _0814F05C: - ldr r4, =gUnknown_085CC0A0 + ldr r4, =gText_EnigmaBerry b _0814F5C0 .pool _0814F064: @@ -1996,10 +1996,10 @@ _0814F330: ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, =gUnknown_085CBD85 + ldr r4, =gText_WildPkmnPrefix cmp r1, 0 beq _0814F34E - ldr r4, =gUnknown_085CBD8B + ldr r4, =gText_FoePkmnPrefix _0814F34E: ldrb r1, [r4] adds r0, r1, 0 @@ -2051,12 +2051,12 @@ _0814F3C4: ldr r0, =0x000008ab bl FlagGet lsls r0, 24 - ldr r4, =gUnknown_085CC015 + ldr r4, =gText_SomeonesPC cmp r0, 0 bne _0814F3D4 b _0814F5C0 _0814F3D4: - ldr r4, =gUnknown_085CC01F + ldr r4, =gText_LanettesPC b _0814F5C0 .pool _0814F3E4: @@ -2069,12 +2069,12 @@ _0814F3EE: ldrb r0, [r0] bl GetBankSide lsls r0, 24 - ldr r4, =gUnknown_085CBD9A + ldr r4, =gText_FoePkmnPrefix3 cmp r0, 0 beq _0814F3FE b _0814F5C0 _0814F3FE: - ldr r4, =gUnknown_085CBD9E + ldr r4, =gText_AllyPkmnPrefix2 b _0814F5C0 .pool _0814F410: @@ -2087,12 +2087,12 @@ _0814F41A: ldrb r0, [r0] bl GetBankSide lsls r0, 24 - ldr r4, =gUnknown_085CBD91 + ldr r4, =gText_FoePkmnPrefix2 cmp r0, 0 beq _0814F42A b _0814F5C0 _0814F42A: - ldr r4, =gUnknown_085CBD95 + ldr r4, =gText_AllyPkmnPrefix b _0814F5C0 .pool _0814F43C: @@ -2105,12 +2105,12 @@ _0814F446: ldrb r0, [r0] bl GetBankSide lsls r0, 24 - ldr r4, =gUnknown_085CBDA3 + ldr r4, =gText_FoePkmnPrefix4 cmp r0, 0 beq _0814F456 b _0814F5C0 _0814F456: - ldr r4, =gUnknown_085CBDA7 + ldr r4, =gText_AllyPkmnPrefix3 b _0814F5C0 .pool _0814F468: @@ -2387,7 +2387,7 @@ _0814F6AC: ldrb r0, [r0, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable subs r1, 0xC lsls r1, 2 adds r1, r0 @@ -2485,13 +2485,13 @@ _0814F768: ands r0, r1 cmp r0, 0 beq _0814F788 - ldr r1, =gUnknown_085CBD8B + ldr r1, =gText_FoePkmnPrefix adds r0, r6, 0 bl StringAppend b _0814F790 .pool _0814F788: - ldr r1, =gUnknown_085CBD85 + ldr r1, =gText_WildPkmnPrefix adds r0, r6, 0 bl StringAppend _0814F790: @@ -2562,7 +2562,7 @@ _0814F81A: b _0814F8DE .pool _0814F828: - ldr r1, =gUnknown_085CBE6C + ldr r1, =gPokeblockWasTooXStringTable adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 @@ -2618,11 +2618,11 @@ _0814F858: adds r1, r0 adds r0, r6, 0 bl StringCopy - ldr r1, =gUnknown_085CC0AD + ldr r1, =gText_BerrySuffix b _0814F8BE .pool _0814F8BC: - ldr r1, =gUnknown_085CC0A0 + ldr r1, =gText_EnigmaBerry _0814F8BE: adds r0, r6, 0 bl StringAppend @@ -2679,7 +2679,7 @@ _0814F918: blt _0814F944 cmp r2, 0x2 bgt _0814F938 - ldr r1, =gUnknown_085CCBB5 + ldr r1, =gText_SpaceIs adds r0, r4, 0 bl StringCopy b _0814F944 @@ -2687,7 +2687,7 @@ _0814F918: _0814F938: cmp r2, 0x4 bgt _0814F944 - ldr r1, =gUnknown_085CCBB9 + ldr r1, =gText_ApostropheS adds r0, r4, 0 bl StringCopy _0814F944: @@ -2744,26 +2744,26 @@ _0814F99C: .4byte _0814F9C8 .4byte _0814F9D8 _0814F9B0: - ldr r1, =gUnknown_085CBDB7 + ldr r1, =gText_ExclamationMark b _0814F9CA .pool _0814F9B8: - ldr r1, =gUnknown_085CBDB9 + ldr r1, =gText_ExclamationMark2 b _0814F9CA .pool _0814F9C0: - ldr r1, =gUnknown_085CBDBB + ldr r1, =gText_ExclamationMark3 b _0814F9CA .pool _0814F9C8: - ldr r1, =gUnknown_085CBDBD + ldr r1, =gText_ExclamationMark4 _0814F9CA: adds r0, r3, 0 bl StringCopy b _0814F9E0 .pool _0814F9D8: - ldr r1, =gUnknown_085CBDBF + ldr r1, =gText_ExclamationMark5 adds r0, r3, 0 bl StringCopy _0814F9E0: diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index b8710acd4..f66ec736c 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1333,7 +1333,7 @@ _0813E6D4: bl _0813F1A4 _0813E6E4: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085CC990 + ldr r1, =gText_PkmnIsEvolving adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1621,7 +1621,7 @@ _0813E990: bl _0813F1A4 _0813E99E: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085CC9A6 + ldr r1, =gText_CongratsPkmnEvolved adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1857,13 +1857,13 @@ _0813EBB8: cmp r0, 0 beq _0813EBE4 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085CC9EE + ldr r1, =gText_EllipsisQuestionMark bl StringExpandPlaceholders b _0813EBEC .pool _0813EBE4: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085CC9D3 + ldr r1, =gText_PkmnStoppedEvolving bl StringExpandPlaceholders _0813EBEC: ldr r0, =gStringVar4 @@ -1895,7 +1895,7 @@ _0813EC2A: bl sub_804F574 ldr r0, =0x0000016f bl PlayFanfare - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0xC] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -1992,7 +1992,7 @@ _0813ED0A: b _0813F1A4 _0813ED16: bl sub_804F574 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x10] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2021,7 +2021,7 @@ _0813ED56: beq _0813ED62 b _0813F1A4 _0813ED62: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x14] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2046,7 +2046,7 @@ _0813ED90: lsls r0, 24 cmp r0, 0 bne _0813EDCE - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x18] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2085,7 +2085,7 @@ _0813EDEA: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, =gUnknown_085CCABB + ldr r0, =gText_BattleYesNoChoice movs r1, 0xC bl battle_show_message_maybe ldr r0, =gTasks @@ -2285,7 +2285,7 @@ _0813EFC8: bl IsHMMove2 cmp r0, 0 beq _0813F014 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r3, =0x000004cc adds r0, r3 ldr r0, [r0] @@ -2333,7 +2333,7 @@ _0813F014: b _0813F1A2 .pool _0813F05C: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0xCF lsls r1, 2 adds r0, r1 @@ -2365,7 +2365,7 @@ _0813F09E: beq _0813F0AA b _0813F1A4 _0813F0AA: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x1C] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2390,7 +2390,7 @@ _0813F0D8: lsls r0, 24 cmp r0, 0 bne _0813F1A4 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0xD0 lsls r1, 2 adds r0, r1 @@ -2409,7 +2409,7 @@ _0813F0D8: b _0813F1A4 .pool _0813F120: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x20] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2429,7 +2429,7 @@ _0813F120: b _0813F1A4 .pool _0813F154: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x24] bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle @@ -2533,7 +2533,7 @@ _0813F204: .4byte _0813F7E4 _0813F258: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085CC990 + ldr r1, =gText_PkmnIsEvolving adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -2804,7 +2804,7 @@ _0813F4E4: bl _0813FCC4 _0813F4F2: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085CC9A6 + ldr r1, =gText_CongratsPkmnEvolved adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -3029,7 +3029,7 @@ _0813F704: b _0813FCC4 _0813F714: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085CC9EE + ldr r1, =gText_EllipsisQuestionMark adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -3062,7 +3062,7 @@ _0813F762: bl sub_804F574 ldr r0, =0x0000016f bl PlayFanfare - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0xC] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3161,7 +3161,7 @@ _0813F846: b _0813FCC4 _0813F852: bl sub_804F574 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x10] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3191,7 +3191,7 @@ _0813F892: beq _0813F89E b _0813FCC4 _0813F89E: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x14] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3217,7 +3217,7 @@ _0813F8CC: lsls r0, 24 cmp r0, 0 bne _0813F90C - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x18] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3294,7 +3294,7 @@ _0813F986: _0813F98C: ldr r0, =gBattleCommunication strb r6, [r0, 0x1] - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 @@ -3331,7 +3331,7 @@ _0813F9E4: ldr r1, =gBattleCommunication movs r0, 0x1 strb r0, [r1, 0x1] - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0x92 lsls r1, 3 adds r0, r1 @@ -3437,7 +3437,7 @@ _0813FAEC: bl IsHMMove2 cmp r0, 0 beq _0813FB3C - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r1, =0x000004cc adds r0, r1 ldr r0, [r0] @@ -3476,7 +3476,7 @@ _0813FB3C: mov r0, r9 adds r2, r4, 0 bl SetMonMoveSlot - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0xCF lsls r1, 2 adds r0, r1 @@ -3509,7 +3509,7 @@ _0813FBB2: beq _0813FBBE b _0813FCC4 _0813FBBE: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x1C] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3535,7 +3535,7 @@ _0813FBEC: lsls r0, 24 cmp r0, 0 bne _0813FCC4 - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable movs r1, 0xD0 lsls r1, 2 adds r0, r1 @@ -3555,7 +3555,7 @@ _0813FBEC: b _0813FCC4 .pool _0813FC38: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x20] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle @@ -3576,7 +3576,7 @@ _0813FC38: b _0813FCC4 .pool _0813FC70: - ldr r0, =gUnknown_085CC270 + ldr r0, =gBattleStringsTable ldr r0, [r0, 0x24] bl StrCpyDecodeToDisplayedStringBattle ldr r1, =gDisplayedStringBattle diff --git a/charmap.txt b/charmap.txt index 4f2f10e0b..8fe4147cc 100644 --- a/charmap.txt +++ b/charmap.txt @@ -440,12 +440,14 @@ GREEN = 06 LIGHT_GREEN = 07 BLUE = 08 LIGHT_BLUE = 09 -BORDER_COLOR1 = 0A @ white -BORDER_COLOR2 = 0B @ white with a tinge of green -BORDER_COLOR3 = 0C @ white 2 -BORDER_COLOR4 = 0D @ aquamarine -BORDER_COLOR5 = 0E @ blue-green -BORDER_COLOR6 = 0F @ cerulean +@ these next colors can be set to anything arbitrary at runtime +@ usually though they'll have the textbox border colors as described below +DYNAMIC_COLOR1 = 0A @ white +DYNAMIC_COLOR2 = 0B @ white with a tinge of green +DYNAMIC_COLOR3 = 0C @ white 2 +DYNAMIC_COLOR4 = 0D @ aquamarine +DYNAMIC_COLOR5 = 0E @ blue-green +DYNAMIC_COLOR6 = 0F @ cerulean @ sound and music diff --git a/data/battle_message.s b/data/battle_message.s index 40040d9c2..03e1baa12 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -804,28 +804,28 @@ gText_PkmnFledUsing:: @ 85CB4FB gText_WildPkmnFled:: @ 85CB512 .string "{PLAY_SE 0x0011}Wild {STRING 0} fled!$" -gUnknown_085CB524:: @ 85CB524 +gText_PlayerDefeated:: @ 85CB524 .string "Player defeated\n{STRING 32}!$" -gUnknown_085CB538:: @ 85CB538 +gText_PlayerBeatTwo:: @ 85CB538 .string "Player beat {STRING 32}\nand {STRING 33}!$" -gUnknown_085CB54F:: @ 85CB54F +gText_PlayerLostAgainst:: @ 85CB54F .string "Player lost against\n{STRING 32}!$" -gUnknown_085CB567:: @ 85CB567 +gText_PlayerLostToTwo:: @ 85CB567 .string "Player lost to {STRING 32}\nand {STRING 33}!$" -gUnknown_085CB581:: @ 85CB581 +gText_PlayerBattledToDraw:: @ 85CB581 .string "Player battled to a draw against\n{STRING 32}!$" -gUnknown_085CB5A6:: @ 85CB5A6 +gText_PlayerBattledToDrawVsTwo:: @ 85CB5A6 .string "Player battled to a draw against\n{STRING 32} and {STRING 33}!$" -gUnknown_085CB5D2:: @ 85CB5D2 +gText_WildFled:: @ 85CB5D2 .string "{PLAY_SE 0x0011}{STRING 32} fled!$" -gUnknown_085CB5DF:: @ 85CB5DF +gText_TwoWildFled:: @ 85CB5DF .string "{PLAY_SE 0x0011}{STRING 32} and\n{STRING 33} fled!$" gText_NoRunningFromTrainers:: @ 85CB5F3 @@ -980,194 +980,194 @@ gText_OutOfSafariBalls:: @ 85CBB02 .string "{RIVAL} appeared!\p$" -gUnknown_085CBB47:: @ 85CBB47 +gText_WildPkmnAppeared:: @ 85CBB47 .string "Wild {RIVAL} appeared!\p$" -gUnknown_085CBB5A:: @ 85CBB5A +gText_WildPkmnAppeared2:: @ 85CBB5A .string "Wild {RIVAL} appeared!\p$" -gUnknown_085CBB6D:: @ 85CBB6D +gText_WildPkmnAppearedPause:: @ 85CBB6D .string "Wild {RIVAL} appeared!{PAUSE 127}$" -gUnknown_085CBB82:: @ 85CBB82 +gText_TwoWildPkmnAppeared:: @ 85CBB82 .string "Wild {RIVAL} and\n{AQUA} appeared!\p$" -gUnknown_085CBB9C:: @ 85CBB9C +gText_TrainerXYWantsToBattle:: @ 85CBB9C .string "{STRING 28} {STRING 29}\nwould like to battle!\p$" -gUnknown_085CBBB9:: @ 85CBBB9 +gText_TrainerXWantsToBattle:: @ 85CBBB9 .string "{STRING 32}\nwants to battle!$" -gUnknown_085CBBCD:: @ 85CBBCD +gText_TwoTrainersWantToBattle:: @ 85CBBCD .string "{STRING 32} and {STRING 33}\nwant to battle!$" -gUnknown_085CBBE7:: @ 85CBBE7 +gText_TrainerXYSentOutPkmn:: @ 85CBBE7 .string "{STRING 28} {STRING 29} sent\nout {RIVAL}!$" -gUnknown_085CBBFA:: @ 85CBBFA +gText_TrainerXYSentOutTwoPkmn:: @ 85CBBFA .string "{STRING 28} {STRING 29} sent\nout {RIVAL} and {AQUA}!$" -gUnknown_085CBC14:: @ 85CBC14 +gText_TrainerXYSentOutPkmn2:: @ 85CBC14 .string "{STRING 28} {STRING 29} sent\nout {STRING 0}!$" -gUnknown_085CBC27:: @ 85CBC27 +gText_TrainerXSentOutPkmn:: @ 85CBC27 .string "{STRING 32} sent out\n{RIVAL}!$" -gUnknown_085CBC37:: @ 85CBC37 +gText_TrainerXSentOutTwoPkmn:: @ 85CBC37 .string "{STRING 32} sent out\n{RIVAL} and {AQUA}!$" -gUnknown_085CBC4E:: @ 85CBC4E +gText_TwoTrainersSentOutPkmn:: @ 85CBC4E .string "{STRING 32} sent out {STRING 10}!\n{STRING 33} sent out {STRING 12}!$" -gUnknown_085CBC6E:: @ 85CBC6E +gText_TrainerXSentOutPkmn2:: @ 85CBC6E .string "{STRING 32} sent out\n{STRING 0}!$" -gUnknown_085CBC7E:: @ 85CBC7E +gText_TrainerXSentOutPkmn3:: @ 85CBC7E .string "{STRING 34} sent out\n{STRING 0}!$" -gUnknown_085CBC8E:: @ 85CBC8E +gText_GoPkmn:: @ 85CBC8E .string "Go! {STRING 5}!$" -gUnknown_085CBC96:: @ 85CBC96 +gText_GoTwoPkmn:: @ 85CBC96 .string "Go! {STRING 5} and\n{VERSION}!$" -gUnknown_085CBCA5:: @ 85CBCA5 +gText_GoPkmn2:: @ 85CBCA5 .string "Go! {STRING 0}!$" -gUnknown_085CBCAD:: @ 85CBCAD +gText_DoItPkmn:: @ 85CBCAD .string "Do it! {STRING 0}!$" -gUnknown_085CBCB8:: @ 85CBCB8 +gText_GoForItPkmn:: @ 85CBCB8 .string "Go for it, {STRING 0}!$" -gUnknown_085CBCC7:: @ 85CBCC7 +gText_YourFoesWeakGetEmPkmn:: @ 85CBCC7 .string "Your foe’s weak!\nGet ’em, {STRING 0}!$" -gUnknown_085CBCE5:: @ 85CBCE5 +gText_EnemySentOutPkmnGoPkmn:: @ 85CBCE5 .string "{STRING 31} sent out {STRING 11}!\nGo! {STRING 9}!$" -gUnknown_085CBCFD:: @ 85CBCFD +gText_PkmnThatsEnough:: @ 85CBCFD .string "{STRING 0}, that’s enough!\nCome back!$" -gUnknown_085CBD1B:: @ 85CBD1B +gText_PkmnComeBack:: @ 85CBD1B .string "{STRING 0}, come back!$" -gUnknown_085CBD2A:: @ 85CBD2A +gText_PkmnOkComeBack:: @ 85CBD2A .string "{STRING 0}, OK!\nCome back!$" -gUnknown_085CBD3D:: @ 85CBD3D +gText_PkmnGoodComeBack:: @ 85CBD3D .string "{STRING 0}, good!\nCome back!$" -gUnknown_085CBD52:: @ 85CBD52 +gText_TrainerXYWithdrewPkmn:: @ 85CBD52 .string "{STRING 28} {STRING 29}\nwithdrew {STRING 0}!$" -gUnknown_085CBD65:: @ 85CBD65 +gText_TrainerXWithdrewPkmn:: @ 85CBD65 .string "{STRING 32} withdrew\n{STRING 0}!$" -gUnknown_085CBD75:: @ 85CBD75 +gText_TrainerXWithdrewPkmn2:: @ 85CBD75 .string "{STRING 34} withdrew\n{STRING 0}!$" -gUnknown_085CBD85:: @ 85CBD85 +gText_WildPkmnPrefix:: @ 85CBD85 .string "Wild $" -gUnknown_085CBD8B:: @ 85CBD8B +gText_FoePkmnPrefix:: @ 85CBD8B .string "Foe $" .string "$" -gUnknown_085CBD91:: @ 85CBD91 +gText_FoePkmnPrefix2:: @ 85CBD91 .string "Foe$" -gUnknown_085CBD95:: @ 85CBD95 +gText_AllyPkmnPrefix:: @ 85CBD95 .string "Ally$" -gUnknown_085CBD9A:: @ 85CBD9A +gText_FoePkmnPrefix3:: @ 85CBD9A .string "Foe$" -gUnknown_085CBD9E:: @ 85CBD9E +gText_AllyPkmnPrefix2:: @ 85CBD9E .string "Ally$" -gUnknown_085CBDA3:: @ 85CBDA3 +gText_FoePkmnPrefix4:: @ 85CBDA3 .string "Foe$" -gUnknown_085CBDA7:: @ 85CBDA7 +gText_AllyPkmnPrefix3:: @ 85CBDA7 .string "Ally$" -gUnknown_085CBDAC:: @ 85CBDAC +gText_XUsedY2:: @ 85CBDAC .string "{STRING 15} used\n{PLAYER}$" -gUnknown_085CBDB7:: @ 85CBDB7 +gText_ExclamationMark:: @ 85CBDB7 .string "!$" -gUnknown_085CBDB9:: @ 85CBDB9 +gText_ExclamationMark2:: @ 85CBDB9 .string "!$" -gUnknown_085CBDBB:: @ 85CBDBB +gText_ExclamationMark3:: @ 85CBDBB .string "!$" -gUnknown_085CBDBD:: @ 85CBDBD +gText_ExclamationMark4:: @ 85CBDBD .string "!$" -gUnknown_085CBDBF:: @ 85CBDBF +gText_ExclamationMark5:: @ 85CBDBF .string "!$" -gUnknown_085CBDC1:: @ 85CBDC1 +gText_HP2:: @ 85CBDC1 .string "HP$" -gUnknown_085CBDC4:: @ 85CBDC4 +gText_Attack2:: @ 85CBDC4 .string "ATTACK$" -gUnknown_085CBDCB:: @ 85CBDCB +gText_Defense2:: @ 85CBDCB .string "DEFENSE$" -gUnknown_085CBDD3:: @ 85CBDD3 +gText_Speed:: @ 85CBDD3 .string "SPEED$" -gUnknown_085CBDD9:: @ 85CBDD9 +gText_SpAtk2:: @ 85CBDD9 .string "SP. ATK$" -gUnknown_085CBDE1:: @ 85CBDE1 +gText_SpDef2:: @ 85CBDE1 .string "SP. DEF$" -gUnknown_085CBDE9:: @ 85CBDE9 +gText_Accuracy:: @ 85CBDE9 .string "accuracy$" -gUnknown_085CBDF2:: @ 85CBDF2 +gText_Evasiveness:: @ 85CBDF2 .string "evasiveness$" .align 2 gStatNamesTable:: @ 85CBE00 - .4byte gUnknown_085CBDC1 - .4byte gUnknown_085CBDC4 - .4byte gUnknown_085CBDCB - .4byte gUnknown_085CBDD3 - .4byte gUnknown_085CBDD9 - .4byte gUnknown_085CBDE1 - .4byte gUnknown_085CBDE9 - .4byte gUnknown_085CBDF2 + .4byte gText_HP2 + .4byte gText_Attack2 + .4byte gText_Defense2 + .4byte gText_Speed + .4byte gText_SpAtk2 + .4byte gText_SpDef2 + .4byte gText_Accuracy + .4byte gText_Evasiveness -gUnknown_085CBE20:: @ 85CBE20 +gText_PokeblockWasTooSpicy:: @ 85CBE20 .string "was too spicy!$" -gUnknown_085CBE2F:: @ 85CBE2F +gText_PokeblockWasTooDry:: @ 85CBE2F .string "was too dry!$" -gUnknown_085CBE3C:: @ 85CBE3C +gText_PokeblockWasTooSweet:: @ 85CBE3C .string "was too sweet!$" -gUnknown_085CBE4B:: @ 85CBE4B +gText_PokeblockWasTooBitter:: @ 85CBE4B .string "was too bitter!$" -gUnknown_085CBE5B:: @ 85CBE5B +gText_PokeblockWasTooSour:: @ 85CBE5B .string "was too sour!$" .align 2 -gUnknown_085CBE6C:: @ 85CBE6C - .4byte gUnknown_085CBE20 - .4byte gUnknown_085CBE2F - .4byte gUnknown_085CBE3C - .4byte gUnknown_085CBE4B - .4byte gUnknown_085CBE5B +gPokeblockWasTooXStringTable:: @ 85CBE6C + .4byte gText_PokeblockWasTooSpicy + .4byte gText_PokeblockWasTooDry + .4byte gText_PokeblockWasTooSweet + .4byte gText_PokeblockWasTooBitter + .4byte gText_PokeblockWasTooSour gText_XUsedY:: @ 85CBE80 .string "{STRING 35} used\n{STRING 22}!$" @@ -1214,10 +1214,10 @@ gText_GiveNicknameCaptured:: @ 85CBFDB gText_PkmnSentToPC:: @ 85CBFFF .string "{RIVAL} was sent to\n{STRING 39} PC.$" -gUnknown_085CC015:: @ 85CC015 +gText_SomeonesPC:: @ 85CC015 .string "someone’s$" -gUnknown_085CC01F:: @ 85CC01F +gText_LanettesPC:: @ 85CC01F .string "LANETTE’s$" gText_PkmnDataAddedToDex:: @ 85CC029 @@ -1232,10 +1232,10 @@ gText_SandstormIsRaging:: @ 85CC05D gText_BoxIsFull:: @ 85CC074 .string "The BOX is full!\nYou can’t catch any more!\p$" -gUnknown_085CC0A0:: @ 85CC0A0 +gText_EnigmaBerry:: @ 85CC0A0 .string "ENIGMA BERRY$" -gUnknown_085CC0AD:: @ 85CC0AD +gText_BerrySuffix:: @ 85CC0AD .string " BERRY$" gText_PkmnsXCuredParalysis:: @ 85CC0B4 @@ -1287,7 +1287,7 @@ gText_YouThrowABallNowRight:: @ 85CC23F .string "You throw a BALL now, right?\nI… I’ll do my best!$" .align 2 -gUnknown_085CC270:: @ 85CC270 +gBattleStringsTable:: @ 85CC270 .4byte gText_Buffer36 .4byte gText_PkmnGainedEXP .4byte gText_PkmnGrewToLv @@ -1660,142 +1660,241 @@ gUnknown_085CC270:: @ 85CC270 .align 2 gUnknown_085CC834:: @ 85CC834 - .incbin "baserom.gba", 0x5cc834, 0x14e + .2byte 0x0017, 0x0018, 0x0159, 0x001a, 0x014c, 0x00e2, 0x00e3, 0x0021 + .2byte 0x0112, 0x0165, 0x00e8, 0x00e9, 0x00e5, 0x00ed, 0x00f0, 0x00f3 + .2byte 0x00ee, 0x00f4, 0x0066, 0x0067, 0x00ef, 0x00f5, 0x00ea, 0x00eb + .2byte 0x00ec, 0x0065, 0x0098, 0x00e5, 0x00e5, 0x004e, 0x0160, 0x004d + .2byte 0x0161, 0x004f, 0x0068, 0x0069, 0x001b, 0x006a, 0x0139, 0x0052 + .2byte 0x0053, 0x0070, 0x0071, 0x0073, 0x0074, 0x006c, 0x006e, 0x00f7 + .2byte 0x004c, 0x0075, 0x0076, 0x0077, 0x00d5, 0x00d6, 0x003d, 0x0130 + .2byte 0x0145, 0x0146, 0x00d7, 0x00d8, 0x003e, 0x0130, 0x0054, 0x0055 + .2byte 0x0056, 0x0057, 0x0058, 0x0059, 0x013d, 0x013e, 0x005a, 0x005c + .2byte 0x005b, 0x005d, 0x005b, 0x0148, 0x0061, 0x00e5, 0x0063, 0x00e5 + .2byte 0x007d, 0x00e5, 0x007e, 0x00fb, 0x0028, 0x0029, 0x0037, 0x0038 + .2byte 0x0023, 0x0024, 0x002e, 0x002f, 0x0031, 0x0032, 0x0035, 0x0036 + .2byte 0x0017, 0x007c, 0x0045, 0x0136, 0x002d, 0x0139, 0x013b, 0x013c + .2byte 0x00fd, 0x00fd, 0x00fd, 0x00fd, 0x0142, 0x00a1, 0x014f, 0x0107 + .2byte 0x0108, 0x0109, 0x010a, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110 + .2byte 0x0110, 0x0110, 0x0110, 0x0111, 0x0110, 0x0110, 0x0110, 0x00f1 + .2byte 0x0110, 0x0110, 0x0110, 0x0116, 0x0117, 0x0118, 0x0119, 0x016d + .2byte 0x011b, 0x011c, 0x011e, 0x011f, 0x0120, 0x0128, 0x0123, 0x0126 + .2byte 0x0125, 0x0124, 0x0127, 0x0129, 0x0156, 0x0131, 0x0163, 0x016a + .2byte 0x00c7, 0x0163, 0x016a, 0x00c9, 0x0163, 0x016a, 0x0166, 0x0167 + .2byte 0x0168, 0x00cb, 0x0137, 0x0177, 0x0178, 0x0179, 0x017a gUnknown_085CC982:: @ 85CC982 - .incbin "baserom.gba", 0x5cc982, 0xe + .2byte 0x0014, 0x0023, 0x0053, 0x0080, 0x00fa, 0x0148, 0xffff -gUnknown_085CC990:: @ 85CC990 +gText_PkmnIsEvolving:: @ 85CC990 .string "What?\n{STR_VAR_1} is evolving!$" -gUnknown_085CC9A6:: @ 85CC9A6 +gText_CongratsPkmnEvolved:: @ 85CC9A6 .string "Congratulations! Your {STR_VAR_1}\nevolved into {STR_VAR_2}!{UNKNOWN_A}\p$" -gUnknown_085CC9D3:: @ 85CC9D3 +gText_PkmnStoppedEvolving:: @ 85CC9D3 .string "Huh? {STR_VAR_1}\nstopped evolving!\p$" -gUnknown_085CC9EE:: @ 85CC9EE +gText_EllipsisQuestionMark:: @ 85CC9EE .string "……?\p$" -gUnknown_085CC9F3:: @ 85CC9F3 +gText_WhatWillPkmnDo:: @ 85CC9F3 .string "What will\n{STRING 18} do?$" -gUnknown_085CCA04:: @ 85CCA04 +gText_WhatWillPkmnDo2:: @ 85CCA04 .string "What will\n{STRING 35} do?$" -gUnknown_085CCA15:: @ 85CCA15 +gText_WhatWillWallyDo:: @ 85CCA15 .string "What will\nWALLY do?$" -gUnknown_085CCA29:: @ 85CCA29 +gText_LinkStandby:: @ 85CCA29 .string "{PAUSE 16}Link standby…$" -gUnknown_085CCA3A:: @ 85CCA3A - .incbin "baserom.gba", 0x5cca3a, 0x1a +gText_BattleMenu:: @ 85CCA3A + .string "FIGHT{CLEAR_TO 56}BAG\nPOKéMON{CLEAR_TO 56}RUN$" -gUnknown_085CCA54:: @ 85CCA54 - .incbin "baserom.gba", 0x5cca54, 0x1b +gText_SafariZoneMenu:: @ 85CCA54 + .string "BALL{CLEAR_TO 56}{POKEBLOCK}\nGO NEAR{CLEAR_TO 56}RUN$" -gUnknown_085CCA6F:: @ 85CCA6F - .incbin "baserom.gba", 0x5cca6f, 0x4 +gText_MoveInterfacePP:: @ 85CCA6F + .string "PP $" -gUnknown_085CCA73:: @ 85CCA73 - .incbin "baserom.gba", 0x5cca73, 0x48 +gText_MoveInterfaceType:: @ 85CCA73 + .string "TYPE/$" -gUnknown_085CCABB:: @ 85CCABB - .incbin "baserom.gba", 0x5ccabb, 0xf + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}PP\nTYPE/$" + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}$" + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Which move should\nbe forgotten?$" -gUnknown_085CCACA:: @ 85CCACA - .incbin "baserom.gba", 0x5ccaca, 0x62 +gText_BattleYesNoChoice:: @ 85CCABB + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Yes\nNo$" -gUnknown_085CCB2C:: @ 85CCB2C - .incbin "baserom.gba", 0x5ccb2c, 0x10 +gText_BattleSwitchWhich:: @ 85CCACA + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}Switch\nwhich?$" -gUnknown_085CCB3C:: @ 85CCB3C - .incbin "baserom.gba", 0x5ccb3c, 0x3d + .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR4 DYNAMIC_COLOR5 DYNAMIC_COLOR6}$" + .string "{UP_ARROW}$" + .string "{ESCAPE 4}$" + .string "-$" -gUnknown_085CCB79:: @ 85CCB79 - .incbin "baserom.gba", 0x5ccb79, 0x6 +gText_HP:: @ 85CCAF1 + .string "HP$" -gUnknown_085CCB7F:: @ 85CCB7F - .incbin "baserom.gba", 0x5ccb7f, 0x3 +gText_Attack:: @ 85CCAF4 + .string "ATTACK$" -gUnknown_085CCB82:: @ 85CCB82 - .incbin "baserom.gba", 0x5ccb82, 0x2 +gText_Defense:: @ 85CCAFB + .string "DEFENSE$" -gUnknown_085CCB84:: @ 85CCB84 - .incbin "baserom.gba", 0x5ccb84, 0x2 +gText_SpAtk:: @ 85CCB03 + .string "SP. ATK$" -gUnknown_085CCB86:: @ 85CCB86 - .incbin "baserom.gba", 0x5ccb86, 0x2 +gText_SpDef:: @ 85CCB0B + .string "SP. DEF$" -gUnknown_085CCB88:: @ 85CCB88 - .incbin "baserom.gba", 0x5ccb88, 0x4 + .align 2 + .4byte gText_HP + .4byte gText_SpAtk + .4byte gText_Attack + .4byte gText_SpDef + .4byte gText_Defense + .4byte gText_Speed -gUnknown_085CCB8C:: @ 85CCB8C - .incbin "baserom.gba", 0x5ccb8c, 0x4 +gText_SafariBalls:: @ 85CCB2C + .string "{HIGHLIGHT DARK_GREY}SAFARI BALLS$" -gBadEggNickname:: @ 85CCB90 - .incbin "baserom.gba", 0x5ccb90, 0x8 +gText_SafariBallLeft:: @ 85CCB3C + .string "{HIGHLIGHT DARK_GREY}Left: $" + .string "{HIGHLIGHT DARK_GREY}$" + .string "sleep$" + .string "poison$" + .string "burn$" + .string "paralysis$" + .string "ice$" + .string "confusion$" + .string "love$" -BattleText_Wally:: @ 85CCB98 - .incbin "baserom.gba", 0x5ccb98, 0x6 +gText_SpaceAndSpace:: @ 85CCB79 + .string " and $" -gUnknown_085CCB9E:: @ 85CCB9E - .incbin "baserom.gba", 0x5ccb9e, 0x7 +gText_CommaSpace:: @ 85CCB7F + .string ", $" -gUnknown_085CCBA5:: @ 85CCBA5 - .incbin "baserom.gba", 0x5ccba5, 0x8 +gText_Space2:: @ 85CCB82 + .string " $" -gUnknown_085CCBAD:: @ 85CCBAD - .incbin "baserom.gba", 0x5ccbad, 0x8 +gText_ScrollTextUp:: @ 85CCB84 + .string "\l$" -gUnknown_085CCBB5:: @ 85CCBB5 - .incbin "baserom.gba", 0x5ccbb5, 0x4 +gText_NewLine:: @ 85CCB86 + .string "\n$" -gUnknown_085CCBB9:: @ 85CCBB9 - .incbin "baserom.gba", 0x5ccbb9, 0x3 +gText_Are:: @ 85CCB88 + .string "are$" -gUnknown_085CCBBC:: @ 85CCBBC - .incbin "baserom.gba", 0x5ccbbc, 0x132 +gText_Are2:: @ 85CCB8C + .string "are$" -gUnknown_085CCCEE:: @ 85CCCEE - .incbin "baserom.gba", 0x5cccee, 0x32 +gText_BadEgg:: @ 85CCB90 + .string "Bad EGG$" -gUnknown_085CCD20:: @ 85CCD20 - .incbin "baserom.gba", 0x5ccd20, 0x92 +gText_BattleWallyName:: @ 85CCB98 + .string "WALLY$" -gUnknown_085CCDB2:: @ 85CCDB2 - .incbin "baserom.gba", 0x5ccdb2, 0x3 +gText_Win:: @ 85CCB9E + .string "{HIGHLIGHT TRANSPARENT}Win$" -gUnknown_085CCDB5:: @ 85CCDB5 - .incbin "baserom.gba", 0x5ccdb5, 0x3 +gText_Loss:: @ 85CCBA5 + .string "{HIGHLIGHT TRANSPARENT}Loss$" -gUnknown_085CCDB8:: @ 85CCDB8 - .incbin "baserom.gba", 0x5ccdb8, 0x3 +gText_Draw:: @ 85CCBAD + .string "{HIGHLIGHT TRANSPARENT}Draw$" -gUnknown_085CCDBB:: @ 85CCDBB - .incbin "baserom.gba", 0x5ccdbb, 0x5 +gText_SpaceIs:: @ 85CCBB5 + .string " is$" -gUnknown_085CCDC0:: @ 85CCDC0 - .incbin "baserom.gba", 0x5ccdc0, 0x6 +gText_ApostropheS:: @ 85CCBB9 + .string "’s$" -gUnknown_085CCDC6:: @ 85CCDC6 - .incbin "baserom.gba", 0x5ccdc6, 0x5 +gText_UnknownMoveTypes:: @ 85CCBBC + .string "a NORMAL move$ " + .string "a FIGHTING move$ " + .string "a FLYING move$ " + .string "a POISON move$ " + .string "a GROUND move$ " + .string "a ROCK move$ " + .string "a BUG move$ " + .string "a GHOST move$ " + .string "a STEEL move$ " + .string "a ??? move$ " + .string "a FIRE move$ " + .string "a WATER move$ " + .string "a GRASS move$ " + .string "an ELECTRIC move$" + .string "a PSYCHIC move$ " + .string "an ICE move$ " + .string "a DRAGON move$ " + .string "a DARK move$ " -gUnknown_085CCDCB:: @ 85CCDCB - .incbin "baserom.gba", 0x5ccdcb, 0x13 +gText_BattleTourney:: @ 85CCCEE + .string "BATTLE TOURNEY$" -gUnknown_085CCDDE:: @ 85CCDDE - .incbin "baserom.gba", 0x5ccdde, 0x26 +gText_Round1:: @ 85CCCFD + .string "Round 1$" -gUnknown_085CCE04:: @ 85CCE04 - .incbin "baserom.gba", 0x5cce04, 0x13 +gText_Round2:: @ 85CCD05 + .string "Round 2$" -gUnknown_085CCE17:: @ 85CCE17 - .incbin "baserom.gba", 0x5cce17, 0x21 +gText_Semifinal:: @ 85CCC0D + .string "Semifinal$" -gUnknown_085CCE38:: @ 85CCE38 - .incbin "baserom.gba", 0x5cce38, 0x1b +gText_Final:: @ 85CCD17 + .string "Final$" + + .align 2 +gRoundsStringTable:: @ 85CCD20 + .4byte gText_Round1 + .4byte gText_Round2 + .4byte gText_Semifinal + .4byte gText_Final + + .string "The great new hope!\p$" + .string "Will the championship dream come true?!\p$" + .string "A former CHAMPION!\p$" + .string "The previous CHAMPION!\p$" + .string "The unbeaten CHAMPION!\p$" + +gText_JapaneseHonorific:: @ 85CCDB2 + .string "{KUN}$" + +gText_Vs:: @ 85CCDB5 + .string "VS$" + +gText_RivalBuffer:: @ 85CCDB8 + .string "{RIVAL}$" + +gText_Mind:: @ 85CCDBB + .string "Mind$" + +gText_Skill:: @ 85CCDC0 + .string "Skill$" + +gText_Body:: @ 85CCDC6 + .string "Body$" + +gText_Judgement:: @ 85CCDCB + .string "{STRING 0}{CLEAR 13}Judgment{CLEAR 13}{PLAYER}$" + +gText_TwoTrainersSentPkmn:: @ 85CCDDE + .string "{STRING 28} {STRING 29} sent\nout {RIVAL}!\p{STRING 46} {STRING 47} sent\nout {AQUA}!$" + +gText_TrainerXYSentOutPkmn3:: @ 85CCE04 + .string "{STRING 46} {STRING 47} sent\nout {STRING 0}!$" + +gText_TwoTrainersWantToBattle2:: @ 85CCE17 + .string "{STRING 28} {STRING 29} and\n{STRING 46} {STRING 47}\lwant to battle!\p$" + +gText_TrainerXYSentOutZGoN:: @ 85CCE38 + .string "{STRING 50} {STRING 51} sent\nout {VERSION}!\lGo, {STRING 5}!$" gText_TwoEnemiesDefeated:: @ 85CCE53 .string "{STRING 28} {STRING 29} and\n{STRING 46} {STRING 47}\lwere defeated!\p$" @@ -1858,7 +1957,7 @@ gText_RefCommenceBattle:: @ 85CD1A1 .string "REFEREE: {STRING 5} VS {RIVAL}!\nCommence battling!$" .align 2 -gUnknown_085CD1C8:: @ 85CD1C8 +gRefereeStringsTable:: @ 85CD1C8 .4byte gText_RefIfNothingIsDecided .4byte gText_RefThatsIt .4byte gText_RefJudgeMind @@ -1883,34 +1982,92 @@ gText_String49:: @ 85CD239 .string "{PLAY_SE 0x0011}{STRING 28} {STRING 29} fled!$" - .align 2 -gUnknown_085CD24C:: @ 85CD24C - .incbin "baserom.gba", 0x5cd24c, 0x1b +gText_PlayerLostAgainst2:: @ 85CD24C + .string "Player lost against\n{STRING 28} {STRING 29}!$" -gUnknown_085CD267:: @ 85CD267 - .incbin "baserom.gba", 0x5cd267, 0x28 +gText_PlayerBattledToDraw2:: @ 85CD267 + .string "Player battled to a draw against\n{STRING 28} {STRING 29}!$" -gUnknown_085CD28F:: @ 85CD28F - .incbin "baserom.gba", 0x5cd28f, 0x3c +gText_RecordBattleToPass:: @ 85CD28F + .string "Would you like to record your battle\non your FRONTIER PASS?$" -gUnknown_085CD2CB:: @ 85CD2CB - .incbin "baserom.gba", 0x5cd2cb, 0x36 +gText_BattleRecordedOnPass:: @ 85CD2CB + .string "{STRING 35}’s battle result was recorded\non the FRONTIER PASS.$" -gUnknown_085CD301:: @ 85CD301 - .incbin "baserom.gba", 0x5cd301, 0x17 +gText_TrainerWantsToBattle:: @ 85CD301 + .string "{STRING 32}\nwants to battle!{PAUSE 49}$" -gUnknown_085CD318:: @ 85CD318 - .incbin "baserom.gba", 0x5cd318, 0x1e +gText_TwoTrainersWantToBattle3:: @ 85CD318 + .string "{STRING 32} and {STRING 33}\nwant to battle!{PAUSE 49}$" + .align 1 gUnknown_085CD336:: @ 85CD336 - .incbin "baserom.gba", 0x5cd336, 0xec + .2byte 0x000e, 0x0046, 0x004a, 0x006a, 0x006b, 0x006c, 0x006e, 0x006f + .2byte 0x0079, 0x007b, 0x007d, 0x0094, 0x0096, 0x0097, 0x009b, 0x009c + .2byte 0x009f, 0x00a4, 0x00aa, 0x00ad, 0x00b6, 0x00bf, 0x00cb, 0x00cd + .2byte 0x00cf, 0x00d6, 0x00ed, 0x00f4, 0x00f5, 0x010a, 0x010f, 0x0112 + .2byte 0x0113, 0x011a, 0x0125, 0x0136, 0x013c, 0x0140, 0x0149, 0x014a + .2byte 0x014e, 0x0154, 0x0000, 0x0064, 0x0069, 0x0075, 0x0085, 0x00af + .2byte 0x010d, 0x0153, 0x0000, 0x0060, 0x0061, 0x0066, 0x0068, 0x008c + .2byte 0x0090, 0x00a5, 0x00b8, 0x010c, 0x0111, 0x0118, 0x0119, 0x0129 + .2byte 0x012a, 0x012c, 0x0139, 0x015a, 0x015b, 0x0000, 0x0001, 0x000a + .2byte 0x000b, 0x0011, 0x0013, 0x0014, 0x0015, 0x001e, 0x0023, 0x0025 + .2byte 0x0027, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f, 0x0040, 0x0047 + .2byte 0x0051, 0x0059, 0x005a, 0x005b, 0x005c, 0x0067, 0x0076, 0x007a + .2byte 0x0080, 0x0084, 0x008b, 0x0091, 0x00a3, 0x00a9, 0x00ab, 0x00ae + .2byte 0x00c1, 0x00cc, 0x00d5, 0x00f9, 0x00fd, 0x00ff, 0x0100, 0x0103 + .2byte 0x0104, 0x0110, 0x011b, 0x0141, 0x0157, 0x0000 gUnknown_085CD422:: @ 85CD422 - .incbin "baserom.gba", 0x5cd422, 0x23e + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff + .align 2 +gUnknown_085CD42C:: @ 85CD42C + .2byte 0x01ff, 0x0100, 0x0000, 0x0101, 0x060f, 0x0000, 0x01ff, 0x0101 + .2byte 0x0000, 0x0100, 0x060f, 0x0000, 0x01ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x07ee, 0x0100 + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0c00, 0x0b0e, 0x0000 + .2byte 0x01ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x0102 + .2byte 0x0000, 0x0c00, 0x0b0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x0100 + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x0100, 0x0120, 0x0000, 0x0100 + .2byte 0x0200, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x01ff + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x0100, 0x01ff + .2byte 0x0000, 0x0100, 0x0600, 0x0000, 0x0100, 0x01ff, 0x0000, 0x0100 + .2byte 0x0600, 0x0000, 0x0100, 0x01ff, 0x0000, 0x0100, 0x0600, 0x0000 + + .align 2 +gUnknown_085CD54C:: @ 85C54C + .2byte 0x01ff, 0x0100, 0x0000, 0x0101, 0x060f, 0x0000, 0x01ff, 0x0101 + .2byte 0x0000, 0x0100, 0x060f, 0x0000, 0x01ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x07ee, 0x0100 + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0c00, 0x0b0e, 0x0000 + .2byte 0x01ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x0102 + .2byte 0x0000, 0x0c00, 0x0b0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x07ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x0100, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x0100 + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x0100, 0x0120, 0x0000, 0x0100 + .2byte 0x0200, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0100, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x01ff + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0d00 + .2byte 0x0f0e, 0x0000, 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000 + .2byte 0x01ee, 0x01ff, 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x01ee, 0x01ff + .2byte 0x0000, 0x0d00, 0x0f0e, 0x0000, 0x0111, 0x0100, 0x0000, 0x0201 + .2byte 0x0301, 0x0000 + + .align 2 gUnknown_085CD660:: @ 85CD660 - .incbin "baserom.gba", 0x5cd660, 0x8 + .4byte gUnknown_085CD42C + .4byte gUnknown_085CD54C + .align 2 gUnknown_085CD668:: @ 85CD668 - .incbin "baserom.gba", 0x5cd668, 0x4 - + .byte 0x08, 0x04, 0x01, 0x00 diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 30e788874..cf073570d 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -31,7 +31,7 @@ extern const union AnimCmd* gUnknown_082FF70C[]; extern const union AnimCmd* const * const gUnknown_08309AAC[]; extern const union AnimCmd* const * const gUnknown_08305D0C[]; extern const union AnimCmd* const * const gUnknown_0830536C[]; -extern const u8 gBadEggNickname[]; +extern const u8 gText_BadEgg[]; extern const u8 gText_EggNickname[]; extern u8 GetBankSide(u8 bank); @@ -409,8 +409,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) if (boxMon->isBadEgg) { for (retVal = 0; - retVal < POKEMON_NAME_LENGTH && gBadEggNickname[retVal] != EOS; - data[retVal] = gBadEggNickname[retVal], retVal++) {} + retVal < POKEMON_NAME_LENGTH && gText_BadEgg[retVal] != EOS; + data[retVal] = gText_BadEgg[retVal], retVal++) {} data[retVal] = EOS; } diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 2c3e84de9..569222e33 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -54,7 +54,7 @@ extern const s8 gNatureStatTable[][5]; extern const s8 gUnknown_08329ECE[][3]; extern const u32 gBitTable[]; extern const u32 gTMHMLearnsets[][2]; -extern const u8 BattleText_Wally[]; +extern const u8 gText_BattleWallyName[]; extern const u8 gText_PkmnsXPreventsSwitching[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; @@ -1177,7 +1177,7 @@ u16 GetBattleBGM(void) case CLASS_PKMN_TRAINER_RIVAL: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) return 0x1E1; - if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, BattleText_Wally)) + if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName)) return 0x1DC; return 0x1E1; case CLASS_ELITE_FOUR: From 54bd2c17812bd399fa6e857332c3bdacc1df71b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 21:10:30 -0400 Subject: [PATCH 36/62] Address review by diego --- data/data_emerald2.s | 33 ----------------------------- data/data_emerald2pre1.s | 35 +++++++++++++++++++++++++++++++ data/multiboot_berry_glitch_fix.s | 1 - get_diffs.py | 24 --------------------- ld_script.txt | 4 ++-- src/berry_fix_program.c | 3 +-- 6 files changed, 38 insertions(+), 62 deletions(-) create mode 100644 data/data_emerald2pre1.s delete mode 100644 get_diffs.py diff --git a/data/data_emerald2.s b/data/data_emerald2.s index ce7e2a6e3..e363e7365 100644 --- a/data/data_emerald2.s +++ b/data/data_emerald2.s @@ -2,39 +2,6 @@ .include "constants/constants.inc" .section .rodata - - -gUnknown_08617274:: @ 8617274 - .incbin "baserom.gba", 0x617274, 0x920 - -gUnknown_08617B94:: @ 8617B94 - .incbin "baserom.gba", 0x617b94, 0xb0 - -gUnknown_08617C44:: @ 8617C44 - .incbin "baserom.gba", 0x617c44, 0x120 - -gUnknown_08617D64:: @ 8617D64 - .incbin "baserom.gba", 0x617d64, 0x30 - -gUnknown_08617D94:: @ 8617D94 - .incbin "baserom.gba", 0x617d94, 0x10 - -gUnknown_08617DA4:: @ 8617DA4 - .incbin "baserom.gba", 0x617da4, 0x5c - -gUnknown_08617E00:: @ 8617E00 - .incbin "baserom.gba", 0x617e00, 0x18 - -gUnknown_08617E18:: @ 8617E18 - .incbin "baserom.gba", 0x617e18, 0x1c - -gUnknown_08617E34:: @ 8617E34 - .incbin "baserom.gba", 0x617e34, 0x2c - -gUnknown_08617E60:: @ 8617E60 - .incbin "baserom.gba", 0x617e60, 0x18 - - .section .rodata.2 @ 86181C1 .include "data/text/move_descriptions.inc" diff --git a/data/data_emerald2pre1.s b/data/data_emerald2pre1.s new file mode 100644 index 000000000..f6238dd06 --- /dev/null +++ b/data/data_emerald2pre1.s @@ -0,0 +1,35 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + +gUnknown_08617274:: @ 8617274 + .incbin "baserom.gba", 0x617274, 0x920 + +gUnknown_08617B94:: @ 8617B94 + .incbin "baserom.gba", 0x617b94, 0xb0 + +gUnknown_08617C44:: @ 8617C44 + .incbin "baserom.gba", 0x617c44, 0x120 + +gUnknown_08617D64:: @ 8617D64 + .incbin "baserom.gba", 0x617d64, 0x30 + +gUnknown_08617D94:: @ 8617D94 + .incbin "baserom.gba", 0x617d94, 0x10 + +gUnknown_08617DA4:: @ 8617DA4 + .incbin "baserom.gba", 0x617da4, 0x5c + +gUnknown_08617E00:: @ 8617E00 + .incbin "baserom.gba", 0x617e00, 0x18 + +gUnknown_08617E18:: @ 8617E18 + .incbin "baserom.gba", 0x617e18, 0x1c + +gUnknown_08617E34:: @ 8617E34 + .incbin "baserom.gba", 0x617e34, 0x2c + +gUnknown_08617E60:: @ 8617E60 + .incbin "baserom.gba", 0x617e60, 0x18 diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index e6a26c619..bc97eb553 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -3,7 +3,6 @@ gUnknown_089A6550:: @ 89A6550 .incbin "baserom.gba", 0x9a6550, 0xc0 -gMultiBootProgram_BerryGlitchFix_Script:: @ 89A6610 gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6610 .incbin "baserom.gba", 0x9a6610, 0x3b34 gMultiBootProgram_BerryGlitchFix_End:: diff --git a/get_diffs.py b/get_diffs.py deleted file mode 100644 index d42ce7827..000000000 --- a/get_diffs.py +++ /dev/null @@ -1,24 +0,0 @@ -addrs = sorted([0xdd7360, - 0xdd87c0, - 0xdd8ee0, - 0xdd8780, - 0xdd90e0, - 0xdd9718, - 0xdd9080, - 0xdd98b4, - 0xdd9e58, - 0xdd9874, - 0xdda02c, - 0xdda63c, - 0xdd9fec, - 0xdda840, - 0xddae40, - 0xdda800, - 0xddb020, - 0xddb2c4, - 0xddafe0, - 0xddb3e4]) -for i, addr in enumerate(addrs[:-1]): - print 'gUnknown_08{0:06X}:: @ 8{0:06X}'.format(addr) - print '\t.incbin "baserom.gba", 0x{:06x}, 0x{:x}'.format(addr, addrs[i + 1] - addr) - print '' diff --git a/ld_script.txt b/ld_script.txt index 7a8ef29a1..2dd2de8d8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -380,9 +380,9 @@ SECTIONS { data/battle_controller_recorded_player.o(.rodata); data/data_emerald.o(.rodata); data/battle_controller_player_partner.o(.rodata); - data/data_emerald2.o(.rodata); + data/data_emerald2pre1.o(.rodata); src/berry_fix_program.o(.rodata); - data/data_emerald2.o(.rodata.2); + data/data_emerald2.o(.rodata); data/fonts.o(.rodata); data/mystery_event_msg.o(.rodata); src/m4a_tables.o(.rodata); diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 931e92746..f04308ae8 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -130,8 +130,7 @@ static const u8 *const gUnknown_08618178[][3] = { }; extern const u8 gUnknown_089A6550[0xC0]; -extern const u8 gMultiBootProgram_BerryGlitchFix_Script[0x3b34]; -extern const u8 gMultiBootProgram_BerryGlitchFix_Start[]; +extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34]; extern const u8 gMultiBootProgram_BerryGlitchFix_End[]; // .text From 316f9f4d83d118437c266526cc0e6da1dfc90461 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 21:28:01 -0400 Subject: [PATCH 37/62] through sub_818DD14 --- asm/lilycove_lady.s | 73 --------------------------------------------- include/global.h | 2 +- src/lilycove_lady.c | 28 ++++++++++++++++- 3 files changed, 28 insertions(+), 75 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 75f9458a3..c2a6167a6 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,79 +5,6 @@ .text - thumb_func_start sub_818DCAC -sub_818DCAC: @ 818DCAC - push {r4,lr} - adds r4, r0, 0 - lsls r0, r1, 16 - lsrs r0, 16 - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_818DCAC - - thumb_func_start sub_818DCC8 -sub_818DCC8: @ 818DCC8 - push {lr} - ldr r2, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00003b58 - adds r1, r0 - str r1, [r2] - ldr r0, =gStringVar2 - ldrh r1, [r1, 0xE] - bl sub_818DCAC - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DCC8 - - thumb_func_start sub_818DCF4 -sub_818DCF4: @ 818DCF4 - push {r4,r5,lr} - adds r5, r0, 0 - adds r4, r1, 0 - adds r0, r4, 0 - movs r1, 0xFF - movs r2, 0x8 - bl memset - adds r0, r4, 0 - adds r1, r5, 0 - bl StringCopy7 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_818DCF4 - - thumb_func_start sub_818DD14 -sub_818DD14: @ 818DD14 - push {r4,r5,lr} - ldr r5, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r1, r0, r2 - str r1, [r5] - ldr r1, =0x00003b5c - adds r0, r1 - ldr r4, =gStringVar3 - adds r1, r4, 0 - bl sub_818DCF4 - ldr r0, [r5] - ldrb r1, [r0, 0x12] - adds r0, r4, 0 - bl ConvertInternationalString - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DD14 - thumb_func_start sub_818DD54 sub_818DD54: @ 818DD54 ldr r1, =gUnknown_0203CD64 diff --git a/include/global.h b/include/global.h index 64ed869ef..8c2122b39 100644 --- a/include/global.h +++ b/include/global.h @@ -684,7 +684,7 @@ typedef union // TODO /*0x004*/ u8 unk_004[8]; /*0x00c*/ u8 unk_00c; /*0x00d*/ u8 filler_00d; - /*0x00e*/ u16 unk_00e; + /*0x00e*/ u16 itemId; /*0x010*/ u16 unk_010; /*0x012*/ u8 language; } favour; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 578280115..c6b49e36f 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -7,6 +7,8 @@ #include "event_data.h" #include "rng.h" #include "string_util.h" +#include "item.h" +#include "items.h" #include "text.h" #include "lilycove_lady.h" @@ -134,7 +136,7 @@ void SetLilycoveFavourLady(void) gUnknown_0203CD64->favour.unk_004[0] = EOS; gUnknown_0203CD64->favour.unk_002 = 0; gUnknown_0203CD64->favour.unk_003= 0; - gUnknown_0203CD64->favour.unk_00e = 0; + gUnknown_0203CD64->favour.itemId = ITEM_NONE; gUnknown_0203CD64->favour.language = gGameLanguage; sub_818DB20(); } @@ -185,3 +187,27 @@ bool8 sub_818DC60(void) } return FALSE; } + +void sub_818DCAC(u8 *dest, u16 itemId) +{ + StringCopy(dest, ItemId_GetItem(itemId)->name); +} + +void sub_818DCC8(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + sub_818DCAC(gStringVar2, gUnknown_0203CD64->favour.itemId); +} + +void sub_818DCF4(const u8 *src, u8 *dest) +{ + memset(dest, 0xFF, 8); + StringCopy7(dest, src); +} + +void sub_818DD14(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3); + ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language); +} From 534dd2c4b0259f87657b2e8795d96217e8bf12cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 21:47:15 -0400 Subject: [PATCH 38/62] sub_818DD84 --- asm/lilycove_lady.s | 109 -------------------------------------------- include/item_menu.h | 11 +++++ src/lilycove_lady.c | 44 ++++++++++++++++++ 3 files changed, 55 insertions(+), 109 deletions(-) create mode 100644 include/item_menu.h diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c2a6167a6..c4cc3d21a 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,115 +5,6 @@ .text - thumb_func_start sub_818DD54 -sub_818DD54: @ 818DD54 - ldr r1, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r1, [r0, 0x2] - negs r0, r1 - orrs r0, r1 - lsrs r0, 31 - bx lr - .pool - thumb_func_end sub_818DD54 - - thumb_func_start sub_818DD78 -sub_818DD78: @ 818DD78 - push {lr} - bl sub_81AAC50 - pop {r0} - bx r0 - thumb_func_end sub_818DD78 - - thumb_func_start sub_818DD84 -sub_818DD84: @ 818DD84 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r5, r0, 16 - ldr r4, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r4] - ldr r1, =gUnknown_0860B2EC - mov r8, r1 - ldrb r0, [r0, 0xC] - lsls r0, 2 - add r0, r8 - ldr r0, [r0] - bl sub_818DB04 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, [r4] - movs r0, 0x1 - strb r0, [r1, 0x1] - ldr r0, =gStringVar2 - adds r1, r5, 0 - bl sub_818DCAC - ldr r1, [r4] - strh r5, [r1, 0xE] - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - adds r1, 0x4 - bl sub_818DCF4 - ldr r1, [r4] - ldr r0, =gGameLanguage - ldrb r0, [r0] - strb r0, [r1, 0x12] - movs r7, 0 - movs r3, 0 - cmp r7, r6 - bcs _0818DE36 - mov r12, r8 -_0818DDDC: - ldr r2, [r4] - ldrb r0, [r2, 0xC] - lsls r0, 2 - add r0, r12 - ldr r1, [r0] - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r5 - bne _0818DE28 - movs r7, 0x1 - ldrb r0, [r2, 0x3] - adds r0, 0x1 - strb r0, [r2, 0x3] - ldr r0, [r4] - strb r7, [r0, 0x2] - ldr r1, [r4] - ldrh r0, [r1, 0x10] - cmp r0, r5 - bne _0818DE36 - movs r0, 0x5 - strb r0, [r1, 0x3] - b _0818DE36 - .pool -_0818DE28: - movs r0, 0 - strb r0, [r2, 0x2] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r6 - bcc _0818DDDC -_0818DE36: - adds r0, r7, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818DD84 - thumb_func_start sub_818DE44 sub_818DE44: @ 818DE44 push {lr} diff --git a/include/item_menu.h b/include/item_menu.h new file mode 100644 index 000000000..f402f5cdd --- /dev/null +++ b/include/item_menu.h @@ -0,0 +1,11 @@ +#ifndef GUARD_item_menu_H +#define GUARD_item_menu_H + +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations +void sub_81AAC50(void); + +#endif //GUARD_item_menu_H diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index c6b49e36f..8a0851110 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -9,6 +9,7 @@ #include "string_util.h" #include "item.h" #include "items.h" +#include "item_menu.h" #include "text.h" #include "lilycove_lady.h" @@ -211,3 +212,46 @@ void sub_818DD14(void) sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language); } + +bool8 sub_818DD54(void) +{ + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + return gUnknown_0203CD64->favour.unk_002 ? TRUE : FALSE; +} + +void sub_818DD78(void) +{ + sub_81AAC50(); +} + +bool8 sub_818DD84(u16 itemId) +{ + u8 len; + u8 i; + bool8 response; + + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]); + gUnknown_0203CD64->favour.unk_001 = 1; + sub_818DCAC(gStringVar2, itemId); + gUnknown_0203CD64->favour.itemId = itemId; + sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->favour.unk_004); + gUnknown_0203CD64->favour.language = gGameLanguage; + response = FALSE; + for (i = 0; i < len; i ++) + { + if (gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][i] == itemId) + { + response = TRUE; + gUnknown_0203CD64->favour.unk_003 ++; + gUnknown_0203CD64->favour.unk_002 = 1; + if (gUnknown_0203CD64->favour.unk_010 == itemId) + { + gUnknown_0203CD64->favour.unk_003 = 5; + } + break; + } + gUnknown_0203CD64->favour.unk_002 = 0; + } + return response; +} From 83a420400c302d4c59eb204f8fa18943d69fc6d0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 21:58:32 -0400 Subject: [PATCH 39/62] through sub_818DEF4 --- asm/lilycove_lady.s | 94 --------------------------------------------- src/lilycove_lady.c | 44 +++++++++++++++++++++ 2 files changed, 44 insertions(+), 94 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c4cc3d21a..b3588f8a8 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,100 +5,6 @@ .text - thumb_func_start sub_818DE44 -sub_818DE44: @ 818DE44 - push {lr} - ldr r0, =gScriptItemId - ldrh r0, [r0] - bl sub_818DD84 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_818DE44 - - thumb_func_start sub_818DE5C -sub_818DE5C: @ 818DE5C - push {lr} - ldr r1, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0x3] - movs r1, 0 - cmp r0, 0x4 - bls _0818DE74 - movs r1, 0x1 -_0818DE74: - adds r0, r1, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_818DE5C - - thumb_func_start sub_818DE88 -sub_818DE88: @ 818DE88 - push {lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gStringVar2 - bl sub_818DCAC - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DE88 - - thumb_func_start sub_818DEA0 -sub_818DEA0: @ 818DEA0 - push {r4,r5,lr} - ldr r5, =gUnknown_0203CD64 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r5] - ldr r1, =gUnknown_0860B304 - ldrb r0, [r0, 0xC] - lsls r0, 1 - adds r0, r1 - ldrh r4, [r0] - adds r0, r4, 0 - bl sub_818DE88 - ldr r1, [r5] - movs r0, 0x2 - strb r0, [r1, 0x1] - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818DEA0 - - thumb_func_start sub_818DEDC -sub_818DEDC: @ 818DEDC - push {lr} - bl SetLilycoveFavourLady - ldr r0, =gUnknown_0203CD64 - ldr r1, [r0] - movs r0, 0x1 - strb r0, [r1, 0x1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DEDC - - thumb_func_start sub_818DEF4 -sub_818DEF4: @ 818DEF4 - push {lr} - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_818DEF4 - thumb_func_start sub_818DF00 sub_818DF00: @ 818DF00 push {r4-r7,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 8a0851110..10a0e7f45 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -5,6 +5,7 @@ #include "global.h" #include "main.h" #include "event_data.h" +#include "script.h" #include "rng.h" #include "string_util.h" #include "item.h" @@ -24,8 +25,10 @@ extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; extern const u8 *const gUnknown_0860B224[]; extern const u16 *const gUnknown_0860B2EC[6]; +extern const u16 gUnknown_0860B304[6]; EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL; +extern EWRAM_DATA u16 gScriptItemId; u8 GetLilycoveLadyId(void) { @@ -255,3 +258,44 @@ bool8 sub_818DD84(u16 itemId) } return response; } + +bool8 sub_818DE44(void) +{ + return sub_818DD84(gScriptItemId); +} + +bool8 sub_818DE5C(void) +{ + u8 checkval; + + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + checkval = gUnknown_0203CD64->favour.unk_003; + return checkval < 5 ? FALSE : TRUE; +} + +void sub_818DE88(u16 itemId) +{ + sub_818DCAC(gStringVar2, itemId); +} + +u16 sub_818DEA0(void) +{ + u16 itemId; + + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + itemId = gUnknown_0860B304[gUnknown_0203CD64->favour.unk_00c]; + sub_818DE88(itemId); + gUnknown_0203CD64->favour.unk_001 = 2; + return itemId; +} + +void sub_818DEDC(void) +{ + SetLilycoveFavourLady(); + gUnknown_0203CD64->favour.unk_001 = 1; +} + +void sub_818DEF4(void) +{ + EnableBothScriptContexts(); +} From 73ee165ef6b05417dc42be721e625712c6538ed6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 22:25:31 -0400 Subject: [PATCH 40/62] sub_818DF00 --- asm/lilycove_lady.s | 49 ------------------- include/global.h | 68 +++++++++++++++----------- src/lilycove_lady.c | 114 ++++++++++++++++++++++++++------------------ 3 files changed, 107 insertions(+), 124 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index b3588f8a8..e0f578eca 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,55 +5,6 @@ .text - thumb_func_start sub_818DF00 -sub_818DF00: @ 818DF00 - push {r4-r7,lr} - bl Random - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0xF - ands r4, r0 - movs r3, 0 - ldr r5, =gUnknown_0203CD68 - ldr r1, =gUnknown_0860B1A4 - lsls r0, r4, 2 - adds r6, r0, r1 - adds r7, r5, 0 -_0818DF1A: - ldr r2, [r5] - lsls r1, r3, 1 - adds r2, 0x2 - adds r2, r1 - ldr r0, [r6] - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x8 - bls _0818DF1A - ldr r2, [r7] - ldr r0, =gUnknown_0860B1E4 - lsls r1, r4, 1 - adds r0, r1, r0 - ldrh r0, [r0] - strh r0, [r2, 0x14] - ldr r0, =gUnknown_0860B204 - adds r1, r0 - ldrh r0, [r1] - strh r0, [r2, 0x28] - adds r2, 0x2B - strb r4, [r2] - ldr r1, [r7] - movs r0, 0xFF - strb r0, [r1, 0x18] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818DF00 - thumb_func_start SetLilycoveQuizLady SetLilycoveQuizLady: @ 818DF68 push {r4-r6,lr} diff --git a/include/global.h b/include/global.h index 8c2122b39..42fe0cfbb 100644 --- a/include/global.h +++ b/include/global.h @@ -667,39 +667,51 @@ enum { LILYCOVE_LADY_CONTEST }; +struct LilycoveLadyQuiz +{ + /*0x000*/ u8 id; + /*0x001*/ u8 language; + /*0x002*/ u16 unk_002[9]; + /*0x014*/ u16 unk_014; + /*0x016*/ u8 filler_016[2]; + /*0x018*/ u8 unk_018; + /*0x019*/ u8 filler_019[15]; + /*0x028*/ u16 unk_028; + /*0x02a*/ u8 filler_02a; + /*0x02b*/ u8 unk_02b; +}; + +struct LilycoveLadyFavour +{ + /*0x000*/ u8 id; + /*0x001*/ u8 unk_001; + /*0x002*/ u8 unk_002; + /*0x003*/ u8 unk_003; + /*0x004*/ u8 unk_004[8]; + /*0x00c*/ u8 unk_00c; + /*0x00d*/ u8 filler_00d; + /*0x00e*/ u16 itemId; + /*0x010*/ u16 unk_010; + /*0x012*/ u8 language; +}; + +struct LilycoveLadyContest +{ + /*0x000*/ u8 id; + /*0x001*/ u8 filler_001[12]; + /*0x00d*/ u8 category; // maybe? +}; + typedef union // TODO { - struct - { - /*0x000*/ u8 id; - /*0x001*/ u8 language; - } quiz; + struct LilycoveLadyQuiz quiz; + struct LilycoveLadyFavour favour; + struct LilycoveLadyContest contest; struct { /*0x000*/ u8 id; - /*0x001*/ u8 unk_001; - /*0x002*/ u8 unk_002; - /*0x003*/ u8 unk_003; - /*0x004*/ u8 unk_004[8]; - /*0x00c*/ u8 unk_00c; - /*0x00d*/ u8 filler_00d; - /*0x00e*/ u16 itemId; - /*0x010*/ u16 unk_010; - /*0x012*/ u8 language; - } favour; - - struct - { - /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[12]; - /*0x00d*/ u8 category; // maybe? - } contest; - - struct - { - /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[535]; + /*0x001*/ u8 filler_001[0x207]; } common; } LilycoveLady; @@ -786,7 +798,7 @@ struct SaveBlock1 /*0x3728*/ struct RamScript ramScript; /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[52]; - /*0x3B58*/ LilycoveLady lilycoveLady; // TODO: convert to a union + /*0x3B58*/ LilycoveLady lilycoveLady; /*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct // sizeof: 0x3D88 }; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 10a0e7f45..d64b0d3b3 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -26,8 +26,12 @@ extern const u16 gUnknown_0860B07E[3]; extern const u8 *const gUnknown_0860B224[]; extern const u16 *const gUnknown_0860B2EC[6]; extern const u16 gUnknown_0860B304[6]; +extern const u16 *const gUnknown_0860B1A4[16]; +extern const u16 gUnknown_0860B1E4[16]; +extern const u16 gUnknown_0860B204[16]; -EWRAM_DATA LilycoveLady *gUnknown_0203CD64 = NULL; +EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; +EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; extern EWRAM_DATA u16 gScriptItemId; u8 GetLilycoveLadyId(void) @@ -126,40 +130,40 @@ void sub_818DB20(void) u8 size; u8 idx; - gUnknown_0203CD64->favour.unk_00c = Random() % 6; - size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]); + gUnknown_0203CD64->unk_00c = Random() % 6; + size = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]); idx = Random() % size; - gUnknown_0203CD64->favour.unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][idx]; + gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx]; } void SetLilycoveFavourLady(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; - gUnknown_0203CD64->favour.unk_001 = 0; - gUnknown_0203CD64->favour.unk_004[0] = EOS; - gUnknown_0203CD64->favour.unk_002 = 0; - gUnknown_0203CD64->favour.unk_003= 0; - gUnknown_0203CD64->favour.itemId = ITEM_NONE; - gUnknown_0203CD64->favour.language = gGameLanguage; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; + gUnknown_0203CD64->unk_001 = 0; + gUnknown_0203CD64->unk_004[0] = EOS; + gUnknown_0203CD64->unk_002 = 0; + gUnknown_0203CD64->unk_003= 0; + gUnknown_0203CD64->itemId = ITEM_NONE; + gUnknown_0203CD64->language = gGameLanguage; sub_818DB20(); } void sub_818DBC4(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - gUnknown_0203CD64->favour.id = LILYCOVE_LADY_FAVOUR; - gUnknown_0203CD64->favour.unk_001 = 0; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; + gUnknown_0203CD64->unk_001 = 0; } u8 sub_818DBE8(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - if (gUnknown_0203CD64->favour.unk_001 == 2) + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + if (gUnknown_0203CD64->unk_001 == 2) { return 2; } - else if (gUnknown_0203CD64->favour.unk_001 == 1) + else if (gUnknown_0203CD64->unk_001 == 1) { return 1; } @@ -176,17 +180,17 @@ const u8 *sub_818DC1C(u8 idx) void sub_818DC2C(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->favour.unk_00c)); + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + StringCopy(gStringVar1, sub_818DC1C(gUnknown_0203CD64->unk_00c)); } bool8 sub_818DC60(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - if (gUnknown_0203CD64->favour.unk_004[0] != EOS) + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + if (gUnknown_0203CD64->unk_004[0] != EOS) { StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004); - ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language); + ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); return TRUE; } return FALSE; @@ -199,8 +203,8 @@ void sub_818DCAC(u8 *dest, u16 itemId) void sub_818DCC8(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - sub_818DCAC(gStringVar2, gUnknown_0203CD64->favour.itemId); + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId); } void sub_818DCF4(const u8 *src, u8 *dest) @@ -211,15 +215,15 @@ void sub_818DCF4(const u8 *src, u8 *dest) void sub_818DD14(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3); - ConvertInternationalString(gStringVar3, gUnknown_0203CD64->favour.language); + ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); } bool8 sub_818DD54(void) { - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - return gUnknown_0203CD64->favour.unk_002 ? TRUE : FALSE; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + return gUnknown_0203CD64->unk_002 ? TRUE : FALSE; } void sub_818DD78(void) @@ -233,28 +237,28 @@ bool8 sub_818DD84(u16 itemId) u8 i; bool8 response; - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c]); - gUnknown_0203CD64->favour.unk_001 = 1; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]); + gUnknown_0203CD64->unk_001 = 1; sub_818DCAC(gStringVar2, itemId); - gUnknown_0203CD64->favour.itemId = itemId; - sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->favour.unk_004); - gUnknown_0203CD64->favour.language = gGameLanguage; + gUnknown_0203CD64->itemId = itemId; + sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->unk_004); + gUnknown_0203CD64->language = gGameLanguage; response = FALSE; for (i = 0; i < len; i ++) { - if (gUnknown_0860B2EC[gUnknown_0203CD64->favour.unk_00c][i] == itemId) + if (gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][i] == itemId) { response = TRUE; - gUnknown_0203CD64->favour.unk_003 ++; - gUnknown_0203CD64->favour.unk_002 = 1; - if (gUnknown_0203CD64->favour.unk_010 == itemId) + gUnknown_0203CD64->unk_003 ++; + gUnknown_0203CD64->unk_002 = 1; + if (gUnknown_0203CD64->unk_010 == itemId) { - gUnknown_0203CD64->favour.unk_003 = 5; + gUnknown_0203CD64->unk_003 = 5; } break; } - gUnknown_0203CD64->favour.unk_002 = 0; + gUnknown_0203CD64->unk_002 = 0; } return response; } @@ -268,8 +272,8 @@ bool8 sub_818DE5C(void) { u8 checkval; - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - checkval = gUnknown_0203CD64->favour.unk_003; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + checkval = gUnknown_0203CD64->unk_003; return checkval < 5 ? FALSE : TRUE; } @@ -282,20 +286,36 @@ u16 sub_818DEA0(void) { u16 itemId; - gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady; - itemId = gUnknown_0860B304[gUnknown_0203CD64->favour.unk_00c]; + gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; + itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c]; sub_818DE88(itemId); - gUnknown_0203CD64->favour.unk_001 = 2; + gUnknown_0203CD64->unk_001 = 2; return itemId; } void sub_818DEDC(void) { SetLilycoveFavourLady(); - gUnknown_0203CD64->favour.unk_001 = 1; + gUnknown_0203CD64->unk_001 = 1; } void sub_818DEF4(void) { EnableBothScriptContexts(); } + +void sub_818DF00(void) +{ + u8 v0; + u8 i; + + v0 = Random() % 16; + for (i = 0; i < 9; i ++) + { + gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i]; + } + gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0]; + gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0]; + gUnknown_0203CD68->unk_02b = v0; + gUnknown_0203CD68->unk_018 = 0xFF; +} From 28d0fa33fef825dcb22d45db966ef814c461dd08 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 22:35:40 -0400 Subject: [PATCH 41/62] SetLilicoveQuizLady --- asm/lilycove_lady.s | 73 --------------------------------------------- include/global.h | 11 ++++--- src/lilycove_lady.c | 24 +++++++++++++++ 3 files changed, 31 insertions(+), 77 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index e0f578eca..c3e72fab1 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,79 +5,6 @@ .text - thumb_func_start SetLilycoveQuizLady -SetLilycoveQuizLady: @ 818DF68 - push {r4-r6,lr} - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - movs r1, 0 - strb r1, [r0] - ldr r0, [r2] - strb r1, [r0, 0x1] - movs r3, 0 - adds r4, r2, 0 - ldr r6, =gGameLanguage - adds r5, r4, 0 - ldr r0, =0x0000ffff - adds r2, r0, 0 -_0818DF8A: - ldr r1, [r5] - lsls r0, r3, 1 - adds r1, 0x2 - adds r1, r0 - ldrh r0, [r1] - orrs r0, r2 - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x8 - bls _0818DF8A - ldr r0, [r4] - ldr r1, =0x0000ffff - strh r1, [r0, 0x14] - movs r1, 0x1 - negs r1, r1 - strh r1, [r0, 0x16] - movs r3, 0 - adds r5, r4, 0 - movs r2, 0 -_0818DFB4: - ldr r0, [r5] - lsls r1, r3, 1 - adds r0, 0x20 - adds r0, r1 - strh r2, [r0] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bls _0818DFB4 - ldr r0, [r4] - movs r2, 0 - movs r1, 0 - strh r1, [r0, 0x28] - adds r0, 0x2A - strb r2, [r0] - ldr r0, [r4] - adds r0, 0x2C - movs r1, 0x10 - strb r1, [r0] - ldr r0, [r4] - ldrb r1, [r6] - adds r0, 0x2D - strb r1, [r0] - bl sub_818DF00 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end SetLilycoveQuizLady - thumb_func_start sub_818E004 sub_818E004: @ 818E004 ldr r2, =gUnknown_0203CD68 diff --git a/include/global.h b/include/global.h index 42fe0cfbb..84c70a16e 100644 --- a/include/global.h +++ b/include/global.h @@ -670,15 +670,18 @@ enum { struct LilycoveLadyQuiz { /*0x000*/ u8 id; - /*0x001*/ u8 language; + /*0x001*/ u8 unk_001; /*0x002*/ u16 unk_002[9]; /*0x014*/ u16 unk_014; - /*0x016*/ u8 filler_016[2]; + /*0x016*/ u16 unk_016; /*0x018*/ u8 unk_018; - /*0x019*/ u8 filler_019[15]; + /*0x019*/ u8 filler_019[7]; + /*0x020*/ u16 unk_020[4]; /*0x028*/ u16 unk_028; - /*0x02a*/ u8 filler_02a; + /*0x02a*/ u8 unk_02a; /*0x02b*/ u8 unk_02b; + /*0x02c*/ u8 unk_02c; + /*0x02d*/ u8 language; }; struct LilycoveLadyFavour diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index d64b0d3b3..901812ed6 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -319,3 +319,27 @@ void sub_818DF00(void) gUnknown_0203CD68->unk_02b = v0; gUnknown_0203CD68->unk_018 = 0xFF; } + +void SetLilycoveQuizLady(void) +{ + u8 i; + + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; + gUnknown_0203CD68->unk_001 = 0; + for (i = 0; i < 9; i ++) + { + gUnknown_0203CD68->unk_002[i] = -1; + } + gUnknown_0203CD68->unk_014 = -1; + gUnknown_0203CD68->unk_016 = -1; + for (i = 0; i < 4; i ++) + { + gUnknown_0203CD68->unk_020[i] = 0; + } + gUnknown_0203CD68->unk_028 = 0; + gUnknown_0203CD68->unk_02a = 0; + gUnknown_0203CD68->unk_02c = 0x10; + gUnknown_0203CD68->language = gGameLanguage; + sub_818DF00(); +} From 9b00767b55b70627aad81b67b87c06db9dca5742 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 22:57:22 -0400 Subject: [PATCH 42/62] sub_818E004; sanity --- asm/lilycove_lady.s | 22 ---------------------- src/lilycove_lady.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index c3e72fab1..bf3313a97 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,28 +5,6 @@ .text - thumb_func_start sub_818E004 -sub_818E004: @ 818E004 - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - movs r1, 0 - strb r1, [r0] - ldr r0, [r2] - strb r1, [r0, 0x1] - ldr r0, [r2] - adds r0, 0x2A - strb r1, [r0] - ldr r1, [r2] - ldr r0, =0x0000ffff - strh r0, [r1, 0x16] - bx lr - .pool - thumb_func_end sub_818E004 - thumb_func_start sub_818E038 sub_818E038: @ 818E038 push {lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 901812ed6..c7a5ef68d 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -189,7 +189,7 @@ bool8 sub_818DC60(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; if (gUnknown_0203CD64->unk_004[0] != EOS) { - StringCopy7(gStringVar3, gSaveBlock1Ptr->lilycoveLady.favour.unk_004); + StringCopy7(gStringVar3, gUnknown_0203CD64->unk_004); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); return TRUE; } @@ -216,7 +216,7 @@ void sub_818DCF4(const u8 *src, u8 *dest) void sub_818DD14(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - sub_818DCF4(gSaveBlock1Ptr->lilycoveLady.favour.unk_004, gStringVar3); + sub_818DCF4(gUnknown_0203CD64->unk_004, gStringVar3); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); } @@ -343,3 +343,12 @@ void SetLilycoveQuizLady(void) gUnknown_0203CD68->language = gGameLanguage; sub_818DF00(); } + +void sub_818E004(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; + gUnknown_0203CD68->unk_001 = 0; + gUnknown_0203CD68->unk_02a = 0; + gUnknown_0203CD68->unk_016 = -1; +} From 4ec2fe8f370845ff1bd579df4de8a8aaeba92d3a Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 19 Sep 2017 22:00:02 -0500 Subject: [PATCH 43/62] Replace data with move constants --- data/battle_4.s | 10 +++++----- data/link.s | 36 ++++++------------------------------ 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/data/battle_4.s b/data/battle_4.s index 0f799eac8..3300b25ee 100644 --- a/data/battle_4.s +++ b/data/battle_4.s @@ -81,11 +81,11 @@ sProtectSuccessRates:: @ 831C3D8 .align 2 gUnknown_0831C3E0:: @ 831C3E0 - .2byte 0x0076, 0x00a5, 0x00a6, 0x0066 - .2byte 0xfffe, 0x0044, 0x00f3, 0x00b6 - .2byte 0x00c5, 0x00cb, 0x00c2, 0x00d6 - .2byte 0x00a8, 0x010a, 0x0121, 0x010e - .2byte 0x0157, 0x010f, 0x0108, 0xffff + .2byte MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC + .2byte 0xfffe, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT + .2byte MOVE_DETECT, MOVE_ENDURE, MOVE_DESTINY_BOND, MOVE_SLEEP_TALK + .2byte MOVE_THIEF, MOVE_FOLLOW_ME, MOVE_SNATCH, MOVE_HELPING_HAND + .2byte MOVE_COVET, MOVE_TRICK, MOVE_FOCUS_PUNCH, 0xffff .align 2 gUnknown_0831C408:: @ 831C408 diff --git a/data/link.s b/data/link.s index a7424cc1a..3aa87ef67 100644 --- a/data/link.s +++ b/data/link.s @@ -54,38 +54,14 @@ gUnknown_082ED1FC:: @ 82ED1FC BgTemplate .4byte 0x000001F8 .4byte 0x00001081 -gUnknown_082ED204:: @ 82ED204 WindowTemplate - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x1E - .byte 0x05 - .byte 0x0F - .2byte 0x0002 +gUnknown_082ED204:: @ 82ED204 + window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 - .byte 0x00 - .byte 0x00 - .byte 0x06 - .byte 0x1E - .byte 0x07 - .byte 0x0F - .2byte 0x0098 + window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 - .byte 0x00 - .byte 0x00 - .byte 0x0D - .byte 0x1E - .byte 0x07 - .byte 0x0F - .2byte 0x016A + window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - .byte 0xFF - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x00 - .byte 0x00 - .2byte 0x0000 + window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 gUnknown_082ED224:: @ 82ED224 .byte 0x00, 0x01, 0x02, 0x00, 0xff, 0xfe, 0xff, 0x00 @@ -3041,7 +3017,7 @@ gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate .4byte 0x000000F8 .align 2 -gUnknown_082F32CC:: @ 82F32CC struct WindowTemplate? not sure +gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure .byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00 .byte 0xb3, 0x30, 0x00, 0x00 From c05f2d44732020ed43f5500a26130ec94e34d657 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 19 Sep 2017 23:31:05 -0400 Subject: [PATCH 44/62] sub_818E06C --- asm/lilycove_lady.s | 125 -------------------------------------------- src/lilycove_lady.c | 62 ++++++++++++++++++++++ 2 files changed, 62 insertions(+), 125 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index bf3313a97..0f66eae84 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,131 +5,6 @@ .text - thumb_func_start sub_818E038 -sub_818E038: @ 818E038 - push {lr} - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0x1] - cmp r0, 0x2 - bne _0818E05C - movs r0, 0x2 - b _0818E066 - .pool -_0818E05C: - cmp r0, 0x1 - beq _0818E064 - movs r0, 0 - b _0818E066 -_0818E064: - movs r0, 0x1 -_0818E066: - pop {r1} - bx r1 - thumb_func_end sub_818E038 - - thumb_func_start sub_818E06C -sub_818E06C: @ 818E06C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r0, =gSaveBlock1Ptr - ldr r4, [r0] - ldr r0, =0x00003b58 - adds r7, r4, r0 - ldrh r0, [r7, 0x14] - bl sub_811F8D8 - cmp r0, 0 - bne _0818E0EC - ldr r1, =0x00003b83 - adds r0, r4, r1 - ldrb r5, [r0] - ldr r0, =0x00003b5a - adds r0, r4 - mov r8, r0 - adds r1, r4 - mov r10, r1 - ldr r6, =gUnknown_0860B1E4 -_0818E09A: - adds r5, 0x1 - cmp r5, 0xF - ble _0818E0A2 - movs r5, 0 -_0818E0A2: - lsls r4, r5, 1 - adds r0, r4, r6 - ldrh r0, [r0] - bl sub_811F8D8 - cmp r0, 0 - beq _0818E09A - movs r3, 0 - ldr r0, =gUnknown_0860B1E4 - mov r12, r0 - lsls r1, r5, 2 - ldr r0, =gUnknown_0860B204 - mov r9, r0 - ldr r0, =gUnknown_0860B1A4 - adds r6, r1, r0 - mov r2, r8 -_0818E0C2: - lsls r0, r3, 1 - ldr r1, [r6] - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - adds r2, 0x2 - adds r3, 0x1 - cmp r3, 0x8 - ble _0818E0C2 - mov r1, r12 - adds r0, r4, r1 - ldrh r0, [r0] - strh r0, [r7, 0x14] - mov r1, r9 - adds r0, r4, r1 - ldrh r0, [r0] - strh r0, [r7, 0x28] - mov r0, r10 - strb r5, [r0] - movs r0, 0xFF - strb r0, [r7, 0x18] -_0818E0EC: - bl sub_818E13C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - bne _0818E118 - movs r0, 0x2 - b _0818E12C - .pool -_0818E118: - cmp r0, 0x2 - beq _0818E126 - bl sub_818E1F4 - lsls r0, 24 - cmp r0, 0 - beq _0818E12A -_0818E126: - movs r0, 0x1 - b _0818E12C -_0818E12A: - movs r0, 0 -_0818E12C: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_818E06C - thumb_func_start sub_818E13C sub_818E13C: @ 818E13C push {r4-r7,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index c7a5ef68d..93c3cce67 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -20,6 +20,9 @@ void SetLilycoveContestLady(void); void sub_818E004(void); void sub_818DBC4(void); void sub_818E674(void); +bool32 sub_811F8D8(u16); +u8 sub_818E13C(void); +bool8 sub_818E1F4(void); extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; @@ -352,3 +355,62 @@ void sub_818E004(void) gUnknown_0203CD68->unk_02a = 0; gUnknown_0203CD68->unk_016 = -1; } + +u8 sub_818E038(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (gUnknown_0203CD68->unk_001 == 2) + { + return 2; + } + else if (gUnknown_0203CD68->unk_001 == 1) + { + return 1; + } + else + { + return 0; + } +} + +u8 sub_818E06C(void) +{ + int i; + int j; + u8 rv; + struct LilycoveLadyQuiz *quiz; + + quiz = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (sub_811F8D8(quiz->unk_014) == 0) + { + i = quiz->unk_02b; + do + { + if (++ i >= 16) + { + i = 0; + } + } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0); + for (j = 0; j < 9; j ++) + { + quiz->unk_002[j] = gUnknown_0860B1A4[i][j]; + } + quiz->unk_014 = gUnknown_0860B1E4[i]; + quiz->unk_028 = gUnknown_0860B204[i]; + quiz->unk_02b = i; + quiz->unk_018 = 0xFF; + } + rv = sub_818E13C(); + if (rv == 0) + { + return 2; + } + else if (rv == 2 || sub_818E1F4()) + { + return 1; + } + else + { + return 0; + } +} From 0b81c2920aa87aae3403efdf60e40b58445efbbf Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 10:45:00 -0400 Subject: [PATCH 45/62] sub_818E1F4 --- asm/lilycove_lady.s | 126 ------------------------------------ include/global.h | 8 +-- src/lilycove_lady.c | 152 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 146 insertions(+), 140 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 0f66eae84..bb044a01e 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,132 +5,6 @@ .text - thumb_func_start sub_818E13C -sub_818E13C: @ 818E13C - push {r4-r7,lr} - movs r7, 0x1 - ldr r5, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r2, =0x00003b58 - adds r0, r1, r2 - str r0, [r5] - ldrb r0, [r0, 0x18] - cmp r0, 0xFF - bne _0818E174 - ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EEB7E - bl StringCopy7 - movs r7, 0 - b _0818E1DC - .pool -_0818E174: - ldr r4, =gStringVar1 - ldr r0, =0x00003b70 - adds r1, r0 - adds r0, r4, 0 - bl StringCopy7 - ldr r0, [r5] - adds r0, 0x2D - ldrb r1, [r0] - adds r0, r4, 0 - bl ConvertInternationalString - ldr r0, [r5] - adds r0, 0x18 - bl sub_818E258 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r6, =gSaveBlock2Ptr - ldr r0, [r6] - bl sub_818E258 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bne _0818E1DC - ldr r0, [r5] - movs r2, 0 - cmp r2, r4 - bcs _0818E1DC - ldr r1, [r6] - ldrb r0, [r0, 0x18] - ldrb r1, [r1] - cmp r0, r1 - bne _0818E1DA -_0818E1BA: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r4 - bcs _0818E1DC - ldr r0, =gUnknown_0203CD68 - ldr r1, [r0] - adds r1, 0x18 - adds r1, r2 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - adds r0, r2 - ldrb r1, [r1] - ldrb r0, [r0] - cmp r1, r0 - beq _0818E1BA -_0818E1DA: - movs r7, 0x2 -_0818E1DC: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818E13C - - thumb_func_start sub_818E1F4 -sub_818E1F4: @ 818E1F4 - push {r4-r6,lr} - ldr r3, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r2, =0x00003b58 - adds r0, r1, r2 - str r0, [r3] - movs r5, 0 - movs r4, 0 - ldr r0, =0x00003b78 - adds r1, r0 - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - ldrh r1, [r1] - adds r6, r3, 0 - adds r3, r0, 0 - ldrb r2, [r2, 0xA] - cmp r1, r2 - bne _0818E23A -_0818E21A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bhi _0818E23C - ldr r1, [r6] - lsls r0, r4, 1 - adds r1, 0x20 - adds r1, r0 - ldr r0, [r3] - adds r0, 0xA - adds r0, r4 - ldrh r1, [r1] - ldrb r0, [r0] - cmp r1, r0 - beq _0818E21A -_0818E23A: - movs r5, 0x1 -_0818E23C: - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818E1F4 - thumb_func_start sub_818E258 sub_818E258: @ 818E258 push {lr} diff --git a/include/global.h b/include/global.h index 84c70a16e..569345355 100644 --- a/include/global.h +++ b/include/global.h @@ -674,9 +674,8 @@ struct LilycoveLadyQuiz /*0x002*/ u16 unk_002[9]; /*0x014*/ u16 unk_014; /*0x016*/ u16 unk_016; - /*0x018*/ u8 unk_018; - /*0x019*/ u8 filler_019[7]; - /*0x020*/ u16 unk_020[4]; + /*0x018*/ u8 playerName[8]; + /*0x020*/ u16 playerTrainerId[4]; /*0x028*/ u16 unk_028; /*0x02a*/ u8 unk_02a; /*0x02b*/ u8 unk_02b; @@ -690,9 +689,8 @@ struct LilycoveLadyFavour /*0x001*/ u8 unk_001; /*0x002*/ u8 unk_002; /*0x003*/ u8 unk_003; - /*0x004*/ u8 unk_004[8]; + /*0x004*/ u8 playerName[8]; /*0x00c*/ u8 unk_00c; - /*0x00d*/ u8 filler_00d; /*0x00e*/ u16 itemId; /*0x010*/ u16 unk_010; /*0x012*/ u8 language; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 93c3cce67..196867369 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -23,6 +23,7 @@ void sub_818E674(void); bool32 sub_811F8D8(u16); u8 sub_818E13C(void); bool8 sub_818E1F4(void); +u8 sub_818E258(const u8 *); extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; @@ -32,6 +33,7 @@ extern const u16 gUnknown_0860B304[6]; extern const u16 *const gUnknown_0860B1A4[16]; extern const u16 gUnknown_0860B1E4[16]; extern const u16 gUnknown_0860B204[16]; +extern const u8 gUnknown_085EEB7E[8]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; @@ -144,7 +146,7 @@ void SetLilycoveFavourLady(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; gUnknown_0203CD64->unk_001 = 0; - gUnknown_0203CD64->unk_004[0] = EOS; + gUnknown_0203CD64->playerName[0] = EOS; gUnknown_0203CD64->unk_002 = 0; gUnknown_0203CD64->unk_003= 0; gUnknown_0203CD64->itemId = ITEM_NONE; @@ -190,9 +192,9 @@ void sub_818DC2C(void) bool8 sub_818DC60(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - if (gUnknown_0203CD64->unk_004[0] != EOS) + if (gUnknown_0203CD64->playerName[0] != EOS) { - StringCopy7(gStringVar3, gUnknown_0203CD64->unk_004); + StringCopy7(gStringVar3, gUnknown_0203CD64->playerName); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); return TRUE; } @@ -219,7 +221,7 @@ void sub_818DCF4(const u8 *src, u8 *dest) void sub_818DD14(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - sub_818DCF4(gUnknown_0203CD64->unk_004, gStringVar3); + sub_818DCF4(gUnknown_0203CD64->playerName, gStringVar3); ConvertInternationalString(gStringVar3, gUnknown_0203CD64->language); } @@ -245,7 +247,7 @@ bool8 sub_818DD84(u16 itemId) gUnknown_0203CD64->unk_001 = 1; sub_818DCAC(gStringVar2, itemId); gUnknown_0203CD64->itemId = itemId; - sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->unk_004); + sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->playerName); gUnknown_0203CD64->language = gGameLanguage; response = FALSE; for (i = 0; i < len; i ++) @@ -311,7 +313,7 @@ void sub_818DF00(void) { u8 v0; u8 i; - + v0 = Random() % 16; for (i = 0; i < 9; i ++) { @@ -320,7 +322,7 @@ void sub_818DF00(void) gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0]; gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0]; gUnknown_0203CD68->unk_02b = v0; - gUnknown_0203CD68->unk_018 = 0xFF; + gUnknown_0203CD68->playerName[0] = EOS; } void SetLilycoveQuizLady(void) @@ -338,7 +340,7 @@ void SetLilycoveQuizLady(void) gUnknown_0203CD68->unk_016 = -1; for (i = 0; i < 4; i ++) { - gUnknown_0203CD68->unk_020[i] = 0; + gUnknown_0203CD68->playerTrainerId[i] = 0; } gUnknown_0203CD68->unk_028 = 0; gUnknown_0203CD68->unk_02a = 0; @@ -398,7 +400,7 @@ u8 sub_818E06C(void) quiz->unk_014 = gUnknown_0860B1E4[i]; quiz->unk_028 = gUnknown_0860B204[i]; quiz->unk_02b = i; - quiz->unk_018 = 0xFF; + quiz->playerName[0] = EOS; } rv = sub_818E13C(); if (rv == 0) @@ -414,3 +416,135 @@ u8 sub_818E06C(void) return 0; } } + +#ifdef NONMATCHING +u8 sub_818E13C(void) +{ + u8 retval; + u8 len; + u8 i; + + retval = 1; + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (gUnknown_0203CD68->playerName[0] == EOS) + { + StringCopy7(gStringVar1, gUnknown_085EEB7E); + retval = 0; + } + else + { + StringCopy7(gStringVar1, gUnknown_0203CD68->playerName); + ConvertInternationalString(gStringVar1, gUnknown_0203CD68->language); + len = sub_818E258(gUnknown_0203CD68->playerName); + if (len == sub_818E258(gSaveBlock2Ptr->playerName)) + { + for (i = 0; i < len; i ++) + { + if (gUnknown_0203CD68->playerName[i] != gSaveBlock2Ptr->playerName[i]) + { + retval = 2; + break; + } + } + } + + } + return retval; +} +#else +__attribute__((naked)) u8 sub_818E13C(void) +{ + asm_unified("\tpush {r4-r7,lr}\n" + "\tmovs r7, 0x1\n" + "\tldr r5, =gUnknown_0203CD68\n" + "\tldr r0, =gSaveBlock1Ptr\n" + "\tldr r1, [r0]\n" + "\tldr r2, =0x00003b58\n" + "\tadds r0, r1, r2\n" + "\tstr r0, [r5]\n" + "\tldrb r0, [r0, 0x18]\n" + "\tcmp r0, 0xFF\n" + "\tbne _0818E174\n" + "\tldr r0, =gStringVar1\n" + "\tldr r1, =gUnknown_085EEB7E\n" + "\tbl StringCopy7\n" + "\tmovs r7, 0\n" + "\tb _0818E1DC\n" + "\t.pool\n" + "_0818E174:\n" + "\tldr r4, =gStringVar1\n" + "\tldr r0, =0x00003b70\n" + "\tadds r1, r0\n" + "\tadds r0, r4, 0\n" + "\tbl StringCopy7\n" + "\tldr r0, [r5]\n" + "\tadds r0, 0x2D\n" + "\tldrb r1, [r0]\n" + "\tadds r0, r4, 0\n" + "\tbl ConvertInternationalString\n" + "\tldr r0, [r5]\n" + "\tadds r0, 0x18\n" + "\tbl sub_818E258\n" + "\tlsls r0, 24\n" + "\tlsrs r4, r0, 24\n" + "\tldr r6, =gSaveBlock2Ptr\n" + "\tldr r0, [r6]\n" + "\tbl sub_818E258\n" + "\tlsls r0, 24\n" + "\tlsrs r0, 24\n" + "\tcmp r4, r0\n" + "\tbne _0818E1DC\n" + "\tldr r0, [r5]\n" + "\tmovs r2, 0\n" + "\tcmp r2, r4\n" + "\tbcs _0818E1DC\n" + "\tldr r1, [r6]\n" + "\tldrb r0, [r0, 0x18]\n" + "\tldrb r1, [r1]\n" + "\tcmp r0, r1\n" + "\tbne _0818E1DA\n" + "_0818E1BA:\n" + "\tadds r0, r2, 0x1\n" + "\tlsls r0, 24\n" + "\tlsrs r2, r0, 24\n" + "\tcmp r2, r4\n" + "\tbcs _0818E1DC\n" + "\tldr r0, =gUnknown_0203CD68\n" + "\tldr r1, [r0]\n" + "\tadds r1, 0x18\n" + "\tadds r1, r2\n" + "\tldr r0, =gSaveBlock2Ptr\n" + "\tldr r0, [r0]\n" + "\tadds r0, r2\n" + "\tldrb r1, [r1]\n" + "\tldrb r0, [r0]\n" + "\tcmp r1, r0\n" + "\tbeq _0818E1BA\n" + "_0818E1DA:\n" + "\tmovs r7, 0x2\n" + "_0818E1DC:\n" + "\tadds r0, r7, 0\n" + "\tpop {r4-r7}\n" + "\tpop {r1}\n" + "\tbx r1\n" + "\t.pool"); +} +#endif + +u8 sub_818E1F4(void) +{ + u8 response; + u8 i; + + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + response = 0; + for (i = 0; i < 4; i ++) + { + if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i]) + { + response = 1; + break; + } + } + return response; +} From 0895d8d861ca7db6d8fa2910f6275eb6b615340e Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 11:25:46 -0400 Subject: [PATCH 46/62] sub_818E258 --- asm/lilycove_lady.s | 20 -------------------- src/lilycove_lady.c | 9 +++++++++ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index bb044a01e..1580d9595 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,26 +5,6 @@ .text - thumb_func_start sub_818E258 -sub_818E258: @ 818E258 - push {lr} - movs r2, 0 - adds r1, r0, 0 - b _0818E268 -_0818E260: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - adds r1, 0x1 -_0818E268: - ldrb r0, [r1] - cmp r0, 0xFF - bne _0818E260 - adds r0, r2, 0 - pop {r1} - bx r1 - thumb_func_end sub_818E258 - thumb_func_start sub_818E274 sub_818E274: @ 818E274 push {r4,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 196867369..564b089a6 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -548,3 +548,12 @@ u8 sub_818E1F4(void) } return response; } + +u8 sub_818E258(const u8 *str) +{ + u8 len; + const u8 *ptr; + + for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++); + return len; +} From 8a31e58689af6e62c8c272c24397310c2a44f6f5 Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 11:30:09 -0400 Subject: [PATCH 47/62] sub_818E298 --- asm/lilycove_lady.s | 47 --------------------------------------------- include/global.h | 2 +- src/lilycove_lady.c | 28 +++++++++++++++++++++------ 3 files changed, 23 insertions(+), 54 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 1580d9595..65cc3b41a 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,53 +5,6 @@ .text - thumb_func_start sub_818E274 -sub_818E274: @ 818E274 - push {r4,lr} - ldr r4, =gStringVar1 - ldr r0, =gUnknown_0203CD68 - ldr r0, [r0] - ldrh r0, [r0, 0x28] - bl ItemId_GetItem - adds r1, r0, 0 - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E274 - - thumb_func_start sub_818E298 -sub_818E298: @ 818E298 - push {r4,lr} - ldr r4, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r4] - bl sub_818E13C - lsls r0, 24 - cmp r0, 0 - beq _0818E2C0 - movs r0, 0 - b _0818E2CC - .pool -_0818E2C0: - ldr r0, [r4] - ldr r1, =gGameLanguage - ldrb r1, [r1] - adds r0, 0x2D - strb r1, [r0] - movs r0, 0x1 -_0818E2CC: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818E298 - thumb_func_start sub_818E2D8 sub_818E2D8: @ 818E2D8 ldr r2, =gUnknown_0203CD68 diff --git a/include/global.h b/include/global.h index 569345355..09dabf822 100644 --- a/include/global.h +++ b/include/global.h @@ -676,7 +676,7 @@ struct LilycoveLadyQuiz /*0x016*/ u16 unk_016; /*0x018*/ u8 playerName[8]; /*0x020*/ u16 playerTrainerId[4]; - /*0x028*/ u16 unk_028; + /*0x028*/ u16 itemId; /*0x02a*/ u8 unk_02a; /*0x02b*/ u8 unk_02b; /*0x02c*/ u8 unk_02c; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 564b089a6..976ed4d88 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -320,7 +320,7 @@ void sub_818DF00(void) gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i]; } gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0]; - gUnknown_0203CD68->unk_028 = gUnknown_0860B204[v0]; + gUnknown_0203CD68->itemId = gUnknown_0860B204[v0]; gUnknown_0203CD68->unk_02b = v0; gUnknown_0203CD68->playerName[0] = EOS; } @@ -342,7 +342,7 @@ void SetLilycoveQuizLady(void) { gUnknown_0203CD68->playerTrainerId[i] = 0; } - gUnknown_0203CD68->unk_028 = 0; + gUnknown_0203CD68->itemId = ITEM_NONE; gUnknown_0203CD68->unk_02a = 0; gUnknown_0203CD68->unk_02c = 0x10; gUnknown_0203CD68->language = gGameLanguage; @@ -398,7 +398,7 @@ u8 sub_818E06C(void) quiz->unk_002[j] = gUnknown_0860B1A4[i][j]; } quiz->unk_014 = gUnknown_0860B1E4[i]; - quiz->unk_028 = gUnknown_0860B204[i]; + quiz->itemId = gUnknown_0860B204[i]; quiz->unk_02b = i; quiz->playerName[0] = EOS; } @@ -533,16 +533,16 @@ __attribute__((naked)) u8 sub_818E13C(void) u8 sub_818E1F4(void) { - u8 response; + bool8 response; u8 i; gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; - response = 0; + response = FALSE; for (i = 0; i < 4; i ++) { if (gUnknown_0203CD68->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i]) { - response = 1; + response = TRUE; break; } } @@ -557,3 +557,19 @@ u8 sub_818E258(const u8 *str) for (len = 0, ptr = str; *ptr != EOS; len ++, ptr ++); return len; } + +void sub_818E274(void) +{ + StringCopy(gStringVar1, ItemId_GetItem(gUnknown_0203CD68->itemId)->name); +} + +bool8 sub_818E298(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (!sub_818E13C()) + { + gUnknown_0203CD68->language = gGameLanguage; + return TRUE; + } + return FALSE; +} From 213fef604247d31f6981bd83c703bb1d3e1bbd31 Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 11:44:20 -0400 Subject: [PATCH 48/62] through sub_818E308 --- asm/lilycove_lady.s | 56 --------------------------------------------- include/easy_chat.h | 2 ++ src/lilycove_lady.c | 20 ++++++++++++++++ 3 files changed, 22 insertions(+), 56 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 65cc3b41a..0c46932cf 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,62 +5,6 @@ .text - thumb_func_start sub_818E2D8 -sub_818E2D8: @ 818E2D8 - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00003b58 - adds r1, r0, r3 - str r1, [r2] - ldr r1, =0x00003b82 - adds r0, r1 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_818E2D8 - - thumb_func_start sub_818E2FC -sub_818E2FC: @ 818E2FC - push {lr} - bl easy_chat_input_maybe - pop {r0} - bx r0 - thumb_func_end sub_818E2FC - - thumb_func_start sub_818E308 -sub_818E308: @ 818E308 - push {r4-r6,lr} - ldr r5, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r5] - ldr r6, =gStringVar1 - ldrh r1, [r0, 0x14] - adds r0, r6, 0 - bl CopyEasyChatWord - ldr r4, =gStringVar2 - ldr r0, [r5] - ldrh r1, [r0, 0x16] - adds r0, r4, 0 - bl CopyEasyChatWord - adds r0, r6, 0 - adds r1, r4, 0 - bl StringCompare - movs r1, 0 - cmp r0, 0 - bne _0818E33C - movs r1, 0x1 -_0818E33C: - adds r0, r1, 0 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818E308 - thumb_func_start sub_818E358 sub_818E358: @ 818E358 ldr r1, =gUnknown_0203CD68 diff --git a/include/easy_chat.h b/include/easy_chat.h index 5143aa39c..d7dc72410 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -29,5 +29,7 @@ enum }; void InitEasyChatPhrases(void); +void easy_chat_input_maybe(void); +void CopyEasyChatWord(u8 *, u16); #endif // GUARD_EASYCHAT_H diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 976ed4d88..485a0c9d4 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -12,6 +12,7 @@ #include "items.h" #include "item_menu.h" #include "text.h" +#include "easy_chat.h" #include "lilycove_lady.h" void SetLilycoveQuizLady(void); @@ -573,3 +574,22 @@ bool8 sub_818E298(void) } return FALSE; } + +u8 sub_818E2D8(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + return gUnknown_0203CD68->unk_02a; +} + +void sub_818E2FC(void) +{ + easy_chat_input_maybe(); +} + +bool8 sub_818E308(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + CopyEasyChatWord(gStringVar1, gUnknown_0203CD68->unk_014); + CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016); + return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE; +} From fdea92edffb4360db50cb0e7dcc044dc7242defe Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 11:48:11 -0400 Subject: [PATCH 49/62] through sub_818E3E0 --- asm/lilycove_lady.s | 65 --------------------------------------------- include/item_menu.h | 1 + src/lilycove_lady.c | 29 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 65 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 0c46932cf..72b321ef8 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,71 +5,6 @@ .text - thumb_func_start sub_818E358 -sub_818E358: @ 818E358 - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldr r1, =gSpecialVar_0x8005 - ldrh r0, [r0, 0x28] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_818E358 - - thumb_func_start sub_818E37C -sub_818E37C: @ 818E37C - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - movs r1, 0x1 - strb r1, [r0, 0x1] - bx lr - .pool - thumb_func_end sub_818E37C - - thumb_func_start sub_818E39C -sub_818E39C: @ 818E39C - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - movs r1, 0x2 - strb r1, [r0, 0x1] - bx lr - .pool - thumb_func_end sub_818E39C - - thumb_func_start sub_818E3BC -sub_818E3BC: @ 818E3BC - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldr r1, =0x0000ffff - strh r1, [r0, 0x16] - bx lr - .pool - thumb_func_end sub_818E3BC - - thumb_func_start sub_818E3E0 -sub_818E3E0: @ 818E3E0 - push {lr} - bl sub_81AAC70 - pop {r0} - bx r0 - thumb_func_end sub_818E3E0 - thumb_func_start sub_818E3EC sub_818E3EC: @ 818E3EC push {r4,lr} diff --git a/include/item_menu.h b/include/item_menu.h index f402f5cdd..85655e9d5 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -7,5 +7,6 @@ // Exported ROM declarations void sub_81AAC50(void); +void sub_81AAC70(void); #endif //GUARD_item_menu_H diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 485a0c9d4..c4a0b9c11 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -593,3 +593,32 @@ bool8 sub_818E308(void) CopyEasyChatWord(gStringVar2, gUnknown_0203CD68->unk_016); return StringCompare(gStringVar1, gStringVar2) ? FALSE : TRUE; } + +void sub_818E358(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gSpecialVar_0x8005 = gUnknown_0203CD68->itemId; +} + +void sub_818E37C(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->unk_001 = 1; +} + +void sub_818E39C(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->unk_001 = 2; +} + +void sub_818E3BC(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->unk_016 = -1; +} + +void sub_818E3E0(void) +{ + sub_81AAC70(); +} From 5fb39d5ef9f7c19ecff2b347cf7785ea8fc63ad9 Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 20 Sep 2017 12:56:45 -0400 Subject: [PATCH 50/62] sub_818E3EC --- asm/lilycove_lady.s | 32 -------------------------------- src/lilycove_lady.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 72b321ef8..34b479c8a 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,38 +5,6 @@ .text - thumb_func_start sub_818E3EC -sub_818E3EC: @ 818E3EC - push {r4,lr} - ldr r4, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r4] - bl sub_818E298 - lsls r0, 24 - cmp r0, 0 - beq _0818E41C - ldr r0, [r4] - adds r1, r0, 0 - adds r1, 0x2B - ldrb r1, [r1] - adds r0, 0x2C - b _0818E422 - .pool -_0818E41C: - ldr r0, [r4] - adds r0, 0x2C - movs r1, 0x10 -_0818E422: - strb r1, [r0] - bl sub_818DF00 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_818E3EC - thumb_func_start sub_818E430 sub_818E430: @ 818E430 push {r4,r5,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index c4a0b9c11..65f6e2e10 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -622,3 +622,17 @@ void sub_818E3E0(void) { sub_81AAC70(); } + +void sub_818E3EC(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (sub_818E298()) + { + gUnknown_0203CD68->unk_02c = gUnknown_0203CD68->unk_02b; + } + else + { + gUnknown_0203CD68->unk_02c = 0x10; + } + sub_818DF00(); +} From d22a9acc63b9f7c72e0d7ec81396b799af94e270 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 16:12:18 -0400 Subject: [PATCH 51/62] through sub_818E490 --- asm/lilycove_lady.s | 60 --------------------------------------------- include/global.h | 2 +- src/lilycove_lady.c | 23 +++++++++++++++++ 3 files changed, 24 insertions(+), 61 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 34b479c8a..b50218e48 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,66 +5,6 @@ .text - thumb_func_start sub_818E430 -sub_818E430: @ 818E430 - push {r4,r5,lr} - ldr r1, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - movs r2, 0 - adds r5, r1, 0 - adds r4, r5, 0 - ldr r0, =0x0000ffff - adds r3, r0, 0 -_0818E448: - ldr r1, [r4] - lsls r0, r2, 1 - adds r1, 0x2 - adds r1, r0 - ldrh r0, [r1] - orrs r0, r3 - strh r0, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x8 - bls _0818E448 - ldr r1, [r5] - ldr r0, =0x0000ffff - strh r0, [r1, 0x14] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E430 - - thumb_func_start sub_818E47C -sub_818E47C: @ 818E47C - push {lr} - ldr r1, =gSpecialVar_0x8004 - movs r0, 0x11 - strh r0, [r1] - bl easy_chat_input_maybe - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E47C - - thumb_func_start sub_818E490 -sub_818E490: @ 818E490 - push {lr} - ldr r0, =gScriptItemId - ldrh r0, [r0] - movs r1, 0x1 - bl RemoveBagItem - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E490 - thumb_func_start sub_818E4A4 sub_818E4A4: @ 818E4A4 push {r4-r6,lr} diff --git a/include/global.h b/include/global.h index 09dabf822..6fa8cb92d 100644 --- a/include/global.h +++ b/include/global.h @@ -712,7 +712,7 @@ typedef union // TODO struct { /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[0x207]; + /*0x001*/ u8 filler_001[0x217]; } common; } LilycoveLady; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 65f6e2e10..a0482a28f 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -636,3 +636,26 @@ void sub_818E3EC(void) } sub_818DF00(); } + +void sub_818E430(void) +{ + u8 i; + + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + for (i = 0; i < 9; i ++) + { + gUnknown_0203CD68->unk_002[i] = -1; + } + gUnknown_0203CD68->unk_014 = -1; +} + +void sub_818E47C(void) +{ + gSpecialVar_0x8004 = 0x11; + easy_chat_input_maybe(); +} + +void sub_818E490(void) +{ + RemoveBagItem(gScriptItemId, 1); +} From 44e75e1f0303248638d3ab4b7115a1c7db24dbf0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 16:32:37 -0400 Subject: [PATCH 52/62] through sub_818E570 --- asm/lilycove_lady.s | 161 -------------------------------------------- src/lilycove_lady.c | 56 +++++++++++++++ 2 files changed, 56 insertions(+), 161 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index b50218e48..0acc81935 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,167 +5,6 @@ .text - thumb_func_start sub_818E4A4 -sub_818E4A4: @ 818E4A4 - push {r4-r6,lr} - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - ldr r1, =gScriptItemId - ldrh r1, [r1] - strh r1, [r0, 0x28] - movs r3, 0 - adds r4, r2, 0 - ldr r6, =gSaveBlock2Ptr - adds r5, r4, 0 - adds r2, r6, 0 -_0818E4C2: - ldr r1, [r5] - lsls r0, r3, 1 - adds r1, 0x20 - adds r1, r0 - ldr r0, [r2] - adds r0, 0xA - adds r0, r3 - ldrb r0, [r0] - strh r0, [r1] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3 - bls _0818E4C2 - ldr r0, [r4] - adds r0, 0x18 - ldr r1, [r6] - bl StringCopy7 - ldr r0, [r4] - ldr r1, =gGameLanguage - ldrb r1, [r1] - adds r0, 0x2D - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E4A4 - - thumb_func_start sub_818E510 -sub_818E510: @ 818E510 - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00003b58 - adds r1, r0, r3 - str r1, [r2] - ldr r1, =0x00003b82 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_818E510 - - thumb_func_start sub_818E538 -sub_818E538: @ 818E538 - push {lr} - ldr r2, =gUnknown_0203CD68 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x00003b58 - adds r1, r0 - str r1, [r2] - ldr r0, =gStringVar3 - ldrh r1, [r1, 0x14] - bl CopyEasyChatWord - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E538 - - thumb_func_start sub_818E564 -sub_818E564: @ 818E564 - push {lr} - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_818E564 - - thumb_func_start sub_818E570 -sub_818E570: @ 818E570 - push {r4-r7,lr} - ldr r2, =gUnknown_0203CD68 - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r4, =0x00003b58 - adds r3, r1, r4 - str r3, [r2] - adds r6, r0, 0 - adds r6, 0x2C - ldrb r4, [r6] - adds r7, r2, 0 - cmp r4, 0xF - bhi _0818E5EC - ldrb r0, [r3] - cmp r0, 0 - bne _0818E5EC - movs r5, 0 - ldr r2, =0x00003b83 - adds r0, r1, r2 - ldrb r0, [r0] - cmp r4, r0 - bne _0818E5E4 - adds r4, r7, 0 -_0818E59E: - bl Random - ldr r2, [r4] - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xF - ands r0, r1 - adds r2, 0x2B - strb r0, [r2] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x3 - bhi _0818E5C6 - ldr r0, [r4] - adds r0, 0x2B - ldrb r1, [r6] - ldrb r0, [r0] - cmp r1, r0 - beq _0818E59E -_0818E5C6: - ldr r0, [r4] - adds r2, r0, 0 - adds r2, 0x2B - ldrb r0, [r6] - ldr r7, =gUnknown_0203CD68 - ldrb r4, [r2] - cmp r0, r4 - bne _0818E5E4 - ldrb r1, [r2] - adds r3, r1, 0x1 - adds r0, r3, 0 - asrs r0, 4 - lsls r0, 4 - subs r0, r3, r0 - strb r0, [r2] -_0818E5E4: - ldr r0, [r7] - ldrb r1, [r6] - adds r0, 0x2C - strb r1, [r0] -_0818E5EC: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E570 - thumb_func_start sub_818E604 sub_818E604: @ 818E604 push {r4,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index a0482a28f..61b5488a1 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -38,6 +38,8 @@ extern const u8 gUnknown_085EEB7E[8]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; +EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL; + extern EWRAM_DATA u16 gScriptItemId; u8 GetLilycoveLadyId(void) @@ -659,3 +661,57 @@ void sub_818E490(void) { RemoveBagItem(gScriptItemId, 1); } + +void sub_818E4A4(void) +{ + u8 i; + + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->itemId = gScriptItemId; + for (i = 0; i < 4; i ++) + { + gUnknown_0203CD68->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; + } + StringCopy7(gUnknown_0203CD68->playerName, gSaveBlock2Ptr->playerName); + gUnknown_0203CD68->language = gGameLanguage; +} + +void sub_818E510(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + gUnknown_0203CD68->unk_02a = 1; +} + +void sub_818E538(void) +{ + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + CopyEasyChatWord(gStringVar3, gUnknown_0203CD68->unk_014); +} + +void sub_818E564(void) +{ + EnableBothScriptContexts(); +} + +void sub_818E570(const struct LilycoveLadyQuiz *quiz) +{ + u8 i; + + gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; + if (quiz->unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ) + { + for (i = 0; i < 4; i ++) + { + if (quiz->unk_02c != gUnknown_0203CD68->unk_02b) + { + break; + } + gUnknown_0203CD68->unk_02b = Random() % 16; + } + if (quiz->unk_02c == gUnknown_0203CD68->unk_02b) + { + gUnknown_0203CD68->unk_02b = (gUnknown_0203CD68->unk_02b + 1) % 16; + } + gUnknown_0203CD68->unk_02c = quiz->unk_02c; + } +} From 7c8cbc6b88d745da215fc45730f84b598869438f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 16:49:22 -0400 Subject: [PATCH 53/62] SetLilycoveContestLady --- asm/lilycove_lady.s | 52 --------------------------------------------- include/global.h | 21 +++++++++--------- src/lilycove_lady.c | 46 +++++++++++++++++++++++++++------------ 3 files changed, 43 insertions(+), 76 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 0acc81935..7a844c2fb 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,58 +5,6 @@ .text - thumb_func_start sub_818E604 -sub_818E604: @ 818E604 - push {r4,lr} - ldr r4, =gUnknown_0203CD6C - ldr r1, [r4] - movs r0, 0xFF - strb r0, [r1, 0x4] - ldr r0, [r4] - movs r1, 0 - strb r1, [r0, 0x2] - ldr r0, [r4] - strb r1, [r0, 0x3] - ldr r0, [r4] - strb r1, [r0, 0xC] - bl Random - ldr r4, [r4] - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x5 - bl __umodsi3 - strb r0, [r4, 0xD] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E604 - - thumb_func_start SetLilycoveContestLady -SetLilycoveContestLady: @ 818E638 - push {r4,lr} - ldr r4, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r4] - movs r2, 0 - movs r1, 0x2 - strb r1, [r0] - ldr r0, [r4] - strb r2, [r0, 0x1] - bl sub_818E604 - ldr r1, [r4] - ldr r0, =gGameLanguage - ldrb r0, [r0] - strb r0, [r1, 0xE] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end SetLilycoveContestLady - thumb_func_start sub_818E674 sub_818E674: @ 818E674 push {lr} diff --git a/include/global.h b/include/global.h index 6fa8cb92d..fa7856786 100644 --- a/include/global.h +++ b/include/global.h @@ -670,7 +670,7 @@ enum { struct LilycoveLadyQuiz { /*0x000*/ u8 id; - /*0x001*/ u8 unk_001; + /*0x001*/ u8 phase; /*0x002*/ u16 unk_002[9]; /*0x014*/ u16 unk_014; /*0x016*/ u16 unk_016; @@ -686,7 +686,7 @@ struct LilycoveLadyQuiz struct LilycoveLadyFavour { /*0x000*/ u8 id; - /*0x001*/ u8 unk_001; + /*0x001*/ u8 phase; /*0x002*/ u8 unk_002; /*0x003*/ u8 unk_003; /*0x004*/ u8 playerName[8]; @@ -699,8 +699,13 @@ struct LilycoveLadyFavour struct LilycoveLadyContest { /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[12]; - /*0x00d*/ u8 category; // maybe? + /*0x001*/ u8 phase; + /*0x002*/ u8 fave_pkblk; + /*0x003*/ u8 other_pkblk; + /*0x004*/ u8 playerName[8]; + /*0x00c*/ u8 max_sheen; + /*0x00d*/ u8 category; + /*0x00e*/ u8 language; }; typedef union // TODO @@ -708,12 +713,7 @@ typedef union // TODO struct LilycoveLadyQuiz quiz; struct LilycoveLadyFavour favour; struct LilycoveLadyContest contest; - - struct - { - /*0x000*/ u8 id; - /*0x001*/ u8 filler_001[0x217]; - } common; + u8 id; } LilycoveLady; struct SaveBlock1 @@ -800,6 +800,7 @@ struct SaveBlock1 /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[52]; /*0x3B58*/ LilycoveLady lilycoveLady; + /*0x3B88*/ u8 filler_3B88[0x1E8]; /*0x3D70*/ u8 babyPhrase[24]; // TODO: convert to a struct // sizeof: 0x3D88 }; diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 61b5488a1..f6471828b 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -44,7 +44,7 @@ extern EWRAM_DATA u16 gScriptItemId; u8 GetLilycoveLadyId(void) { - return gSaveBlock1Ptr->lilycoveLady.common.id; + return gSaveBlock1Ptr->lilycoveLady.id; } void sub_818D9C0(void) @@ -148,7 +148,7 @@ void SetLilycoveFavourLady(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; - gUnknown_0203CD64->unk_001 = 0; + gUnknown_0203CD64->phase = 0; gUnknown_0203CD64->playerName[0] = EOS; gUnknown_0203CD64->unk_002 = 0; gUnknown_0203CD64->unk_003= 0; @@ -161,17 +161,17 @@ void sub_818DBC4(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; - gUnknown_0203CD64->unk_001 = 0; + gUnknown_0203CD64->phase = 0; } u8 sub_818DBE8(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - if (gUnknown_0203CD64->unk_001 == 2) + if (gUnknown_0203CD64->phase == 2) { return 2; } - else if (gUnknown_0203CD64->unk_001 == 1) + else if (gUnknown_0203CD64->phase == 1) { return 1; } @@ -247,7 +247,7 @@ bool8 sub_818DD84(u16 itemId) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; len = sub_818DB04(gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c]); - gUnknown_0203CD64->unk_001 = 1; + gUnknown_0203CD64->phase = 1; sub_818DCAC(gStringVar2, itemId); gUnknown_0203CD64->itemId = itemId; sub_818DCF4(gSaveBlock2Ptr->playerName, gUnknown_0203CD64->playerName); @@ -297,14 +297,14 @@ u16 sub_818DEA0(void) gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c]; sub_818DE88(itemId); - gUnknown_0203CD64->unk_001 = 2; + gUnknown_0203CD64->phase = 2; return itemId; } void sub_818DEDC(void) { SetLilycoveFavourLady(); - gUnknown_0203CD64->unk_001 = 1; + gUnknown_0203CD64->phase = 1; } void sub_818DEF4(void) @@ -334,7 +334,7 @@ void SetLilycoveQuizLady(void) gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; - gUnknown_0203CD68->unk_001 = 0; + gUnknown_0203CD68->phase = 0; for (i = 0; i < 9; i ++) { gUnknown_0203CD68->unk_002[i] = -1; @@ -356,7 +356,7 @@ void sub_818E004(void) { gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; - gUnknown_0203CD68->unk_001 = 0; + gUnknown_0203CD68->phase = 0; gUnknown_0203CD68->unk_02a = 0; gUnknown_0203CD68->unk_016 = -1; } @@ -364,11 +364,11 @@ void sub_818E004(void) u8 sub_818E038(void) { gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; - if (gUnknown_0203CD68->unk_001 == 2) + if (gUnknown_0203CD68->phase == 2) { return 2; } - else if (gUnknown_0203CD68->unk_001 == 1) + else if (gUnknown_0203CD68->phase == 1) { return 1; } @@ -605,13 +605,13 @@ void sub_818E358(void) void sub_818E37C(void) { gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; - gUnknown_0203CD68->unk_001 = 1; + gUnknown_0203CD68->phase = 1; } void sub_818E39C(void) { gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; - gUnknown_0203CD68->unk_001 = 2; + gUnknown_0203CD68->phase = 2; } void sub_818E3BC(void) @@ -715,3 +715,21 @@ void sub_818E570(const struct LilycoveLadyQuiz *quiz) gUnknown_0203CD68->unk_02c = quiz->unk_02c; } } + +void sub_818E604(void) +{ + gUnknown_0203CD6C->playerName[0] = EOS; + gUnknown_0203CD6C->fave_pkblk = 0; + gUnknown_0203CD6C->other_pkblk = 0; + gUnknown_0203CD6C->max_sheen = 0; + gUnknown_0203CD6C->category = Random() % 5; +} + +void SetLilycoveContestLady(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; + gUnknown_0203CD6C->phase = 0; + sub_818E604(); + gUnknown_0203CD6C->language = gGameLanguage; +} From 9ed9f7de941d5b89a1c6d6241b3bbb5726aa99e8 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 20 Sep 2017 14:38:05 -0500 Subject: [PATCH 54/62] Finish renaming strings in strings.s --- asm/battle_frontier_2.s | 236 +++--- asm/battle_interface.s | 8 +- asm/battle_message.s | 4 +- asm/battle_records.s | 6 +- asm/berry_blender.s | 6 +- asm/berry_tag_screen.s | 10 +- asm/cable_club.s | 2 +- asm/clear_save_data_screen.s | 4 +- asm/contest.s | 10 +- asm/contest_link_80F57C4.s | 14 +- asm/daycare.s | 10 +- asm/decoration.s | 42 +- asm/diploma.s | 6 +- asm/easy_chat.s | 36 +- asm/egg_hatch.s | 4 +- asm/evolution_scene.s | 2 +- asm/field_player_avatar.s | 8 +- asm/field_poison.s | 2 +- asm/field_region_map.s | 2 +- asm/fldeff_80F9BCC.s | 4 +- asm/fldeff_softboiled.s | 4 +- asm/item_menu.s | 20 +- asm/item_use.s | 4 +- asm/learn_move.s | 20 +- asm/lilycove_lady.s | 2 +- asm/link.s | 250 +++--- asm/mail.s | 4 +- asm/main_menu.s | 8 +- asm/mauville_old_man.s | 6 +- asm/menu.s | 8 +- asm/money.s | 2 +- asm/mystery_event_menu.s | 12 +- asm/mystery_event_script.s | 2 +- asm/naming_screen.s | 2 +- asm/option_menu.s | 30 +- asm/party_menu.s | 186 ++--- asm/player_pc.s | 28 +- asm/pokeblock_feed.s | 6 +- asm/pokemon_storage_system.s | 6 +- asm/pokemon_summary_screen.s | 92 +-- asm/pokenav.s | 50 +- asm/record_mixing.s | 4 +- asm/region_map.s | 6 +- asm/reset_rtc_screen.s | 22 +- asm/rom6.s | 50 +- asm/save_failed_screen.s | 16 +- asm/script_menu.s | 28 +- asm/secret_base.s | 8 +- asm/shop.s | 34 +- asm/slot_machine.s | 10 +- asm/start_menu.s | 8 +- asm/trade.s | 20 +- asm/trader.s | 4 +- asm/trainer_card.s | 58 +- asm/tv.s | 86 +- asm/use_pokeblock.s | 10 +- asm/walda_phrase.s | 2 +- asm/wallclock.s | 6 +- data/battle_message.s | 4 +- data/link.s | 130 +-- data/strings.s | 1436 ++++++++++++++++++---------------- src/item.c | 12 +- src/pokemon_size_record.c | 8 +- src/start_menu.c | 8 +- 64 files changed, 1600 insertions(+), 1528 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 40f084a0f..8a9b0ba24 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -2398,7 +2398,7 @@ sub_819B9B4: @ 819B9B4 movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEBB2 + ldr r2, =gText_RentalPkmn2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -2481,20 +2481,20 @@ sub_819BA64: @ 819BA64 ldrb r0, [r0, 0x5] cmp r0, 0x1 bne _0819BA88 - ldr r2, =gUnknown_085EEBC1 + ldr r2, =gText_SelectFirstPkmn b _0819BA9C .pool _0819BA88: cmp r0, 0x2 bne _0819BA94 - ldr r2, =gUnknown_085EEBDB + ldr r2, =gText_SelectSecondPkmn b _0819BA9C .pool _0819BA94: - ldr r2, =gUnknown_085EEC2D + ldr r2, =gText_TheseThreePkmnOkay cmp r0, 0x3 bne _0819BA9C - ldr r2, =gUnknown_085EEBF6 + ldr r2, =gText_SelectThirdPkmn _0819BA9C: movs r0, 0x5 str r0, [sp] @@ -2521,7 +2521,7 @@ sub_819BAC8: @ 819BAC8 movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEC50 + ldr r2, =gText_CantSelectSamePkmn movs r0, 0x5 str r0, [sp] movs r0, 0 @@ -2560,7 +2560,7 @@ sub_819BAFC: @ 819BAFC str r4, [sp] movs r6, 0 str r6, [sp, 0x4] - ldr r0, =gUnknown_085EEC15 + ldr r0, =gText_Summary str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2571,7 +2571,7 @@ sub_819BAFC: @ 819BAFC beq _0819BB60 str r4, [sp] str r6, [sp, 0x4] - ldr r0, =gUnknown_085EEC24 + ldr r0, =gText_Deselect str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2583,7 +2583,7 @@ sub_819BAFC: @ 819BAFC _0819BB60: str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EEC10 + ldr r0, =gText_Rent str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2595,7 +2595,7 @@ _0819BB74: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EEC1D + ldr r0, =gText_Others2 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -2625,7 +2625,7 @@ sub_819BBA8: @ 819BBA8 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EEC49 + ldr r0, =gText_Yes2 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -2634,7 +2634,7 @@ sub_819BBA8: @ 819BBA8 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EEC4D + ldr r0, =gText_No2 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -4584,7 +4584,7 @@ sub_819CC24: @ 819CC24 ldrsh r5, [r4, r0] cmp r5, 0 bne _0819CC5A - ldr r0, =gUnknown_085EECBB + ldr r0, =gText_QuitSwapping bl sub_819EBEC ldr r0, =gUnknown_03001284 ldr r0, [r0] @@ -4670,7 +4670,7 @@ sub_819CCD4: @ 819CCD4 adds r1, 0x30 movs r2, 0x1 bl sub_819F2B4 - ldr r0, =gUnknown_085EECF0 + ldr r0, =gText_AcceptThisPkmn bl sub_819EBEC ldr r0, [r4] adds r0, 0x20 @@ -6176,12 +6176,12 @@ _0819D948: ldrb r0, [r0, 0x14] cmp r0, 0 bne _0819D964 - ldr r0, =gUnknown_085EEC73 + ldr r0, =gText_SelectPkmnToSwap bl sub_819EBEC b _0819D96A .pool _0819D964: - ldr r0, =gUnknown_085EEC8B + ldr r0, =gText_SelectPkmnToAccept bl sub_819EBEC _0819D96A: ldr r0, =gUnknown_03001284 @@ -6765,7 +6765,7 @@ _0819DF02: b _0819E006 .pool _0819DF10: - ldr r0, =gUnknown_085EEC73 + ldr r0, =gText_SelectPkmnToSwap bl sub_819EBEC movs r0, 0x2 bl PutWindowTilemap @@ -8272,7 +8272,7 @@ sub_819EB18: @ 819EB18 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EEC66 + ldr r2, =gText_PkmnSwap movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -8402,7 +8402,7 @@ sub_819EC20: @ 819EC20 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECAA + ldr r0, =gText_Summary2 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8411,7 +8411,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECA5 + ldr r0, =gText_Swap str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8420,7 +8420,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECB2 + ldr r0, =gText_Rechoose str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -8450,7 +8450,7 @@ sub_819EC94: @ 819EC94 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECCA + ldr r0, =gText_Yes3 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -8459,7 +8459,7 @@ sub_819EC94: @ 819EC94 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EECCE + ldr r0, =gText_No3 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -8523,12 +8523,12 @@ sub_819ED34: @ 819ED34 beq _0819ED56 cmp r0, 0x1 bne _0819ED60 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0 movs r2, 0x5 bl sub_819ECF0 _0819ED56: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x18 movs r2, 0x5 bl sub_819ECF0 @@ -8554,12 +8554,12 @@ sub_819ED78: @ 819ED78 beq _0819ED9A cmp r0, 0x1 bne _0819EDA4 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 _0819ED9A: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -8588,14 +8588,14 @@ _0819EDCC: ldrb r0, [r0, 0x14] cmp r0, 0x1 bne _0819EDF6 - ldr r0, =gUnknown_085EECD1 + ldr r0, =gText_PkmnForSwap movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 b _0819EDF6 .pool _0819EDEC: - ldr r0, =gUnknown_085EECDD + ldr r0, =gText_Cancel3 movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -9401,7 +9401,7 @@ _0819F4C8: .4byte _0819F548 .4byte _0819F568 _0819F4DC: - ldr r0, =gUnknown_085EED0A + ldr r0, =gText_SamePkmnInPartyAlready bl sub_819EBEC ldr r0, =gUnknown_03001284 ldr r0, [r0] @@ -9446,7 +9446,7 @@ _0819F52C: bl CopyWindowToVram b _0819F54E _0819F548: - ldr r0, =gUnknown_085EEC8B + ldr r0, =gText_SelectPkmnToAccept bl sub_819EBEC _0819F54E: ldr r0, =gTasks @@ -11469,9 +11469,9 @@ _081A0528: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, =gUnknown_085EAEB1 + ldr r0, =gText_Lv50 str r0, [sp, 0xC] - ldr r0, =gUnknown_085EAEB8 + ldr r0, =gText_OpenLevel str r0, [sp, 0x10] b _081A0652 .pool @@ -11580,9 +11580,9 @@ _081A061C: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, =gUnknown_085ED193 + ldr r0, =gText_Give str r0, [sp, 0xC] - ldr r0, =gUnknown_085ED198 + ldr r0, =gText_NoNeed str r0, [sp, 0x10] b _081A0652 .pool @@ -11590,9 +11590,9 @@ _081A0634: movs r1, 0x14 mov r10, r1 movs r6, 0x8 - ldr r0, =gUnknown_085EAE62 + ldr r0, =gText_Yes str r0, [sp, 0xC] - ldr r0, =gUnknown_085EAE66 + ldr r0, =gText_No str r0, [sp, 0x10] b _081A0652 .pool @@ -12950,11 +12950,11 @@ _081A1140: ands r0, r1 cmp r0, 0x1 bne _081A115C - ldr r1, =gUnknown_085EAEB1 + ldr r1, =gText_Lv50 b _081A1174 .pool _081A115C: - ldr r1, =gUnknown_085EAEB8 + ldr r1, =gText_OpenLevel b _081A1174 .pool _081A1164: @@ -14386,7 +14386,7 @@ _081A1D24: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -14434,7 +14434,7 @@ sub_81A1D78: @ 81A1D78 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r5, [sp] bl sub_81A1CD8 add sp, 0x4 @@ -14545,7 +14545,7 @@ _081A1E66: lsrs r0, 24 cmp r0, 0x1 bne _081A1E88 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -14554,7 +14554,7 @@ _081A1E66: b _081A1E96 .pool _081A1E88: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -14593,7 +14593,7 @@ sub_81A1EA8: @ 81A1EA8 cmp r7, 0 bne _081A1EF0 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE158 + ldr r1, =gText_SingleBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool @@ -14601,7 +14601,7 @@ _081A1EF0: cmp r7, 0x1 bne _081A1F08 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE178 + ldr r1, =gText_DoubleBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool @@ -14609,13 +14609,13 @@ _081A1F08: cmp r7, 0x2 bne _081A1F20 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE198 + ldr r1, =gText_MultiBattleRoomResults bl StringExpandPlaceholders b _081A1F28 .pool _081A1F20: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1B7 + ldr r1, =gText_LinkMultiBattleRoomResults bl StringExpandPlaceholders _081A1F28: ldr r0, =gStringVar4 @@ -14623,7 +14623,7 @@ _081A1F28: bl sub_81A1C4C ldr r6, =gUnknown_0203AB74 ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -14635,7 +14635,7 @@ _081A1F28: movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -14830,8 +14830,8 @@ _081A20E6: lsrs r0, 24 cmp r0, 0x1 bne _081A210C - ldr r0, =gUnknown_085EE311 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Current + ldr r1, =gText_ClearStreak str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -14840,8 +14840,8 @@ _081A20E6: b _081A211C .pool _081A210C: - ldr r0, =gUnknown_085EE320 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Prev + ldr r1, =gText_ClearStreak str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -14881,13 +14881,13 @@ sub_81A2134: @ 81A2134 cmp r7, 0 bne _081A217C ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1DB + ldr r1, =gText_SingleBattleTourneyResults bl StringExpandPlaceholders b _081A2184 .pool _081A217C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE1FE + ldr r1, =gText_DoubleBattleTourneyResults bl StringExpandPlaceholders _081A2184: ldr r0, =gStringVar4 @@ -14895,7 +14895,7 @@ _081A2184: bl sub_81A1C4C ldr r1, =gUnknown_0203AB74 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -14907,7 +14907,7 @@ _081A2184: bl PrintTextOnWindow ldr r1, =gUnknown_0203AB74 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -14935,13 +14935,13 @@ _081A2184: str r0, [sp] movs r0, 0x31 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE319 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Record + ldr r1, =gText_ClearStreak movs r3, 0x40 bl sub_81A2008 - ldr r1, =gUnknown_085EE332 + ldr r1, =gText_Total mov r10, r1 - ldr r0, =gUnknown_085EE349 + ldr r0, =gText_Championships mov r8, r0 ldr r0, [r4] ldr r1, =0x00000d1c @@ -14972,8 +14972,8 @@ _081A2184: str r0, [sp] movs r0, 0x71 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE319 - ldr r1, =gUnknown_085EE338 + ldr r0, =gText_Record + ldr r1, =gText_ClearStreak movs r3, 0x40 bl sub_81A2008 ldr r0, [r4] @@ -15052,7 +15052,7 @@ _081A2304: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15100,7 +15100,7 @@ sub_81A2358: @ 81A2358 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r5, [sp] bl sub_81A22B8 add sp, 0x4 @@ -15186,7 +15186,7 @@ _081A241E: lsrs r0, 24 cmp r0, 0x1 bne _081A2440 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -15195,7 +15195,7 @@ _081A241E: b _081A244E .pool _081A2440: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -15234,13 +15234,13 @@ sub_81A2460: @ 81A2460 cmp r7, 0 bne _081A24A8 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE221 + ldr r1, =gText_SingleBattleHallResults bl StringExpandPlaceholders b _081A24B0 .pool _081A24A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE241 + ldr r1, =gText_DoubleBattleHallResults bl StringExpandPlaceholders _081A24B0: ldr r0, =gStringVar4 @@ -15248,7 +15248,7 @@ _081A24B0: bl sub_81A1C4C ldr r6, =gUnknown_0203AB74 ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -15260,7 +15260,7 @@ _081A24B0: movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -15434,8 +15434,8 @@ _081A264C: lsrs r0, 24 cmp r0, 0x1 bne _081A2674 - ldr r0, =gUnknown_085EE311 - ldr r1, =gUnknown_085EE35B + ldr r0, =gText_Current + ldr r1, =gText_RoomsCleared str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -15444,8 +15444,8 @@ _081A264C: b _081A2684 .pool _081A2674: - ldr r0, =gUnknown_085EE320 - ldr r1, =gUnknown_085EE35B + ldr r0, =gText_Prev + ldr r1, =gText_RoomsCleared str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -15480,14 +15480,14 @@ sub_81A2698: @ 81A2698 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE261 + ldr r1, =gText_BattleChoiceResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0 bl sub_81A1C4C ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x21 str r1, [sp] movs r5, 0xFF @@ -15498,7 +15498,7 @@ sub_81A2698: @ 81A2698 movs r3, 0x8 bl PrintTextOnWindow ldrb r0, [r6] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -15513,9 +15513,9 @@ sub_81A2698: @ 81A2698 movs r2, 0x72 movs r3, 0x21 bl sub_81A2618 - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record mov r10, r0 - ldr r7, =gUnknown_085EE35B + ldr r7, =gText_RoomsCleared ldr r5, =gSaveBlock2Ptr ldr r0, [r5] ldr r1, =0x00000e08 @@ -15529,9 +15529,9 @@ sub_81A2698: @ 81A2698 adds r1, r7, 0 movs r3, 0x40 bl sub_81A258C - ldr r0, =gUnknown_085EE332 + ldr r0, =gText_Total mov r8, r0 - ldr r1, =gUnknown_085EE36D + ldr r1, =gText_TimesCleared mov r9, r1 ldr r0, [r5] ldr r1, =0x00000e0c @@ -15633,7 +15633,7 @@ _081A2834: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE381 + ldr r1, =gText_KOsInARow adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15678,7 +15678,7 @@ sub_81A2888: @ 81A2888 adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -15743,7 +15743,7 @@ _081A2928: lsrs r0, 24 cmp r0, 0x1 bne _081A2948 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -15752,7 +15752,7 @@ _081A2928: b _081A2956 .pool _081A2948: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -15785,14 +15785,14 @@ sub_81A2968: @ 81A2968 movs r0, 0xA bl sub_81A1C90 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE27C + ldr r1, =gText_SetKOTourneyResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -15803,7 +15803,7 @@ sub_81A2968: @ 81A2968 movs r3, 0x10 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -15896,7 +15896,7 @@ _081A2A80: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE302 + ldr r1, =gText_WinStreak adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15915,7 +15915,7 @@ _081A2A80: movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EE392 + ldr r1, =gText_TimesVar1 adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -15973,7 +15973,7 @@ sub_81A2B04: @ 81A2B04 adds r2, r0 adds r2, r1 ldrh r2, [r2] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -16102,7 +16102,7 @@ _081A2C3E: lsrs r0, 24 cmp r0, 0x1 bne _081A2C68 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current mov r1, r8 str r1, [sp] mov r1, r9 @@ -16116,7 +16116,7 @@ _081A2C3E: b _081A2C80 .pool _081A2C68: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev mov r1, r8 str r1, [sp] mov r1, r9 @@ -16160,13 +16160,13 @@ sub_81A2C94: @ 81A2C94 cmp r7, 0 bne _081A2CD8 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE298 + ldr r1, =gText_BattleSwapSingleResults bl StringExpandPlaceholders b _081A2CE0 .pool _081A2CD8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EE2B8 + ldr r1, =gText_BattleSwapDoubleResults bl StringExpandPlaceholders _081A2CE0: ldr r0, =gStringVar4 @@ -16175,7 +16175,7 @@ _081A2CE0: ldr r0, =gUnknown_0203AB74 mov r8, r0 ldrb r0, [r0] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -16187,7 +16187,7 @@ _081A2CE0: bl PrintTextOnWindow mov r1, r8 ldrb r0, [r1] - ldr r2, =gUnknown_085EE326 + ldr r2, =gText_RentalSwap str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -16196,7 +16196,7 @@ _081A2CE0: bl PrintTextOnWindow mov r1, r8 ldrb r0, [r1] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -16301,7 +16301,7 @@ _081A2E00: movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE39C + ldr r1, =gText_FloorsCleared adds r0, r4, 0 bl StringExpandPlaceholders mov r1, r10 @@ -16346,7 +16346,7 @@ sub_81A2E54: @ 81A2E54 adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, =gUnknown_085EE319 + ldr r0, =gText_Record str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -16413,7 +16413,7 @@ _081A2EF8: lsrs r0, 24 cmp r0, 0x1 bne _081A2F18 - ldr r0, =gUnknown_085EE311 + ldr r0, =gText_Current str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -16422,7 +16422,7 @@ _081A2EF8: b _081A2F26 .pool _081A2F18: - ldr r0, =gUnknown_085EE320 + ldr r0, =gText_Prev str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -16453,14 +16453,14 @@ sub_81A2F38: @ 81A2F38 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE2D8 + ldr r1, =gText_BattleQuestResults adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F2 + ldr r2, =gText_Lv502 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -16471,7 +16471,7 @@ sub_81A2F38: @ 81A2F38 movs r3, 0x8 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE2F9 + ldr r2, =gText_OpenLv movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -16532,7 +16532,7 @@ sub_81A2FF8: @ 81A2FF8 bl FillWindowPixelBuffer ldr r0, =gStringVar4 mov r9, r0 - ldr r1, =gUnknown_085EDF86 + ldr r1, =gText_LinkContestResults bl StringExpandPlaceholders movs r0, 0x1 mov r1, r9 @@ -16550,7 +16550,7 @@ sub_81A2FF8: @ 81A2FF8 str r5, [sp, 0x8] mov r2, r9 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA0 + ldr r7, =gText_1st movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16568,7 +16568,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA4 + ldr r7, =gText_2nd movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16585,7 +16585,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFA8 + ldr r7, =gText_3rd movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16602,7 +16602,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl PrintTextOnWindow - ldr r7, =gUnknown_085EDFAC + ldr r7, =gText_4th movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -16620,7 +16620,7 @@ sub_81A2FF8: @ 81A2FF8 adds r2, r7, 0 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0E8 + ldr r2, =gText_Cool movs r1, 0x29 str r1, [sp] str r6, [sp, 0x4] @@ -16629,7 +16629,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0ED + ldr r2, =gText_Beauty movs r1, 0x39 str r1, [sp] str r6, [sp, 0x4] @@ -16638,7 +16638,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0F4 + ldr r2, =gText_Cute movs r1, 0x49 str r1, [sp] str r6, [sp, 0x4] @@ -16647,7 +16647,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0F9 + ldr r2, =gText_Smart movs r1, 0x59 str r1, [sp] str r6, [sp, 0x4] @@ -16656,7 +16656,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl PrintTextOnWindow ldrb r0, [r4] - ldr r2, =gUnknown_085EB0FF + ldr r2, =gText_Tough movs r1, 0x69 str r1, [sp] str r6, [sp, 0x4] @@ -18966,7 +18966,7 @@ sub_81A4594: @ 81A4594 ldrb r5, [r1] lsls r4, r0, 1 adds r4, r0 - ldr r1, =gUnknown_085EE424 + ldr r1, =gText_1Dot adds r4, r1 mov r1, r8 lsls r3, r1, 27 @@ -19076,7 +19076,7 @@ sub_81A4684: @ 81A4684 ldrb r0, [r1] lsls r2, r6, 1 adds r2, r6 - ldr r1, =gUnknown_085EE424 + ldr r1, =gText_1Dot adds r2, r1 lsls r3, r7, 27 lsrs r3, 24 diff --git a/asm/battle_interface.s b/asm/battle_interface.s index e5f031962..489366fe8 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -3760,7 +3760,7 @@ sub_80741E8: @ 80741E8 lsls r0, 24 lsrs r7, r0, 24 ldr r5, =gDisplayedStringBattle - ldr r1, =gUnknown_085ED228 + ldr r1, =gText_HighlightDarkGrey adds r0, r5, 0 bl StringCopy adds r0, r4, 0 @@ -3802,15 +3802,15 @@ _0807424A: beq _08074268 cmp r6, 0xFE beq _08074270 - ldr r1, =gUnknown_085ED238 + ldr r1, =gText_DynColor2 b _08074272 .pool _08074268: - ldr r1, =gUnknown_085ED22E + ldr r1, =gText_DynColor2Male b _08074272 .pool _08074270: - ldr r1, =gUnknown_085ED233 + ldr r1, =gText_DynColor1Female _08074272: adds r0, r5, 0 bl StringCopy diff --git a/asm/battle_message.s b/asm/battle_message.s index ef5ecbf9c..dfbf069b3 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2051,12 +2051,12 @@ _0814F3C4: ldr r0, =0x000008ab bl FlagGet lsls r0, 24 - ldr r4, =gText_SomeonesPC + ldr r4, =gText_Someones cmp r0, 0 bne _0814F3D4 b _0814F5C0 _0814F3D4: - ldr r4, =gText_LanettesPC + ldr r4, =gText_Lanettes b _0814F5C0 .pool _0814F3E4: diff --git a/asm/battle_records.s b/asm/battle_records.s index 2c7b1d830..c961aefe3 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -488,7 +488,7 @@ sub_813C2F4: @ 813C2F4 movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6A1 + ldr r1, =gText_TotalRecordWLD adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -672,7 +672,7 @@ sub_813C4BC: @ 813C4BC movs r1, 0x11 bl FillWindowPixelBuffer ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EF68D + ldr r1, =gText_PlayersBattleResults adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -697,7 +697,7 @@ sub_813C4BC: @ 813C4BC mov r9, r1 add r0, r9 bl sub_813C2F4 - ldr r1, =gUnknown_085EF6BD + ldr r1, =gText_WinLoseDraw adds r0, r5, 0 bl StringExpandPlaceholders ldrb r0, [r6] diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 73ff40796..0599fa153 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -5627,7 +5627,7 @@ _080827AA: ldr r0, [r6] ldr r1, =0x000011b8 adds r0, r1 - ldr r1, =gUnknown_085EE42D + ldr r1, =gText_SavingDontTurnOff2 movs r2, 0 bl sub_808417C bl sub_800ADF8 @@ -8350,7 +8350,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24 ldrb r0, [r5] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r6, =gUnknown_085EE44F + ldr r6, =gText_BlenderMaxSpeedRecord movs r0, 0x1 adds r1, r6, 0 movs r2, 0x90 @@ -8367,7 +8367,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24 adds r2, r6, 0 bl PrintTextOnWindow ldrb r0, [r5] - ldr r2, =gUnknown_085EE473 + ldr r2, =gText_234Players movs r1, 0x29 str r1, [sp] str r4, [sp, 0x4] diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index b21a249bd..9622f0508 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -511,7 +511,7 @@ sub_8178090: @ 8178090 movs r0, 0x3 movs r1, 0xFF bl FillWindowPixelBuffer - ldr r4, =gUnknown_085E926B + ldr r4, =gText_BerryTag movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -573,7 +573,7 @@ sub_8178110: @ 8178110 adds r1, r6, 0 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9263 + ldr r1, =gText_UnkF908Var1Var2 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -602,7 +602,7 @@ sub_8178174: @ 8178174 ldrb r0, [r0] bl GetBerryInfo adds r4, r0, 0 - ldr r2, =gUnknown_085E9225 + ldr r2, =gText_SizeSlash movs r7, 0x1 str r7, [sp] movs r0, 0xFF @@ -652,7 +652,7 @@ _081781C8: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9233 + ldr r1, =gText_Var1DotVar2 adds r0, r4, 0 bl StringExpandPlaceholders str r7, [sp] @@ -694,7 +694,7 @@ itemid_copy_name: @ 8178250 ldrb r0, [r0] bl GetBerryInfo adds r6, r0, 0 - ldr r2, =gUnknown_085E922C + ldr r2, =gText_FirmSlash movs r5, 0x11 str r5, [sp] movs r0, 0xFF diff --git a/asm/cable_club.s b/asm/cable_club.s index 76d1dca06..80d9a0916 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -55,7 +55,7 @@ sub_80B23B0: @ 80B23B0 movs r1, 0 bl SetStandardWindowBorderStyle ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EE667 + ldr r1, =gText_XPLink adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x1 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 27c32feb5..5efff250c 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -33,7 +33,7 @@ sub_817ACE4: @ 817ACE4 movs r2, 0x2 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFA8F + ldr r2, =gText_ClearAllSaveData movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -87,7 +87,7 @@ _0817AD68: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EFAAA + ldr r2, =gText_ClearingData movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] diff --git a/asm/contest.s b/asm/contest.s index 76effb4e7..493cc3733 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1579,7 +1579,7 @@ _080D84B8: cmp r0, 0 beq _080D853C add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1A0 + ldr r1, =gText_ColorLightShadowDarkGrey b _080D8566 .pool _080D853C: @@ -1603,7 +1603,7 @@ _080D853C: cmp r0, 0x3 beq _080D856C add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1A7 + ldr r1, =gText_ColorBlue _080D8566: bl StringCopy adds r5, r0, 0 @@ -6407,7 +6407,7 @@ sub_80DAED4: @ 80DAED4 lsls r4, r1, 24 lsrs r4, 24 ldr r0, =gDisplayedStringBattle - ldr r1, =gUnknown_085ED1AB + ldr r1, =gText_ColorTransparent bl StringCopy adds r1, r0, 0 subs r0, r1, 0x1 @@ -15507,7 +15507,7 @@ _080DF784: mov r9, r0 _080DF7AE: add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1B2 + ldr r1, =gText_CDot bl StringCopy adds r5, r0, 0 ldr r0, =gUnknown_02039F26 @@ -15604,7 +15604,7 @@ _080DF874: mov r10, r1 _080DF884: add r0, sp, 0x4 - ldr r1, =gUnknown_085ED1B5 + ldr r1, =gText_BDot bl StringCopy ldr r0, =gUnknown_02039F34 ldr r0, [r0] diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s index bf7a88eb8..864f16c5e 100644 --- a/asm/contest_link_80F57C4.s +++ b/asm/contest_link_80F57C4.s @@ -283,7 +283,7 @@ sub_80F5A74: @ 80F5A74 ldrb r0, [r0] cmp r5, r0 bne _080F5A96 - ldr r1, =gUnknown_085ED21E + ldr r1, =gText_ColorDarkGrey adds r0, r6, 0 bl StringCopy adds r6, r0, 0 @@ -655,7 +655,7 @@ _080F5E2E: ands r0, r1 cmp r0, 0 beq _080F5E78 - ldr r0, =gUnknown_085ED207 + ldr r0, =gText_CommunicationStandby bl sub_80F707C ldr r0, =sub_80F5ED8 b _080F5EB8 @@ -784,7 +784,7 @@ sub_80F5F74: @ 80F5F74 ldr r0, =sub_80F68F0 movs r1, 0x14 bl CreateTask - ldr r0, =gUnknown_085ED1B8 + ldr r0, =gText_AnnouncingResults ldr r1, =gUnknown_0203A034 ldr r1, [r1] ldr r1, [r1] @@ -828,7 +828,7 @@ _080F5FF0: _080F5FF8: cmp r0, 0x3 bne _080F6030 - ldr r0, =gUnknown_085ED1D0 + ldr r0, =gText_PreliminaryResults ldr r1, =gUnknown_0203A034 ldr r1, [r1] ldr r1, [r1] @@ -970,7 +970,7 @@ sub_80F60F0: @ 80F60F0 cmp r0, 0x15 bne _080F615E strh r3, [r1, 0xA] - ldr r0, =gUnknown_085ED1E9 + ldr r0, =gText_Round2Results ldr r1, [r5] ldrb r1, [r1] bl sub_80F6B78 @@ -1265,7 +1265,7 @@ _080F636E: adds r4, r1 adds r1, r4, 0 bl StringCopy - ldr r1, =gUnknown_085ED1FA + ldr r1, =gText_Var1sVar2Won mov r0, sp bl StringExpandPlaceholders ldr r0, =gUnknown_0203A034 @@ -1679,7 +1679,7 @@ sub_80F671C: @ 80F671C ldrsh r0, [r4, r1] cmp r0, 0 bne _080F676E - ldr r0, =gUnknown_085ED207 + ldr r0, =gText_CommunicationStandby bl sub_80F707C bl sub_800AC34 ldr r0, =sub_80F677C diff --git a/asm/daycare.s b/asm/daycare.s index 711d63e42..792ab66ff 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -2800,7 +2800,7 @@ _08070FCC: adds r0, r7, 0 mov r1, sp bl StringCopy - ldr r4, =gUnknown_085EF881 + ldr r4, =gText_NewLine2 adds r0, r7, 0 adds r1, r4, 0 bl StringAppend @@ -2810,7 +2810,7 @@ _08070FCC: adds r0, r7, 0 adds r1, r4, 0 bl StringAppend - ldr r1, =gUnknown_085EF883 + ldr r1, =gText_Exit4 adds r0, r7, 0 bl StringAppend add sp, 0x28 @@ -2834,7 +2834,7 @@ sub_8071038: @ 8071038 movs r5, 0 _08071046: adds r0, r4, 0 - ldr r1, =gUnknown_085EF888 + ldr r1, =gText_Lv bl StringAppend movs r0, 0x8C adds r2, r5, 0 @@ -2856,7 +2856,7 @@ _08071046: mov r1, sp bl StringAppend adds r0, r4, 0 - ldr r1, =gUnknown_085EF881 + ldr r1, =gText_NewLine2 bl StringAppend adds r0, r5, 0x1 lsls r0, 24 @@ -2971,7 +2971,7 @@ sub_8071148: @ 8071148 mov r8, r3 lsls r5, 24 lsrs r5, 24 - ldr r1, =gUnknown_085EF888 + ldr r1, =gText_Lv mov r0, sp bl StringCopy movs r0, 0x8C diff --git a/asm/decoration.s b/asm/decoration.s index 4efc70e04..3aa7a0784 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -336,7 +336,7 @@ sub_8126C48: @ 8126C48 cmp r0, 0 bne _08126C7C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -376,7 +376,7 @@ sub_8126CA4: @ 8126CA4 cmp r0, 0 bne _08126CD8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAEC + ldr r1, =gText_NoDecorationsInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -420,7 +420,7 @@ sub_8126D10: @ 8126D10 cmp r0, 0 bne _08126D44 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8126DA4 @@ -656,7 +656,7 @@ _08126F0C: ldr r2, =gText_Cancel cmp r0, 0x2 bne _08126F2C - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit _08126F2C: lsls r0, r4, 4 adds r0, 0x1 @@ -798,7 +798,7 @@ sub_8127058: @ 8127058 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r1, =gUnknown_085EA7C8 + ldr r1, =gText_Color161Shadow161 bl StringCopy cmp r4, 0x1 bne _08127078 @@ -909,7 +909,7 @@ _08127154: movs r0, 0x1 bl sub_8126A58 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA83D + ldr r1, =gText_NoDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127180 @@ -2637,7 +2637,7 @@ sub_8127F68: @ 8127F68 cmp r0, 0x7 beq _08127FAC ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9AE + ldr r1, =gText_CantPlaceInRoom adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -2682,13 +2682,13 @@ _08127FE8: cmp r0, 0 bne _08128018 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA8EA + ldr r1, =gText_NoMoreDecorations bl StringExpandPlaceholders b _08128020 .pool _08128018: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA931 + ldr r1, =gText_NoMoreDecorations2 bl StringExpandPlaceholders _08128020: ldr r1, =gStringVar4 @@ -2699,7 +2699,7 @@ _08128020: .pool _08128038: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8D2 + ldr r1, =gText_InUseAlready adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -3169,7 +3169,7 @@ sub_8128414: @ 8128414 strh r2, [r0, 0x3C] bl sub_8128DE0 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EA8BF + ldr r1, =gText_CancelDecorating adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8128B80 @@ -3835,7 +3835,7 @@ sub_8128950: @ 8128950 cmp r0, 0x1 bne _081289A4 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA897 + ldr r1, =gText_PlaceItHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_81289D0 @@ -3848,7 +3848,7 @@ _081289A4: movs r0, 0x20 bl PlaySE ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA8A6 + ldr r1, =gText_CantBePlacedHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129020 @@ -5810,7 +5810,7 @@ _08129968: cmp r0, 0x1 bne _08129994 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAC5 + ldr r1, =gText_DecorationReturnedToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -6137,7 +6137,7 @@ sub_8129BF8: @ 8129BF8 ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6162,7 +6162,7 @@ sub_8129C74: @ 8129C74 cmp r0, 0 beq _08129CA8 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAAA3 + ldr r1, =gText_ReturnDecorationToPC adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1A0 @@ -6216,7 +6216,7 @@ _08129CDE: ldr r1, =SpriteCallbackDummy str r1, [r0] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA62 + ldr r1, =gText_StopPuttingAwayDecorations adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A1F0 @@ -6228,7 +6228,7 @@ _08129D14: .pool _08129D3C: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA81 + ldr r1, =gText_NoDecorationHere adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8129D64 @@ -7087,7 +7087,7 @@ sub_812A3D4: @ 812A3D4 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EAA14 + ldr r1, =gText_DecorationWillBeDiscarded adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_812A458 @@ -7098,7 +7098,7 @@ sub_812A3D4: @ 812A3D4 .pool _0812A430: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA9E0 + ldr r1, =gText_CantThrowAwayInUse adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C @@ -7151,7 +7151,7 @@ sub_812A478: @ 812A478 adds r0, r4, 0 bl sub_8127814 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAA3D + ldr r1, =gText_DecorationThrownAway adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_8127A5C diff --git a/asm/diploma.s b/asm/diploma.s index 6d303d860..4f21fe39d 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -262,7 +262,7 @@ pokedex_diploma_something: @ 8177AD4 movs r0, 0x14 bl SetGpuReg ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EE855 + ldr r1, =gText_DexNational bl StringCopy b _08177B0C .pool @@ -271,11 +271,11 @@ _08177AFC: movs r1, 0 bl SetGpuReg ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EE84F + ldr r1, =gText_DexHoenn bl StringCopy _08177B0C: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE85E + ldr r1, =gText_PokedexDiploma adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 565d9fcc6..20bf327ac 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -3296,7 +3296,7 @@ sub_811BB40: @ 811BB40 ldrb r0, [r0] cmp r0, 0x4 bne _0811BB5C - ldr r0, =gUnknown_085EC3B4 + ldr r0, =gText_StopGivingPkmnMail b _0811BB7A .pool _0811BB5C: @@ -3306,13 +3306,13 @@ _0811BB5C: bgt _0811BB78 cmp r0, 0xF blt _0811BB78 - ldr r0, =gUnknown_085EC706 + ldr r0, =gText_LikeToQuitQuiz str r0, [r2] - ldr r0, =gUnknown_085EC727 + ldr r0, =gText_ChallengeQuestionMark b _0811BB7E .pool _0811BB78: - ldr r0, =gUnknown_085EC3A6 + ldr r0, =gText_QuitEditing _0811BB7A: str r0, [r2] movs r0, 0 @@ -3325,9 +3325,9 @@ _0811BB7E: thumb_func_start sub_811BB88 sub_811BB88: @ 811BB88 - ldr r2, =gUnknown_085EC410 + ldr r2, =gText_AllTextBeingEditedWill str r2, [r0] - ldr r0, =gUnknown_085EC42F + ldr r0, =gText_BeDeletedThatOkay str r0, [r1] bx lr .pool @@ -3711,11 +3711,11 @@ sub_811BDF0: @ 811BDF0 b _0811BE3C .pool _0811BE34: - ldr r1, =gUnknown_085EC6B2 + ldr r1, =gText_Lady movs r0, 0 bl sub_81AFC0C _0811BE3C: - ldr r1, =gUnknown_085EC6A8 + ldr r1, =gText_F700sQuiz adds r0, r6, 0 bl sub_81AFC28 add sp, 0x20 @@ -6054,35 +6054,35 @@ _0811D16A: bl sub_811BB88 b _0811D1BC _0811D174: - ldr r0, =gUnknown_085EC743 + ldr r0, =gText_CreateAQuiz str r0, [sp, 0xC] b _0811D1BC .pool _0811D180: - ldr r0, =gUnknown_085EC752 + ldr r0, =gText_SelectTheAnswer str r0, [sp, 0xC] b _0811D1BC .pool _0811D18C: - ldr r0, =gUnknown_085EC4C9 + ldr r0, =gText_OnlyOnePhrase str r0, [sp, 0xC] - ldr r0, =gUnknown_085EC4E9 + ldr r0, =gText_OriginalSongWillBeUsed b _0811D1BA .pool _0811D19C: - ldr r0, =gUnknown_085EC765 + ldr r0, =gText_LyricsCantBeDeleted str r0, [sp, 0xC] b _0811D1BC .pool _0811D1A8: - ldr r0, =gUnknown_085EC520 + ldr r0, =gText_CombineTwoWordsOrPhrases str r0, [sp, 0xC] b _0811D1BC .pool _0811D1B4: - ldr r0, =gUnknown_085EC672 + ldr r0, =gText_YouCannotQuitHere str r0, [sp, 0xC] - ldr r0, =gUnknown_085EC688 + ldr r0, =gText_SectionMustBeCompleted _0811D1BA: str r0, [sp, 0x10] _0811D1BC: @@ -9442,7 +9442,7 @@ CopyEasyChatWord: @ 811EBBC lsls r0, 24 cmp r0, 0 beq _0811EBD8 - ldr r1, =gUnknown_085EEA42 + ldr r1, =gText_ThreeQuestionMarks b _0811EBEA .pool _0811EBD8: @@ -9693,7 +9693,7 @@ _0811ED94: b _0811EDB2 .pool _0811EDB0: - ldr r0, =gUnknown_085EEA42 + ldr r0, =gText_ThreeQuestionMarks _0811EDB2: bl StringLength lsls r0, 16 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index d646dbb73..54695cdd2 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -971,7 +971,7 @@ _08071C24: ldr r1, =gStringVar1 bl pokemon_get_nick ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED5A5 + ldr r1, =gText_PkmnHatchedFromEgg adds r0, r4, 0 bl StringExpandPlaceholders ldr r0, [r5] @@ -1023,7 +1023,7 @@ _08071CA4: ldr r1, =gStringVar1 bl pokemon_get_nick ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED5BE + ldr r1, =gText_NameHatchedPkmn adds r0, r4, 0 bl StringExpandPlaceholders ldr r0, [r5] diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index f66ec736c..efae2f07c 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -2913,7 +2913,7 @@ _0813F5F0: _0813F5FC: ldr r0, =0x00000179 bl PlayBGM - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 movs r0, 0 movs r2, 0x1 bl sub_807F1A8 diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 3cf5a70da..aaca9b2ba 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -4396,7 +4396,7 @@ fish6: @ 808CB6C sub sp, 0xC adds r5, r0, 0 bl sub_808CF78 - ldr r2, =gUnknown_085EE8F7 + ldr r2, =gText_OhABite movs r0, 0x11 str r0, [sp] movs r4, 0 @@ -4526,7 +4526,7 @@ fish9: @ 808CC64 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE903 + ldr r2, =gText_PokemonOnHook movs r5, 0 str r5, [sp] movs r0, 0x2 @@ -4683,7 +4683,7 @@ fishB: @ 808CD94 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE91E + ldr r2, =gText_NotEvenANibble movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -4731,7 +4731,7 @@ fishC: @ 808CE04 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE933 + ldr r2, =gText_ItGotAway movs r0, 0 str r0, [sp] movs r0, 0x2 diff --git a/asm/field_poison.s b/asm/field_poison.s index 8948b2762..5b1e24719 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -216,7 +216,7 @@ _080F96F0: _080F96FC: ldrb r0, [r4, 0x2] bl sub_80F95C0 - ldr r0, =gUnknown_085ECF5D + ldr r0, =gText_PkmnFainted3 bl box_related_two__2 ldrh r0, [r4] adds r0, 0x1 diff --git a/asm/field_region_map.s b/asm/field_region_map.s index fc0a38de6..512dfb151 100644 --- a/asm/field_region_map.s +++ b/asm/field_region_map.s @@ -157,7 +157,7 @@ _08170300: movs r2, 0x27 movs r3, 0xD bl SetWindowBorderStyle - ldr r5, =gUnknown_085EE8F1 + ldr r5, =gText_Hoenn movs r0, 0x1 adds r1, r5, 0 movs r2, 0x38 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 784da5b1f..3bc667754 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2061,7 +2061,7 @@ _080FACC2: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA88B + ldr r1, =gText_Gold bl StringCopy ldr r1, =gScriptResult movs r0, 0 @@ -2085,7 +2085,7 @@ _080FAD14: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA890 + ldr r1, =gText_Silver bl StringCopy ldr r1, =gScriptResult movs r0, 0 diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 2de098970..48d968d20 100755 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -221,7 +221,7 @@ sub_81616C0: @ 81616C0 ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -318,7 +318,7 @@ sub_81617B8: @ 81617B8 lsrs r4, 24 movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E9712 + ldr r0, =gText_CantBeUsedOnPkmn movs r1, 0 bl sub_81B1B5C movs r0, 0x2 diff --git a/asm/item_menu.s b/asm/item_menu.s index 914fdf2b3..fbb84bf03 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -437,7 +437,7 @@ _081AAF0C: b _081AB012 .pool _081AAF1C: - ldr r1, =gPocketNames + ldr r1, =gPocketNamesStringsTable ldr r4, =gUnknown_0203CE58 ldrb r0, [r4, 0x5] lsls r0, 2 @@ -972,7 +972,7 @@ _081AB3C0: movs r2, 0x2 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E921A + ldr r1, =gText_ClearTo11Var1Clear5Var2 b _081AB438 .pool _081AB408: @@ -995,7 +995,7 @@ _081AB420: adds r0, r5, 0 bl CopyItemName _081AB436: - ldr r1, =gUnknown_085E9210 + ldr r1, =gText_UnkF908Var1Clear7Var2 _081AB438: adds r0, r6, 0 bl StringExpandPlaceholders @@ -1297,7 +1297,7 @@ bag_menu_print_description_box_text: @ 81AB6B0 .pool _081AB6E0: ldr r0, =gStringVar1 - ldr r2, =gUnknown_085E9180 + ldr r2, =gReturnToXStringsTable ldr r1, =gUnknown_0203CE58 ldrb r1, [r1, 0x4] lsls r1, 2 @@ -2423,7 +2423,7 @@ _081AC026: adds r5, r0, 0 cmp r1, 0x1 bne _081AC07C - ldr r2, =gPocketNames + ldr r2, =gPocketNamesStringsTable ldrb r0, [r4, 0x5] lsls r0, 2 adds r0, r2 @@ -2439,7 +2439,7 @@ _081AC026: b _081AC09A .pool _081AC07C: - ldr r2, =gPocketNames + ldr r2, =gPocketNamesStringsTable add r0, sp, 0x8 ldrb r0, [r0] lsls r0, 2 @@ -4808,7 +4808,7 @@ display_sell_item_ask_str: @ 81AD5DC ldr r1, =gStringVar2 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E960F + ldr r1, =gText_CantBuyKeyItem adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =bag_menu_inits_lists_menu @@ -4834,7 +4834,7 @@ _081AD64C: ldr r1, =gStringVar2 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E962F + ldr r1, =gText_HowManyToSell adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD730 @@ -4874,7 +4874,7 @@ sub_81AD680: @ 81AD680 movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9654 + ldr r1, =gText_ICanPayVar1 adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD6E4 @@ -5079,7 +5079,7 @@ sub_81AD84C: @ 81AD84C movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9677 + ldr r1, =gText_TurnedOverVar1ForVar2 adds r0, r4, 0 bl StringExpandPlaceholders ldr r3, =sub_81AD8C8 diff --git a/asm/item_use.s b/asm/item_use.s index a2488b6df..b8eb1d1c4 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -2510,7 +2510,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 lsls r0, 24 cmp r0, 0 bne _080FE518 - ldr r2, =gUnknown_085E96F6 + ldr r2, =gText_WontHaveEffect ldr r3, =bag_menu_inits_lists_menu adds r0, r4, 0 movs r1, 0x1 @@ -2518,7 +2518,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8 b _080FE53C .pool _080FE518: - ldr r1, =gUnknown_085E96F6 + ldr r1, =gText_WontHaveEffect ldr r2, =sub_81C6714 adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid diff --git a/asm/learn_move.s b/asm/learn_move.s index c2ef76350..d8a52ba39 100755 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -377,7 +377,7 @@ _081609A8: ldr r1, =0xffff0000 cmp r0, r1 beq _08160A04 - ldr r0, =gUnknown_085EF8E4 + ldr r0, =gText_PkmnLearnedMove4 bl sub_816084C ldr r1, =gSpecialVar_0x8004 movs r0, 0x1 @@ -471,7 +471,7 @@ _08160AAA: b _08160E88 .pool _08160AB8: - ldr r0, =gUnknown_085EF8F3 + ldr r0, =gText_PkmnTryingToLearnMove bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -498,7 +498,7 @@ _08160AEC: asrs r1, r0, 24 cmp r1, 0 bne _08160B10 - ldr r0, =gUnknown_085EFA10 + ldr r0, =gText_WhichMoveToForget2 bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -528,7 +528,7 @@ _08160B2C: adds r1, r0 adds r0, r4, 0 bl StringCopy - ldr r0, =gUnknown_085EF960 + ldr r0, =gText_StopTryingToTeachMove bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -819,7 +819,7 @@ _08160D6C: adds r1, r6 adds r0, r4, 0 bl StringCopy - ldr r0, =gUnknown_085EF979 + ldr r0, =gText_12AndPoof bl sub_816084C ldr r1, [r7] movs r0, 0x1E @@ -834,7 +834,7 @@ _08160E0C: lsls r0, 16 cmp r0, 0 bne _08160E8A - ldr r0, =gUnknown_085EF9A6 + ldr r0, =gText_PkmnForgotMoveAndLearnedNew bl sub_816084C ldr r0, =gUnknown_0203BC34 ldr r1, [r0] @@ -946,7 +946,7 @@ _08160EF0: cmp r5, 0 bne _08160F38 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8C2 + ldr r1, =gText_TeachWhichMoveToPkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x3 @@ -1042,7 +1042,7 @@ _08160FE4: movs r0, 0xC strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF9E6 + ldr r1, =gText_GiveUpTeachingNewMove adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1063,7 +1063,7 @@ _08161010: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8DA + ldr r1, =gText_TeachX adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -1100,7 +1100,7 @@ sub_8161074: @ 8161074 cmp r5, 0 bne _081610A6 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF8C2 + ldr r1, =gText_TeachWhichMoveToPkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x3 diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index fca8cb29b..5845ea8fb 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -940,7 +940,7 @@ sub_818E13C: @ 818E13C cmp r0, 0xFF bne _0818E174 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EEB7E + ldr r1, =gText_Lady2 bl StringCopy7 movs r7, 0 b _0818E1DC diff --git a/asm/link.s b/asm/link.s index b6eddf2b4..0278c7445 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3482,7 +3482,7 @@ sub_800B080: @ 800B080 ldr r4, =gUnknown_082ED224 str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EE4F7 + ldr r0, =gText_CommErrorEllipsis str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -3491,7 +3491,7 @@ sub_800B080: @ 800B080 bl box_print str r4, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085EE50C + ldr r0, =gText_MoveCloserToLinkPartner str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x3 @@ -3534,7 +3534,7 @@ sub_800B138: @ 800B138 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE4A4 + ldr r0, =gText_CommErrorCheckConnections str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x3 @@ -3623,7 +3623,7 @@ _0800B214: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE572 + ldr r0, =gText_ABtnTitleScreen str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -3639,7 +3639,7 @@ _0800B244: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085EE553 + ldr r0, =gText_ABtnRegistrationCounter str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -28887,16 +28887,16 @@ sub_80186EC: @ 80186EC bl FillWindowPixelBuffer cmp r4, 0 bne _0801871C - ldr r0, =gUnknown_085EF654 - ldr r7, =gUnknown_085EF678 + ldr r0, =gText_MysteryGift + ldr r7, =gText_PickOKCancel cmp r5, 0 bne _08018720 - ldr r7, =gUnknown_085EF664 + ldr r7, =gText_PickOKExit b _08018720 .pool _0801871C: - ldr r0, =gUnknown_085EDFBF - ldr r7, =gUnknown_085EDFC9 + ldr r0, =gJPText_MysteryGift + ldr r7, =gJPText_DecideStop _08018720: movs r4, 0 str r4, [sp] @@ -29571,13 +29571,13 @@ _08018C6C: cmp r2, 0 bne _08018C84 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EF2FC + ldr r1, =gText_WhatToDoWithCards bl StringExpandPlaceholders b _08018C8C .pool _08018C84: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EF330 + ldr r1, =gText_WhatToDoWithNews bl StringExpandPlaceholders _08018C8C: ldr r0, =gUnknown_082F05D8 @@ -29801,11 +29801,11 @@ sub_8018E50: @ 8018E50 push {lr} cmp r2, 0 beq _08018E60 - ldr r3, =gUnknown_085EF55C + ldr r3, =gText_OkayToDiscardNews b _08018E62 .pool _08018E60: - ldr r3, =gUnknown_085EF520 + ldr r3, =gText_IfThrowAwayCardEventWontHappen _08018E62: movs r2, 0x1 bl sub_8018B08 @@ -29821,11 +29821,11 @@ mevent_message_was_thrown_away: @ 8018E74 push {lr} cmp r1, 0 beq _08018E84 - ldr r1, =gUnknown_085EF630 + ldr r1, =gText_WonderNewsThrownAway b _08018E86 .pool _08018E84: - ldr r1, =gUnknown_085EF60C + ldr r1, =gText_WonderCardThrownAway _08018E86: bl mevent_0814257C pop {r1} @@ -29854,7 +29854,7 @@ _08018EAC: .4byte _08018EE0 .4byte _08018EF8 _08018EC0: - ldr r0, =gUnknown_085EF5BC + ldr r0, =gText_DataWillBeSaved bl sub_8018884 b _08018EEC .pool @@ -29863,7 +29863,7 @@ _08018ECC: bl TrySavingData b _08018EEC _08018ED4: - ldr r0, =gUnknown_085EF5E0 + ldr r0, =gText_SaveCompletedPressA bl sub_8018884 b _08018EEC .pool @@ -29934,88 +29934,88 @@ _08018F30: _08018F6C: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF2E4 + ldr r2, =gText_NothingSentOver b _08019034 .pool _08018F78: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF244 + ldr r2, =gText_RecordUploadedViaWireless b _08019034 .pool _08018F84: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF0C8 + ldr r2, =gText_WonderCardReceivedFrom cmp r5, 0 bne _08019034 - ldr r2, =gUnknown_085EF124 + ldr r2, =gText_WonderCardReceived b _08019034 .pool _08018F9C: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF0F4 + ldr r2, =gText_WonderNewsReceivedFrom cmp r5, 0 bne _08019034 - ldr r2, =gUnknown_085EF14C + ldr r2, =gText_WonderNewsReceived b _08019034 .pool _08018FB4: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF178 + ldr r2, =gText_NewStampReceived b _08019034 .pool _08018FC0: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF1B4 + ldr r2, =gText_AlreadyHadCard b _08019034 .pool _08018FCC: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF200 + ldr r2, =gText_AlreadyHadStamp b _08019034 .pool _08018FD8: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF1D8 + ldr r2, =gText_AlreadyHadNews b _08019034 .pool _08018FE4: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF21C + ldr r2, =gText_NoMoreRoomForStamps b _08019034 .pool _08018FF0: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF02C + ldr r2, =gText_CommunicationCanceled b _08019034 .pool _08018FFC: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF2B4 + ldr r2, =gText_CantAcceptNewsFromTrainer cmp r6, 0 bne _08019034 - ldr r2, =gUnknown_085EF280 + ldr r2, =gText_CantAcceptCardFromTrainer b _08019034 .pool _08019014: movs r0, 0 str r0, [r4] - ldr r2, =gUnknown_085EF014 + ldr r2, =gText_CommunicationError b _08019034 .pool _08019020: movs r0, 0x1 str r0, [r4] - ldr r2, =gUnknown_085EF198 + ldr r2, =gText_NewTrainerReceived b _08019034 .pool _0801902C: @@ -30095,7 +30095,7 @@ _0801909C: mevent_message_stamp_card_etc_send_status: @ 80190A4 push {r4,lr} adds r3, r0, 0 - ldr r1, =gUnknown_085EF014 + ldr r1, =gText_CommunicationError movs r0, 0 str r0, [r3] adds r4, r1, 0 @@ -30125,57 +30125,57 @@ _080190C8: .4byte _0801915C .4byte _08019164 _08019104: - ldr r1, =gUnknown_085EF2E4 + ldr r1, =gText_NothingSentOver b _08019166 .pool _0801910C: - ldr r1, =gUnknown_085EF244 + ldr r1, =gText_RecordUploadedViaWireless b _08019166 .pool _08019114: - ldr r1, =gUnknown_085EF39C + ldr r1, =gText_WonderCardSentTo b _0801911E .pool _0801911C: - ldr r1, =gUnknown_085EF3C4 + ldr r1, =gText_WonderNewsSentTo _0801911E: movs r0, 0x1 str r0, [r3] b _08019166 .pool _08019128: - ldr r1, =gUnknown_085EF3F0 + ldr r1, =gText_StampSentTo b _08019166 .pool _08019130: - ldr r1, =gUnknown_085EF42C + ldr r1, =gText_OtherTrainerHasCard b _08019166 .pool _08019138: - ldr r1, =gUnknown_085EF494 + ldr r1, =gText_OtherTrainerHasStamp b _08019166 .pool _08019140: - ldr r1, =gUnknown_085EF460 + ldr r1, =gText_OtherTrainerHasNews b _08019166 .pool _08019148: - ldr r1, =gUnknown_085EF21C + ldr r1, =gText_NoMoreRoomForStamps b _08019166 .pool _08019150: - ldr r1, =gUnknown_085EF4C4 + ldr r1, =gText_OtherTrainerCanceled b _08019166 .pool _08019158: adds r1, r4, 0 b _08019166 _0801915C: - ldr r1, =gUnknown_085EF410 + ldr r1, =gText_GiftSentTo b _08019166 .pool _08019164: - ldr r1, =gUnknown_085EF4F0 + ldr r1, =gText_CantSendGiftToTrainer _08019166: adds r0, r1, 0 pop {r4} @@ -30357,13 +30357,13 @@ _08019300: bne _08019314 adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEEF0 + ldr r1, =gText_DontHaveCardNewOneInput b _0801931A .pool _08019314: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEF2C + ldr r1, =gText_DontHaveNewsNewOneInput _0801931A: bl mevent_0814257C cmp r0, 0 @@ -30381,12 +30381,12 @@ _08019338: ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801934C - ldr r0, =gUnknown_085EEF68 + ldr r0, =gText_WhereShouldCardBeAccessed bl sub_8018884 b _08019352 .pool _0801934C: - ldr r0, =gUnknown_085EEF94 + ldr r0, =gText_WhereShouldNewsBeAccessed bl sub_8018884 _08019352: movs r0, 0x4 @@ -30502,7 +30502,7 @@ _08019436: b _080197C0 .pool _08019444: - ldr r0, =gUnknown_085EEFE8 + ldr r0, =gText_Communicating bl sub_8018884 movs r0, 0x8 strb r0, [r5, 0x8] @@ -30593,7 +30593,7 @@ _08019506: _08019508: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF050 + ldr r3, =gText_ThrowAwayWonderCard adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -30616,7 +30616,7 @@ _08019534: _08019538: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF084 + ldr r3, =gText_HaventReceivedCardsGift adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -30660,7 +30660,7 @@ _0801957E: _0801958C: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EEFF8 + ldr r1, =gText_CommunicationCompleted bl sub_8018A1C cmp r0, 0 bne _0801959C @@ -30876,7 +30876,7 @@ _0801971A: _0801972E: adds r0, r5, 0 adds r0, 0x9 - ldr r3, =gUnknown_085EF584 + ldr r3, =gText_HaventReceivedGiftOkayToDiscard adds r1, r5, 0 movs r2, 0x1 bl sub_8018B08 @@ -31016,13 +31016,13 @@ _0801982C: ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801985C - ldr r0, =gUnknown_085EF360 + ldr r0, =gText_SendingWonderCard bl sub_8018884 bl mevent_srv_new_wcard b _08019866 .pool _0801985C: - ldr r0, =gUnknown_085EF37C + ldr r0, =gText_SendingWonderNews bl sub_8018884 bl mevent_srv_init_wnews _08019866: @@ -31084,7 +31084,7 @@ _080198DC: _080198EC: adds r0, r5, 0 adds r0, 0x9 - ldr r1, =gUnknown_085EF014 + ldr r1, =gText_CommunicationError bl mevent_0814257C _080198F6: cmp r0, 0 @@ -33685,7 +33685,7 @@ _0801AD8C: _0801ADFC: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFBD2 + ldr r1, =gText_CommStandbyAwaitingOtherPlayer movs r2, 0 bl sub_801ABDC cmp r0, 0 @@ -33832,7 +33832,7 @@ _0801AF40: _0801AF58: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFC27 + ldr r1, =gText_RefusedBattle movs r2, 0x1 bl sub_801ABDC cmp r0, 0 @@ -33858,7 +33858,7 @@ _0801AF8A: _0801AF98: ldr r0, =gUnknown_02022C6C ldr r0, [r0] - ldr r1, =gUnknown_085EFC0C + ldr r1, =gText_BattleWasRefused movs r2, 0x1 bl sub_801ABDC cmp r0, 0 @@ -41940,7 +41940,7 @@ _0801F020: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, =gUnknown_085ED2A9 + ldr r1, =gText_F700JoinedChat b _0801F094 .pool _0801F044: @@ -41980,7 +41980,7 @@ _0801F07A: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, =gUnknown_085ED2BD + ldr r1, =gText_F700LeftChat _0801F094: adds r0, r6, 0 bl sub_81AFC28 @@ -42190,52 +42190,52 @@ copy_strings_to_sav1: @ 801F1DC ldr r0, [r4] ldr r1, =0x00003c88 adds r0, r1 - ldr r1, =gUnknown_085ED40F + ldr r1, =gText_Hello bl StringCopy ldr r0, [r4] ldr r1, =0x00003c9d adds r0, r1 - ldr r1, =gUnknown_085ED415 + ldr r1, =gText_Pokemon2 bl StringCopy ldr r0, [r4] ldr r1, =0x00003cb2 adds r0, r1 - ldr r1, =gUnknown_085ED41D + ldr r1, =gText_Trade bl StringCopy ldr r0, [r4] ldr r1, =0x00003cc7 adds r0, r1 - ldr r1, =gUnknown_085ED423 + ldr r1, =gText_Battle bl StringCopy ldr r0, [r4] ldr r1, =0x00003cdc adds r0, r1 - ldr r1, =gUnknown_085ED42A + ldr r1, =gText_Lets bl StringCopy ldr r0, [r4] ldr r1, =0x00003cf1 adds r0, r1 - ldr r1, =gUnknown_085ED430 + ldr r1, =gText_Ok bl StringCopy ldr r0, [r4] ldr r1, =0x00003d06 adds r0, r1 - ldr r1, =gUnknown_085ED434 + ldr r1, =gText_Sorry bl StringCopy ldr r0, [r4] ldr r1, =0x00003d1b adds r0, r1 - ldr r1, =gUnknown_085ED43A + ldr r1, =gText_YayUnkF9F9 bl StringCopy ldr r0, [r4] ldr r1, =0x00003d30 adds r0, r1 - ldr r1, =gUnknown_085ED440 + ldr r1, =gText_ThankYou bl StringCopy ldr r0, [r4] ldr r1, =0x00003d45 adds r0, r1 - ldr r1, =gUnknown_085ED44A + ldr r1, =gText_ByeBye bl StringCopy pop {r4} pop {r0} @@ -43754,7 +43754,7 @@ sub_801FDDC: @ 801FDDC bl PutWindowTilemap ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes movs r1, 0x1 str r1, [sp] movs r4, 0xFF @@ -43764,7 +43764,7 @@ sub_801FDDC: @ 801FDDC bl PrintTextOnWindow ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] str r4, [sp, 0x4] @@ -47446,13 +47446,13 @@ _08021C5E: cmp r3, r2 bne _08021CC0 ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ED7D4 + ldr r1, =gText_1DotBlueF700 bl StringCopy b _08021CC8 .pool _08021CC0: ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ED7E0 + ldr r1, =gText_1DotF700 bl StringCopy _08021CC8: ldr r4, =gStringVar3 @@ -47541,13 +47541,13 @@ sub_8021D34: @ 8021D34 ldr r4, =gUnknown_082F32D8 str r4, [sp] str r6, [sp, 0x4] - ldr r1, =gUnknown_085ED808 + ldr r1, =gText_TimeColon str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED840 + ldr r4, =gText_SpaceSec movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47587,7 +47587,7 @@ sub_8021D34: @ 8021D34 movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r5, =gStringVar4 - ldr r1, =gUnknown_085ED838 + ldr r1, =gText_XDotY2 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x2 @@ -47609,7 +47609,7 @@ sub_8021D34: @ 8021D34 adds r2, r6, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED830 + ldr r4, =gText_SpaceMin movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47638,7 +47638,7 @@ sub_8021D34: @ 8021D34 movs r2, 0x2 movs r3, 0x1 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085ED82C + ldr r1, =gText_StrVar1 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x2 @@ -47669,13 +47669,13 @@ sub_8021D34: @ 8021D34 str r4, [sp] mov r1, r10 str r1, [sp, 0x4] - ldr r1, =gUnknown_085ED810 + ldr r1, =gText_PressingSpeed str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, =gUnknown_085ED850 + ldr r4, =gText_TimesPerSec movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -47745,7 +47745,7 @@ _08021F0A: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED848 + ldr r1, =gText_XDotY3 adds r0, r4, 0 bl StringExpandPlaceholders movs r2, 0x1 @@ -47808,7 +47808,7 @@ _08021FDE: str r2, [sp] movs r5, 0 str r5, [sp, 0x4] - ldr r1, =gUnknown_085ED820 + ldr r1, =gText_Silkiness str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 @@ -47821,7 +47821,7 @@ _08021FDE: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ED85C + ldr r1, =gText_Var1Percent adds r0, r4, 0 bl StringExpandPlaceholders movs r2, 0x1 @@ -47961,7 +47961,7 @@ _0802214E: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, =gUnknown_085ED860 + ldr r3, =gText_PressesRankings movs r1, 0x14 movs r2, 0x3 bl sub_80219C8 @@ -48012,7 +48012,7 @@ _080221C8: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, =gUnknown_085ED878 + ldr r3, =gText_CrushingResults movs r1, 0x16 movs r2, 0x3 bl sub_80219C8 @@ -48140,7 +48140,7 @@ _08022296: b _080224BA .pool _080222D0: - ldr r0, =gUnknown_085ED8D0 + ldr r0, =gText_BerryCrush2 mov r10, r0 movs r1, 0x1 negs r1, r1 @@ -48165,7 +48165,7 @@ _080222D0: adds r2, r7, 0 movs r3, 0x1 bl box_print - ldr r0, =gUnknown_085ED8DC + ldr r0, =gText_PressingSpeedRankings mov r10, r0 movs r0, 0x1 mov r1, r10 @@ -48195,7 +48195,7 @@ _08022336: movs r3, 0x1 bl ConvertIntToDecimalStringN ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ED8F4 + ldr r1, =gText_Var1Players bl StringExpandPlaceholders ldrb r0, [r6, 0x2] ldr r1, =gUnknown_082F32D8 @@ -48209,7 +48209,7 @@ _08022336: mov r3, r10 bl box_print movs r0, 0x1 - ldr r1, =gUnknown_085ED850 + ldr r1, =gText_TimesPerSec movs r2, 0x1 negs r2, r2 bl GetStringWidth @@ -48222,7 +48222,7 @@ _08022336: str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, =gUnknown_085ED850 + ldr r1, =gText_TimesPerSec str r1, [sp, 0x8] movs r1, 0x1 adds r2, r7, 0 @@ -48280,7 +48280,7 @@ _080223CA: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ED848 + ldr r1, =gText_XDotY3 bl StringExpandPlaceholders movs r0, 0x1 ldr r1, =gStringVar4 @@ -52907,7 +52907,7 @@ sub_802482C: @ 802482C adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r2, =gUnknown_085EDCDE + ldr r2, =gText_Powder movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -59274,7 +59274,7 @@ _08027AFE: ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_085EDCE5 + ldr r1, =gText_BerryPickingRecords movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -59414,7 +59414,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r4, =gUnknown_085EDCE5 + ldr r4, =gText_BerryPickingRecords ldr r0, [sp, 0x18] lsls r2, r0, 3 movs r0, 0x1 @@ -62799,7 +62799,7 @@ _08029728: bcc _08029700 _0802972E: movs r5, 0 - ldr r4, =gUnknown_085EDE5D + ldr r4, =gText_SpacePoints cmp r5, r7 bcs _08029754 add r1, sp, 0x34 @@ -62939,7 +62939,7 @@ _080297CC: movs r1, 0 str r1, [sp, 0x8] movs r1, 0x1 - ldr r2, =gUnknown_085EDE5D + ldr r2, =gText_SpacePoints lsrs r3, 24 bl PrintTextOnWindow adds r0, r5, 0x1 @@ -63057,7 +63057,7 @@ _0802996C: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EDD49 + ldr r2, =gText_BerryPickingResults mov r8, r2 movs r2, 0x1 negs r2, r2 @@ -63084,7 +63084,7 @@ _0802996C: ldr r0, [r4] add r0, r9 ldrb r0, [r0] - ldr r2, =gUnknown_085EDD6B + ldr r2, =gText_10P30P50P50P movs r1, 0x11 str r1, [sp] str r6, [sp, 0x4] @@ -63324,7 +63324,7 @@ _08029BFC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r6, =gUnknown_085EDD86 + ldr r6, =gText_AnnouncingRankings movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -63488,7 +63488,7 @@ _08029DA0: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EDD9B + ldr r5, =gText_AnnouncingPrizes movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -63525,7 +63525,7 @@ _08029DA0: adds r1, r5, 0 bl sub_81AFC0C ldr r7, =gStringVar4 - ldr r1, =gUnknown_085EDDBD + ldr r1, =gText_FirstPlacePrize adds r0, r7, 0 bl sub_81AFC28 ldr r0, [r4] @@ -63559,7 +63559,7 @@ _08029DA0: bl sub_81AFC0C cmp r4, 0x2 bne _08029E9C - ldr r1, =gUnknown_085EDDE2 + ldr r1, =gText_CantHoldAnyMore adds r0, r7, 0 bl sub_81AFC28 b _08029EA8 @@ -63567,7 +63567,7 @@ _08029DA0: _08029E9C: cmp r6, 0x1 bne _08029EA8 - ldr r1, =gUnknown_085EDDFB + ldr r1, =gText_FilledStorageSpace adds r0, r7, 0 bl sub_81AFC28 _08029EA8: @@ -63809,7 +63809,7 @@ _0802A0CC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE18 + ldr r2, =gText_WantToPlayAgain movs r1, 0x5 str r1, [sp] movs r3, 0xFF @@ -63823,7 +63823,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes str r6, [sp] mov r3, r9 str r3, [sp, 0x4] @@ -63835,7 +63835,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] mov r3, r9 @@ -63912,7 +63912,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE62 + ldr r2, =gText_Yes movs r1, 0x1 str r1, [sp] movs r3, 0xFF @@ -63927,7 +63927,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, =gUnknown_085EAE66 + ldr r2, =gText_No movs r1, 0x11 str r1, [sp] mov r3, r10 @@ -64234,7 +64234,7 @@ _0802A4AC: ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE65 + ldr r2, =gText_CommunicationStandby3 movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -64394,7 +64394,7 @@ _0802A610: ldr r0, [r6] adds r0, r4 ldrb r0, [r0] - ldr r2, =gUnknown_085EDE2C + ldr r2, =gText_SomeoneDroppedOut movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -70271,7 +70271,7 @@ _0802D46A: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF2A + ldr r2, =gText_WantToPlayAgain2 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70473,7 +70473,7 @@ _0802D606: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF3E + ldr r2, =gText_SomeoneDroppedOut2 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70553,7 +70553,7 @@ _0802D6AA: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_085EDF6F + ldr r2, =gText_CommunicationStandby4 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -70740,7 +70740,7 @@ sub_802D7E8: @ 802D7E8 bl sub_81AFC0C ldr r0, [r5] adds r0, 0xA6 - ldr r1, =gUnknown_085EDED3 + ldr r1, =gText_AwesomeWonF701F700 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -70793,7 +70793,7 @@ sub_802D884: @ 802D884 bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, =gUnknown_085EDEF4 + ldr r1, =gText_FilledStorageSpace2 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -70846,7 +70846,7 @@ sub_802D8FC: @ 802D8FC bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, =gUnknown_085EDF11 + ldr r1, =gText_CantHoldMore bl sub_81AFC28 movs r0, 0x4 movs r1, 0x9 @@ -71167,7 +71167,7 @@ sub_802DB8C: @ 802DB8C str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EDE7C + ldr r0, =gText_SpacePoints2 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -71177,7 +71177,7 @@ sub_802DB8C: @ 802DB8C add r0, sp, 0xC str r0, [sp] str r4, [sp, 0x4] - ldr r0, =gUnknown_085EDE84 + ldr r0, =gText_SpaceTimes3 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0 @@ -72272,7 +72272,7 @@ _0802E416: ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, =gUnknown_085EDE8D + ldr r1, =gText_PkmnJumpRecords movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -72407,7 +72407,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EDE8D + ldr r5, =gText_PkmnJumpRecords ldr r1, [sp, 0x1C] lsls r2, r1, 3 movs r0, 0x1 diff --git a/asm/mail.s b/asm/mail.s index 77cbc4e83..5f76a5ef0 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -691,7 +691,7 @@ _08121A8A: ldrb r0, [r0] cmp r0, 0 bne _08121AF0 - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace adds r0, r2, 0 bl StringCopy ldr r0, [r4] @@ -825,7 +825,7 @@ _08121BB8: cmp r6, r0 bcc _08121B60 _08121BCC: - ldr r1, =gUnknown_085EEA78 + ldr r1, =gText_FromSpace add r0, sp, 0xC bl StringCopy ldr r4, =gUnknown_0203A134 diff --git a/asm/main_menu.s b/asm/main_menu.s index ed04ba6f3..883bd0cb4 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -4547,7 +4547,7 @@ fmt_time: @ 8031E94 push {r4-r6,lr} sub sp, 0xC ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCC3 + ldr r1, =gText_ContinueMenuPlayer adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4589,7 +4589,7 @@ fmt_player: @ 8031EF8 push {r4-r6,lr} sub sp, 0x2C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCCA + ldr r1, =gText_ContinueMenuTime adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4664,7 +4664,7 @@ _08031FAA: lsls r0, 16 lsrs r7, r0, 16 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCCF + ldr r1, =gText_ContinueMenuPokedex adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 @@ -4728,7 +4728,7 @@ _08032030: cmp r4, r0 bls _0803201C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EDCD7 + ldr r1, =gText_ContinueMenuBadges adds r0, r4, 0 bl StringExpandPlaceholders ldr r6, =gUnknown_082FF0E3 diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 05d15601c..7b21e19e7 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -1400,7 +1400,7 @@ _08120BB0: movs r2, 0x8 bl memset mov r0, sp - ldr r1, =gUnknown_085EDFB0 + ldr r1, =gText_Friend bl StringCopy adds r0, r5, 0 mov r1, sp @@ -2218,7 +2218,7 @@ sub_8121178: @ 8121178 sub_81211EC: @ 81211EC push {r4,r5,lr} sub sp, 0xC - ldr r1, =gUnknown_085EB7EA + ldr r1, =gText_Exit movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -2309,7 +2309,7 @@ _08121272: _081212AA: ldr r5, =gUnknown_0203A130 ldrb r0, [r5] - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit lsls r1, r4, 4 adds r1, 0x1 lsls r1, 24 diff --git a/asm/menu.s b/asm/menu.s index 553161d40..8bb9dc436 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -1250,7 +1250,7 @@ RedrawMenuCursor: @ 8198448 bl FillWindowPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -2139,7 +2139,7 @@ sub_8198AF8: @ 8198AF8 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp, 0xC] add r1, sp, 0xC ldrb r0, [r7] @@ -2877,7 +2877,7 @@ sub_8199060: @ 8199060 lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, =gUnknown_085EE498 + ldr r2, =gText_SelectorArrow3 str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -3668,7 +3668,7 @@ CreateYesNoMenu: @ 81996C0 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, =gUnknown_085EE491 + ldr r0, =gText_YesNo str r0, [sp] mov r1, sp mov r2, r8 diff --git a/asm/money.s b/asm/money.s index 0d7cf569f..53e795714 100644 --- a/asm/money.s +++ b/asm/money.s @@ -105,7 +105,7 @@ _080E5258: cmp r0, 0 bgt _080E5258 _080E5264: - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r2, 0 bl StringExpandPlaceholders ldr r2, =gStringVar4 diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 27ab158ad..49de57848 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -115,7 +115,7 @@ sub_8178A40: @ 8178A40 movs r5, 0x1 cmp r4, 0 bne _08178A54 - ldr r1, =gUnknown_085EE80A + ldr r1, =gText_EventSafelyLoaded bl StringCopy movs r5, 0 _08178A54: @@ -125,7 +125,7 @@ _08178A54: _08178A5A: cmp r4, 0x1 bne _08178A66 - ldr r1, =gUnknown_085EE827 + ldr r1, =gText_LoadErrorEndingSession adds r0, r6, 0 bl StringCopy _08178A66: @@ -204,7 +204,7 @@ _08178B12: beq _08178B20 b _08178E58 _08178B20: - ldr r1, =gUnknown_085EE765 + ldr r1, =gText_LinkStandby2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -256,7 +256,7 @@ _08178B8E: _08178B98: movs r0, 0x15 bl PlaySE - ldr r1, =gUnknown_085EE788 + ldr r1, =gText_PressAToLoadEvent movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -301,7 +301,7 @@ _08178BDC: movs r2, 0x1 movs r3, 0xD bl SetWindowBorderStyle - ldr r1, =gUnknown_085EE7BF + ldr r1, =gText_LoadingEvent movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -373,7 +373,7 @@ _08178CAC: lsls r0, 24 cmp r0, 0 beq _08178CCC - ldr r1, =gUnknown_085EE7CE + ldr r1, =gText_DontRemoveCableTurnOff movs r0, 0x1 str r0, [sp] movs r0, 0 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index d481c2a3b..d544f689f 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -782,7 +782,7 @@ sub_8153E1C: @ 8153E1C adds r4, r0, 0 bl EnableResetRTC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085ECAD8 + ldr r1, =gText_InGameClockUsable bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 2d79e464a..b241d3009 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -4033,7 +4033,7 @@ sub_80E4EF0: @ 80E4EF0 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, =gUnknown_085EEAF6 + ldr r1, =gText_MoveOkBack str r1, [sp, 0x8] movs r1, 0 movs r2, 0x2 diff --git a/asm/option_menu.s b/asm/option_menu.s index 214e23094..1c554e26f 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -906,7 +906,7 @@ sub_80BAC38: @ 80BAC38 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, =gUnknown_085EE5D4 + ldr r4, =gText_TextSpeedSlow mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -917,14 +917,14 @@ sub_80BAC38: @ 80BAC38 movs r2, 0 bl GetStringWidth adds r4, r0, 0 - ldr r0, =gUnknown_085EE5DF + ldr r0, =gText_TextSpeedMid mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl GetStringWidth adds r5, r0, 0 - ldr r6, =gUnknown_085EE5E9 + ldr r6, =gText_TextSpeedFast movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -1000,13 +1000,13 @@ sub_80BAD08: @ 80BAD08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE5F4 + ldr r0, =gText_BattleSceneOn mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x10 bl sub_80BAB68 - ldr r4, =gUnknown_085EE5FD + ldr r4, =gText_BattleSceneOff movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1061,13 +1061,13 @@ sub_80BAD84: @ 80BAD84 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE607 + ldr r0, =gText_BattleStyleShift mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x20 bl sub_80BAB68 - ldr r4, =gUnknown_085EE613 + ldr r4, =gText_BattleStyleSet movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1125,13 +1125,13 @@ sub_80BAE08: @ 80BAE08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, =gUnknown_085EE61D + ldr r0, =gText_SoundMono mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x30 bl sub_80BAB68 - ldr r4, =gUnknown_085EE628 + ldr r4, =gText_SoundStereo movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -1243,9 +1243,9 @@ sub_80BAF0C: @ 80BAF0C adds r0, r1 lsrs r6, r0, 24 movs r5, 0 - ldr r1, =gUnknown_085EE640 + ldr r1, =gText_FrameTypeNumber ldrb r0, [r1] - ldr r7, =gUnknown_085EE635 + ldr r7, =gText_FrameType cmp r0, 0xFF beq _080BAF44 adds r2, r1, 0 @@ -1394,7 +1394,7 @@ sub_80BB028: @ 80BB028 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, =gUnknown_085EE647 + ldr r4, =gText_ButtonTypeNormal mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -1406,14 +1406,14 @@ sub_80BB028: @ 80BB028 movs r2, 0 bl GetStringWidth adds r4, r0, 0 - ldr r0, =gUnknown_085EE654 + ldr r0, =gText_ButtonTypeLR mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl GetStringWidth adds r5, r0, 0 - ldr r6, =gUnknown_085EE65D + ldr r6, =gText_ButtonTypeLEqualsA movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -1461,7 +1461,7 @@ sub_80BB0D0: @ 80BB0D0 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EE589 + ldr r2, =gText_Option movs r0, 0x1 str r0, [sp] movs r0, 0xFF diff --git a/asm/party_menu.s b/asm/party_menu.s index bb4ad4e31..3621dd0ee 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -2484,7 +2484,7 @@ sub_81B1660: @ 81B1660 ands r1, r0 cmp r1, 0x2 bne _081B1680 - ldr r5, =gUnknown_085EA110 + ldr r5, =gText_CancelParticipation b _081B168A .pool _081B1680: @@ -3290,7 +3290,7 @@ sub_81B1C84: @ 81B1C84 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E991B + ldr r1, =gText_PkmnWasGivenItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3319,7 +3319,7 @@ sub_81B1CD0: @ 81B1CD0 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E999D + ldr r1, =gText_RecievedItemFromPkmn adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3348,7 +3348,7 @@ sub_81B1D1C: @ 81B1D1C adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E993A + ldr r1, =gText_SwitchPkmnItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3379,7 +3379,7 @@ sub_81B1D68: @ 81B1D68 adds r0, r4, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E99DB + ldr r1, =gText_SwitchedPkmnItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -3474,7 +3474,7 @@ _081B1E3E: pokemon_item_not_removed: @ 81B1E48 push {lr} ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9A69 + ldr r1, =gText_BagFullCouldNotRemoveItem bl StringExpandPlaceholders pop {r0} bx r0 @@ -3937,7 +3937,7 @@ sub_81B21AC: @ 81B21AC _081B21DC: movs r0, 0x20 bl PlaySE - ldr r0, =gUnknown_085EA0EE + ldr r0, =gText_PkmnCantParticipate movs r1, 0 bl sub_81B1B5C movs r0, 0x2 @@ -3962,7 +3962,7 @@ sub_81B2210: @ 81B2210 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085EA110 + ldr r0, =gText_CancelParticipation movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -6407,7 +6407,7 @@ _081B3674: cmp r6, 0 bne _081B36C0 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8348,7 +8348,7 @@ _081B4788: adds r0, r5, 0 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8409,7 +8409,7 @@ sub_81B47E0: @ 81B47E0 adds r0, r7, 0 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9980 + ldr r1, =gText_PkmnNotHolding adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8428,7 +8428,7 @@ _081B4864: adds r0, r5, 0 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9E00 + ldr r1, =gText_ThrowAwayItem adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8511,7 +8511,7 @@ _081B491A: ldr r1, =gStringVar1 bl CopyItemName ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9E14 + ldr r1, =gText_ItemThrownAway adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -8731,7 +8731,7 @@ brm_take_2: @ 81B4B20 ldr r0, [r5] adds r0, 0xC bl sub_81B302C - ldr r0, =gUnknown_085E9855 + ldr r0, =gText_SendMailToPC movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -8806,7 +8806,7 @@ _081B4BC6: lsrs r0, 24 cmp r0, 0xFF beq _081B4C0C - ldr r0, =gUnknown_085E9877 + ldr r0, =gText_MailSentToPC movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -8818,7 +8818,7 @@ _081B4BC6: b _081B4C4A .pool _081B4C0C: - ldr r0, =gUnknown_085E9897 + ldr r0, =gText_PCMailboxFull movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -8833,7 +8833,7 @@ _081B4C30: movs r0, 0x5 bl PlaySE _081B4C36: - ldr r0, =gUnknown_085E98B4 + ldr r0, =gText_MailMessageWillBeLost movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -8926,7 +8926,7 @@ _081B4CBE: muls r0, r7 adds r0, r6 bl sub_80D4680 - ldr r0, =gUnknown_085E99B8 + ldr r0, =gText_MailTakenFromPkmn movs r1, 0 bl sub_81B1B5C ldr r1, =gTasks @@ -9167,7 +9167,7 @@ _081B4F36: movs r3, 0x1 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9830 + ldr r1, =gText_NoMoreThanVar1Pkmn adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x20 @@ -9411,13 +9411,13 @@ sub_81B50C8: @ 81B50C8 .pool _081B515C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA210 + ldr r1, =gText_PkmnCantBeTradedNow bl StringExpandPlaceholders b _081B5178 .pool _081B5170: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA234 + ldr r1, =gText_EggCantBeTradedNow bl StringExpandPlaceholders _081B5178: movs r0, 0x20 @@ -9430,7 +9430,7 @@ _081B5178: adds r0, 0xD bl sub_81B302C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r4, 0 bl StringAppend adds r0, r4, 0 @@ -9530,7 +9530,7 @@ brm_trade_1: @ 81B51D4 ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r5, 0 bl StringAppend adds r0, r5, 0 @@ -9594,19 +9594,19 @@ _081B5328: b _081B5368 _081B532E: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA1E8 + ldr r1, =gText_OnlyPkmnForBattle bl StringExpandPlaceholders b _081B53C0 .pool _081B5340: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA210 + ldr r1, =gText_PkmnCantBeTradedNow bl StringExpandPlaceholders b _081B53C0 .pool _081B5354: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA234 + ldr r1, =gText_EggCantBeTradedNow bl StringExpandPlaceholders b _081B53C0 .pool @@ -9623,7 +9623,7 @@ _081B5368: ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CD + ldr r1, =gJPText_PutVar1IntoSpinner adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -9641,7 +9641,7 @@ _081B53C0: movs r0, 0x20 bl PlaySE ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA1CA + ldr r1, =gText_PauseUntilPress adds r0, r4, 0 bl StringAppend adds r0, r4, 0 @@ -9787,7 +9787,7 @@ _081B54E8: lsrs r0, 24 cmp r0, 0x1 beq _081B5524 - ldr r0, =gUnknown_085E97FC + ldr r0, =gText_CantUseUntilNewBadge movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -9852,7 +9852,7 @@ _081B557C: ldrb r1, [r1, 0x14] bl sub_81245DC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA196 + ldr r1, =gText_ReturnToHealingSpot b _081B55E8 .pool _081B55B8: @@ -9877,7 +9877,7 @@ _081B55B8: ldrb r1, [r1, 0x14] bl sub_81245DC ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA16B + ldr r1, =gText_EscapeFromHere _081B55E8: bl StringExpandPlaceholders adds r0, r6, 0 @@ -11562,102 +11562,102 @@ _081B6334: .4byte _081B64A8 _081B6380: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C3E + ldr r1, =gText_PkmnCuredOfPoison bl StringExpandPlaceholders b _081B64C4 .pool _081B6394: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C7C + ldr r1, =gText_PkmnWokeUp2 bl StringExpandPlaceholders b _081B64C4 .pool _081B63A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C8A + ldr r1, =gText_PkmnBurnHealed bl StringExpandPlaceholders b _081B64C4 .pool _081B63BC: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CA2 + ldr r1, =gText_PkmnThawedOut bl StringExpandPlaceholders b _081B64C4 .pool _081B63D0: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9C5F + ldr r1, =gText_PkmnCuredOfParalysis bl StringExpandPlaceholders b _081B64C4 .pool _081B63E4: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9DBE + ldr r1, =gText_PkmnSnappedOutOfConfusion bl StringExpandPlaceholders b _081B64C4 .pool _081B63F8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9DE1 + ldr r1, =gText_PkmnGotOverInfatuation bl StringExpandPlaceholders b _081B64C4 .pool _081B640C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CE0 + ldr r1, =gText_PkmnBecameHealthy bl StringExpandPlaceholders b _081B64C4 .pool _081B6420: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96E3 + ldr r1, =gText_HP3 b _081B6474 .pool _081B6430: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA33C + ldr r1, =gText_Attack3 b _081B6474 .pool _081B6440: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA343 + ldr r1, =gText_Defense3 b _081B6474 .pool _081B6450: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EA35B + ldr r1, =gText_Speed2 b _081B6474 .pool _081B6460: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96E6 + ldr r1, =gText_SpAtk3 b _081B6474 .pool _081B6470: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085E96EE + ldr r1, =gText_SpDef3 _081B6474: bl StringCopy ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D25 + ldr r1, =gText_PkmnBaseVar2StatIncreased bl StringExpandPlaceholders b _081B64C4 .pool _081B6494: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CF5 + ldr r1, =gText_MovesPPIncreased bl StringExpandPlaceholders b _081B64C4 .pool _081B64A8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9CB7 + ldr r1, =gText_PPWasRestored bl StringExpandPlaceholders b _081B64C4 .pool _081B64BC: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E96F6 + ldr r1, =gText_WontHaveEffect bl StringExpandPlaceholders _081B64C4: pop {r0} @@ -11830,7 +11830,7 @@ _081B6600: strb r0, [r1] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B66F4 .pool _081B6624: @@ -11964,7 +11964,7 @@ sub_81B672C: @ 81B672C ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -12083,7 +12083,7 @@ _081B6850: strb r0, [r1] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B68E2 .pool _081B6874: @@ -12108,19 +12108,19 @@ _081B6874: cmp r0, r8 beq _081B68C4 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D45 + ldr r1, =gText_PkmnFriendlyBaseVar2Fell bl StringExpandPlaceholders b _081B68E0 .pool _081B68C4: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D90 + ldr r1, =gText_PkmnFriendlyBaseVar2CantFall bl StringExpandPlaceholders b _081B68E0 .pool _081B68D8: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9D6D + ldr r1, =gText_PkmnAdoresBaseVar2Fell bl StringExpandPlaceholders _081B68E0: ldr r0, =gStringVar4 @@ -12239,30 +12239,30 @@ _081B69B8: .4byte _081B69E8 .4byte _081B69E0 _081B69D0: - ldr r1, =gUnknown_085E96E3 + ldr r1, =gText_HP3 b _081B69F2 .pool _081B69D8: - ldr r1, =gUnknown_085EA33C + ldr r1, =gText_Attack3 b _081B69F2 .pool _081B69E0: - ldr r1, =gUnknown_085EA343 + ldr r1, =gText_Defense3 b _081B69F2 .pool _081B69E8: - ldr r1, =gUnknown_085EA35B + ldr r1, =gText_Speed2 b _081B69F2 .pool _081B69F0: - ldr r1, =gUnknown_085E96E6 + ldr r1, =gText_SpAtk3 _081B69F2: adds r0, r2, 0 bl StringCopy b _081B6A08 .pool _081B6A00: - ldr r1, =gUnknown_085E96EE + ldr r1, =gText_SpDef3 adds r0, r2, 0 bl StringCopy _081B6A08: @@ -12517,7 +12517,7 @@ ether_effect_related: @ 81B6BEC strb r4, [r0] movs r0, 0x5 bl PlaySE - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect b _081B6C7E .pool _081B6C34: @@ -12775,18 +12775,18 @@ sub_81B6DC4: @ 81B6DC4 b _081B6E9C .pool _081B6E70: - ldr r1, =gUnknown_085E9AB4 + ldr r1, =gText_PkmnCantLearnMove b _081B6E7A .pool _081B6E78: - ldr r1, =gUnknown_085E9C00 + ldr r1, =gText_PkmnAlreadyKnows _081B6E7A: adds r0, r6, 0 bl sub_81B6D98 b _081B6E9C .pool _081B6E88: - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -12847,7 +12847,7 @@ _081B6EF0: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AA5 + ldr r1, =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -12987,7 +12987,7 @@ _081B7048: beq _081B707A b _081B7080 _081B704E: - ldr r0, =gUnknown_085E9B96 + ldr r0, =gText_WhichMoveToForget movs r1, 0x1 bl sub_81B1B5C ldr r1, =gTasks @@ -13142,7 +13142,7 @@ sub_81B7154: @ 81B7154 ldr r2, =gMoveNames adds r1, r2 bl StringCopy - ldr r0, =gUnknown_085E9BB8 + ldr r0, =gText_12PoofForgotMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -13214,7 +13214,7 @@ sub_81B7230: @ 81B7230 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9B5D + ldr r1, =gText_StopLearningMove2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13302,7 +13302,7 @@ _081B7306: adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9B76 + ldr r1, =gText_MoveNotLearned adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13352,7 +13352,7 @@ _081B7392: ldr r2, =gMoveNames adds r1, r2 bl StringCopy - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -13444,7 +13444,7 @@ _081B747A: ldr r1, =gUnknown_0203CEE8 movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -13484,7 +13484,7 @@ _081B74B4: movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9D0A + ldr r1, =gText_PkmnElevatedToLvVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13915,7 +13915,7 @@ sub_81B787C: @ 81B787C adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AE9 + ldr r1, =gText_PkmnNeedsToReplaceMove adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -13969,7 +13969,7 @@ sub_81B7910: @ 81B7910 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9AA5 + ldr r1, =gText_PkmnLearnedMove3 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -14225,7 +14225,7 @@ _081B7B82: bne _081B7BC8 ldr r0, =gUnknown_0203CEE8 strb r1, [r0] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -14278,7 +14278,7 @@ sub_81B7C10: @ 81B7C10 ldr r1, =gStringVar1 bl GetMonNickname ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E9C17 + ldr r1, =gText_PkmnHPRestoredByVar2 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -14322,7 +14322,7 @@ sub_81B7C74: @ 81B7C74 ldr r1, =gUnknown_0203CEE8 movs r0, 0 strb r0, [r1] - ldr r0, =gUnknown_085E96F6 + ldr r0, =gText_WontHaveEffect movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -14613,18 +14613,18 @@ sub_81B7E4C: @ 81B7E4C b _081B7F1C .pool _081B7EF0: - ldr r1, =gUnknown_085E9AB4 + ldr r1, =gText_PkmnCantLearnMove b _081B7EFA .pool _081B7EF8: - ldr r1, =gUnknown_085E9C00 + ldr r1, =gText_PkmnAlreadyKnows _081B7EFA: adds r0, r6, 0 bl sub_81B6D98 b _081B7F1C .pool _081B7F08: - ldr r0, =gUnknown_085E9AE9 + ldr r0, =gText_PkmnNeedsToReplaceMove bl sub_81B6D74 ldr r1, =gTasks lsls r0, r6, 2 @@ -15152,7 +15152,7 @@ sub_81B83B8: @ 81B83B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085E98EC + ldr r0, =gText_RemoveMailBeforeItem movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -15273,7 +15273,7 @@ sub_81B8474: @ 81B8474 bl GetMonData cmp r0, 0 beq _081B84DC - ldr r0, =gUnknown_085E9A08 + ldr r0, =gText_PkmnHoldingItemCantHoldMail movs r1, 0x1 bl sub_81B1B5C b _081B84F2 @@ -15284,7 +15284,7 @@ _081B84DC: bl sub_80D460C adds r0, r4, 0 bl sub_80D439C - ldr r0, =gUnknown_085E9A40 + ldr r0, =gText_MailTransferredFromMailbox movs r1, 0x1 bl sub_81B1B5C _081B84F2: @@ -15785,7 +15785,7 @@ sub_81B88BC: @ 81B88BC lsrs r0, 24 cmp r0, 0x1 bhi _081B88E0 - ldr r0, =gUnknown_085EA126 + ldr r0, =gText_CancelBattle b _081B88FA .pool _081B88E0: @@ -15795,11 +15795,11 @@ _081B88E0: ldrh r0, [r0] cmp r0, 0x2 bne _081B88F8 - ldr r0, =gUnknown_085EA139 + ldr r0, =gText_ReturnToWaitingRoom b _081B88FA .pool _081B88F8: - ldr r0, =gUnknown_085EA155 + ldr r0, =gText_CancelChallenge _081B88FA: pop {r1} bx r1 @@ -16015,7 +16015,7 @@ _081B8AA2: adds r0, r4, 0 bl StringCopy ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E97B2 + ldr r1, =gText_CantSwitchWithAlly b _081B8C42 .pool _081B8AC4: @@ -16033,7 +16033,7 @@ _081B8AC4: adds r0, r4, 0 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E978F + ldr r1, =gText_PkmnHasNoEnergy b _081B8C42 .pool _081B8AF8: @@ -16076,7 +16076,7 @@ _081B8B24: cmp r0, 0 beq _081B8B60 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E97E5 + ldr r1, =gText_EggCantBattle b _081B8C42 .pool _081B8B60: @@ -16094,7 +16094,7 @@ _081B8B60: adds r0, r6, 0 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E976F + ldr r1, =gText_PkmnAlreadySelected b _081B8C42 .pool _081B8B94: @@ -16144,7 +16144,7 @@ _081B8BFC: ldr r1, =gStringVar1 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9754 + ldr r1, =gText_PkmnAlreadyInBattle b _081B8C42 .pool _081B8C20: @@ -16162,7 +16162,7 @@ _081B8C20: ldr r1, =gStringVar1 bl GetMonNickname ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9738 + ldr r1, =gText_PkmnCantSwitchOut _081B8C42: bl StringExpandPlaceholders _081B8C46: diff --git a/asm/player_pc.s b/asm/player_pc.s index 7f4ab354c..8d74f118c 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -309,7 +309,7 @@ sub_816B0A8: @ 816B0A8 lsls r0, 24 cmp r0, 0 bne _0816B0D8 - ldr r1, =gUnknown_085EAC4B + ldr r1, =gText_NoMailHere ldr r2, =sub_816B060 adds r0, r4, 0 bl DisplayItemMessageOnField @@ -344,7 +344,7 @@ _0816B0D8: b _0816B12A .pool _0816B120: - ldr r1, =gUnknown_085EAC4B + ldr r1, =gText_NoMailHere ldr r2, =sub_816B060 adds r0, r6, 0 bl DisplayItemMessageOnField @@ -661,7 +661,7 @@ sub_816B398: @ 816B398 _0816B3C4: adds r0, r5, 0 bl sub_816B4DC - ldr r1, =gUnknown_085EABD1 + ldr r1, =gText_NoItems ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField @@ -696,7 +696,7 @@ sub_816B3E4: @ 816B3E4 _0816B410: adds r0, r5, 0 bl sub_816B4DC - ldr r1, =gUnknown_085EABD1 + ldr r1, =gText_NoItems ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField @@ -950,7 +950,7 @@ sub_816B5F8: @ 816B5F8 lsrs r4, 24 movs r0, 0x1 bl sub_81D1C84 - ldr r6, =gUnknown_085EAB4E + ldr r6, =gText_Mailbox movs r0, 0x1 adds r1, r6, 0 movs r2, 0x40 @@ -1098,7 +1098,7 @@ sub_816B730: @ 816B730 movs r1, 0 bl sub_81DB554 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085EAC63 + ldr r1, =gText_WhatToDoWithVar1sMail adds r0, r5, 0 bl StringExpandPlaceholders ldr r2, =sub_816B7DC @@ -1345,7 +1345,7 @@ sub_816B994: @ 816B994 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_085EAC8D + ldr r1, =gText_MessageWillBeLost ldr r2, =sub_816B9B0 bl DisplayItemMessageOnField pop {r0} @@ -1432,14 +1432,14 @@ sub_816BA18: @ 816BA18 lsls r0, 24 cmp r0, 0 bne _0816BA68 - ldr r1, =gUnknown_085EACB5 + ldr r1, =gText_BagIsFull ldr r2, =sub_816BBD4 adds r0, r6, 0 bl DisplayItemMessageOnField b _0816BA9C .pool _0816BA68: - ldr r1, =gUnknown_085EACC8 + ldr r1, =gText_MailToBagMessageErased ldr r2, =sub_816BBD4 adds r0, r6, 0 bl DisplayItemMessageOnField @@ -2293,10 +2293,10 @@ _0816C16C: bls _0816C16C movs r1, 0x6 ldrsh r0, [r7, r1] - ldr r5, =gUnknown_085EAB71 + ldr r5, =gText_TossItem cmp r0, 0 bne _0816C186 - ldr r5, =gUnknown_085EAB63 + ldr r5, =gText_WithdrawItem _0816C186: movs r0, 0x1 adds r1, r5, 0 @@ -2383,11 +2383,11 @@ _0816C26C: b _0816C2BA .pool _0816C274: - ldr r0, =gUnknown_085EAC09 + ldr r0, =gText_WithdrawHowManyItems b _0816C2BA .pool _0816C27C: - ldr r0, =gUnknown_085EAC22 + ldr r0, =gText_WithdrawXItems b _0816C2BA .pool _0816C284: @@ -2399,7 +2399,7 @@ _0816C28C: b _0816C2BA .pool _0816C294: - ldr r0, =gUnknown_085EABE7 + ldr r0, =gText_NoRoomInBag b _0816C2BA .pool _0816C29C: diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s index bd348ec34..d82c5df07 100644 --- a/asm/pokeblock_feed.s +++ b/asm/pokeblock_feed.s @@ -718,7 +718,7 @@ sub_817A1C4: @ 817A1C4 cmp r0, 0 bne _0817A248 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E937F + ldr r1, =gText_Var1AteTheVar2 bl StringExpandPlaceholders b _0817A268 .pool @@ -726,13 +726,13 @@ _0817A248: cmp r0, 0 ble _0817A260 ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9390 + ldr r1, =gText_Var1HappilyAteVar2 bl StringExpandPlaceholders b _0817A268 .pool _0817A260: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E93A9 + ldr r1, =gText_Var1DisdainfullyAteVar2 bl StringExpandPlaceholders _0817A268: ldr r2, =gTextFlags diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index df90540e8..83332e538 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -586,7 +586,7 @@ _080C73F6: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBCAD + ldr r2, =gText_PartyFull str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -609,7 +609,7 @@ _080C7428: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r2, =gUnknown_085EBC89 + ldr r2, =gText_JustOnePkmn movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -1020,7 +1020,7 @@ _080C779E: lsls r0, r5, 24 lsrs r0, 24 bl sav3_get_box_name - ldr r1, =gUnknown_085EBCC1 + ldr r1, =gText_Box bl StringCopy adds r4, r5, 0x1 adds r1, r4, 0 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 3fb412477..2ad67ba5a 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5413,7 +5413,7 @@ _081C284A: sub_81C286C: @ 81C286C push {r4-r7,lr} sub sp, 0x8 - ldr r1, =gUnknown_085EA3CF + ldr r1, =gText_PkmnInfo movs r5, 0 str r5, [sp] movs r6, 0x1 @@ -5422,21 +5422,21 @@ sub_81C286C: @ 81C286C movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3DC + ldr r1, =gText_PkmnSkills str r5, [sp] str r6, [sp, 0x4] movs r0, 0x1 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3EB + ldr r1, =gText_BattleMoves str r5, [sp] str r6, [sp, 0x4] movs r0, 0x2 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3F8 + ldr r1, =gText_ContestMoves str r5, [sp] str r6, [sp, 0x4] movs r0, 0x3 @@ -5466,7 +5466,7 @@ _081C28CC: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, =gUnknown_085EA406 + ldr r7, =gText_Info movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -5489,7 +5489,7 @@ _081C28FE: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, =gUnknown_085EA3C8 + ldr r7, =gText_Switch movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -5512,21 +5512,21 @@ _081C2930: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA369 + ldr r1, =gText_RentalPkmn str r5, [sp] str r6, [sp, 0x4] movs r0, 0x8 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA378 + ldr r1, =gText_TypeSlash str r5, [sp] str r5, [sp, 0x4] movs r0, 0x9 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA361 + ldr r4, =gText_HP4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5540,7 +5540,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA33C + ldr r4, =gText_Attack3 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5554,7 +5554,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, =gUnknown_085EA343 + ldr r4, =gText_Defense3 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -5568,7 +5568,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r4, =gUnknown_085EA34B + ldr r4, =gText_SpAtk4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5582,7 +5582,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, =gUnknown_085EA353 + ldr r4, =gText_SpDef4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5596,7 +5596,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, =gUnknown_085EA35B + ldr r4, =gText_Speed2 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -5610,49 +5610,49 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r1, =gUnknown_085EA39F + ldr r1, =gText_ExpPoints str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA3AB + ldr r1, =gText_NextLv str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x11 bl sub_81C25A4 - ldr r1, =gUnknown_085EA398 + ldr r1, =gText_Status str r5, [sp] str r6, [sp, 0x4] movs r0, 0xD movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA37E + ldr r1, =gText_Power str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA384 + ldr r1, =gText_Accuracy2 str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r1, =gUnknown_085EA38D + ldr r1, =gText_Appeal str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, =gUnknown_085EA394 + ldr r1, =gText_Jam str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF @@ -6126,7 +6126,7 @@ sub_81C2EC4: @ 81C2EC4 bl sub_81C2D2C lsls r0, 24 lsrs r5, r0, 24 - ldr r4, =gUnknown_085EA365 + ldr r4, =gText_OTSlash movs r6, 0 str r6, [sp] movs r0, 0x1 @@ -6335,7 +6335,7 @@ sub_81C307C: @ 81C307C bne _081C30E0 _081C30C2: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085EA5DB + ldr r1, =gText_XNature bl sub_81AFC28 b _081C3182 .pool @@ -6367,25 +6367,25 @@ _081C310C: cmp r0, 0 bne _081C3134 ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA516 + ldr r1, =gText_XNatureHatchedAtYZ cmp r0, 0xD4 bls _081C3170 - ldr r1, =gUnknown_085EA617 + ldr r1, =gText_XNatureHatchedSomewhereAt b _081C3170 .pool _081C3134: ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA4EC + ldr r1, =gText_XNatureMetAtYZ cmp r0, 0xD4 bls _081C3170 - ldr r1, =gUnknown_085EA5EB + ldr r1, =gText_XNatureMetSomewhereAt b _081C3170 .pool _081C3148: ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C3158 - ldr r1, =gUnknown_085EA56A + ldr r1, =gText_XNatureFatefulEncounter b _081C3170 .pool _081C3158: @@ -6396,11 +6396,11 @@ _081C3158: cmp r0, 0 beq _081C316E ldrb r0, [r4, 0x9] - ldr r1, =gUnknown_085EA5A8 + ldr r1, =gText_XNatureProbablyMetAt cmp r0, 0xD4 bls _081C3170 _081C316E: - ldr r1, =gUnknown_085EA544 + ldr r1, =gText_XNatureObtainedInTrade _081C3170: ldr r0, =gStringVar4 bl sub_81AFC28 @@ -6449,7 +6449,7 @@ sub_81C31C0: @ 81C31C0 ldr r1, [r0] movs r0, 0x2 bl sub_81AFC0C - ldr r1, =gUnknown_085EA3C0 + ldr r1, =gText_EmptyString5 movs r0, 0x5 bl sub_81AFC0C pop {r0} @@ -6649,7 +6649,7 @@ sub_81C335C: @ 81C335C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_085EA365 + ldr r0, =gText_OTSlash mov r8, r0 movs r0, 0x1 mov r1, r8 @@ -6736,27 +6736,27 @@ sub_81C3428: @ 81C3428 ldrb r0, [r0] cmp r0, 0x1 bne _081C3448 - ldr r4, =gUnknown_085EA40B + ldr r4, =gText_EggWillTakeALongTime b _081C346C .pool _081C3448: ldrh r0, [r1, 0x30] cmp r0, 0x5 bhi _081C3458 - ldr r4, =gUnknown_085EA4A2 + ldr r4, =gText_EggAboutToHatch b _081C346C .pool _081C3458: cmp r0, 0xA bhi _081C3464 - ldr r4, =gUnknown_085EA475 + ldr r4, =gText_EggWillHatchSoon b _081C346C .pool _081C3464: - ldr r4, =gUnknown_085EA40B + ldr r4, =gText_EggWillTakeALongTime cmp r0, 0x28 bhi _081C346C - ldr r4, =gUnknown_085EA442 + ldr r4, =gText_EggWillTakeSomeTime _081C346C: ldr r0, =gUnknown_0861CCCC movs r1, 0x2 @@ -6792,7 +6792,7 @@ sub_81C349C: @ 81C349C ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C34C4 - ldr r4, =gUnknown_085EA678 + ldr r4, =gText_PeculiarEggNicePlace b _081C3502 .pool _081C34C4: @@ -6805,7 +6805,7 @@ _081C34C4: cmp r0, 0 bne _081C34E0 _081C34D8: - ldr r4, =gUnknown_085EA6AB + ldr r4, =gText_PeculiarEggTrade b _081C3502 .pool _081C34E0: @@ -6815,14 +6815,14 @@ _081C34E0: bl sub_81C32E0 lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_085EA702 + ldr r4, =gText_EggFromTraveler cmp r0, 0x1 bne _081C3502 - ldr r4, =gUnknown_085EA6D7 + ldr r4, =gText_EggFromHotSprings b _081C3502 .pool _081C3500: - ldr r4, =gUnknown_085EA647 + ldr r4, =gText_OddEggFoundByCouple _081C3502: ldr r0, =gUnknown_0861CCCC movs r1, 0x3 @@ -7021,7 +7021,7 @@ _081C36B0: movs r3, 0x2 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA3B4 + ldr r1, =gText_RibbonsVar1 adds r0, r4, 0 bl StringExpandPlaceholders adds r5, r4, 0 @@ -8201,7 +8201,7 @@ sub_81C4154: @ 81C4154 adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r1, =gUnknown_085EA4CB + ldr r1, =gText_HMMovesCantBeForgotten2 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -10430,7 +10430,7 @@ sub_81C540C: @ 81C540C ldr r1, =gStringVar2 adds r0, r4, 0 bl CopyItemName - ldr r1, =gUnknown_085E9210 + ldr r1, =gText_UnkF908Var1Clear7Var2 adds r0, r5, 0 bl StringExpandPlaceholders b _081C5458 @@ -10635,7 +10635,7 @@ sub_81C55D8: @ 81C55D8 .pool _081C561C: ldr r0, =gStringVar1 - ldr r2, =gUnknown_085E91B0 + ldr r2, =gReturnToXStringsTable2 ldr r1, =gUnknown_0203CF30 ldrb r1, [r1, 0x4] lsls r1, 2 diff --git a/asm/pokenav.s b/asm/pokenav.s index eee6e2f6a..6ae25b362 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -6860,7 +6860,7 @@ sub_81CA770: @ 81CA770 movs r0, 0x2 bl sub_81C763C adds r5, r0, 0 - ldr r6, =gUnknown_085EBD4A + ldr r6, =gText_NoRibbonWinners movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -7928,7 +7928,7 @@ sub_81CAF78: @ 81CAF78 lsls r0, 24 cmp r0, 0 bne _081CAFA4 - ldr r0, =gUnknown_085EEB0B + ldr r0, =gText_CallCantBeMadeHere b _081CAFCE .pool _081CAFA4: @@ -9748,7 +9748,7 @@ sub_81CBDF4: @ 81CBDF4 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_085EBE5F + ldr r1, =gText_NumberRegistered movs r2, 0 bl sub_81CBE88 pop {r0} @@ -9784,7 +9784,7 @@ sub_81CBE38: @ 81CBE38 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, =gUnknown_085EBE6E + ldr r1, =gText_NumberOfBattles movs r2, 0x2 bl sub_81CBE88 pop {r0} @@ -9900,7 +9900,7 @@ sub_81CBEF8: @ 81CBEF8 bl GetMapName b _081CBF24 _081CBF1C: - ldr r1, =gUnknown_085EC00F + ldr r1, =gText_Unknown add r0, sp, 0xC bl StringCopy _081CBF24: @@ -10168,7 +10168,7 @@ sub_81CC11C: @ 81CC11C push {lr} sub sp, 0xC ldrb r0, [r0, 0x14] - ldr r2, =gUnknown_085EBF95 + ldr r2, =gText_TrainerCloseBy movs r1, 0x1 str r1, [sp] str r1, [sp, 0x4] @@ -13128,7 +13128,7 @@ _081CD862: adds r0, r4, r5 ldr r1, =0x00006325 adds r0, r1 - ldr r1, =gUnknown_085EBFCE + ldr r1, =gText_InParty b _081CD8F4 .pool _081CD8E4: @@ -14829,7 +14829,7 @@ sub_81CE738: @ 81CE738 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EBFD7 + ldr r1, =gText_Number2 bl StringCopy pop {r1} bx r1 @@ -14957,7 +14957,7 @@ _081CE80C: strb r0, [r1, 0x4] mov r5, sp adds r5, 0x11 - ldr r1, =gUnknown_085EBFD7 + ldr r1, =gText_Number2 adds r0, r5, 0 bl StringCopy ldr r0, =0x00001821 @@ -16949,7 +16949,7 @@ sub_81CF7F4: @ 81CF7F4 movs r0, 0xFF strb r0, [r4] ldr r5, =gStringVar2 - ldr r1, =gUnknown_085EC029 + ldr r1, =gText_NumberF700 adds r0, r5, 0 bl sub_81AFC28 mov r1, r8 @@ -19859,7 +19859,7 @@ sub_81D0E84: @ 81D0E84 adds r1, r4, 0 bl sub_81AFC0C ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EC030 + ldr r1, =gText_RibbonsF700 adds r0, r4, 0 bl sub_81AFC28 ldrb r0, [r5, 0xA] @@ -23412,7 +23412,7 @@ sub_81D28FC: @ 81D28FC movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EFA31 + ldr r5, =gText_BattleMoves2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -23431,7 +23431,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA52 + ldr r5, =gText_PPSlash movs r1, 0x29 mov r10, r1 str r1, [sp] @@ -23443,7 +23443,7 @@ sub_81D28FC: @ 81D28FC adds r2, r5, 0 movs r3, 0x4 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA56 + ldr r5, =gText_PowerSlash movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -23460,7 +23460,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA5D + ldr r5, =gText_AccuracySlash movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -23508,7 +23508,7 @@ _081D29C4: adds r2, r5, 0 movs r3, 0x4 bl PrintTextOnWindow - ldr r1, =gUnknown_085EFA52 + ldr r1, =gText_PPSlash movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -23616,7 +23616,7 @@ sub_81D2ACC: @ 81D2ACC movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EFA3E + ldr r5, =gText_ContestMoves2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -23632,7 +23632,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA67 + ldr r5, =gText_Appeal2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -23648,7 +23648,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl PrintTextOnWindow - ldr r5, =gUnknown_085EFA6E + ldr r5, =gText_Jam2 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -24157,7 +24157,7 @@ _081D2EFC: cmp r7, 0xE bne _081D2F2C adds r0, r5, 0x5 - ldr r1, =gUnknown_085EBFCE + ldr r1, =gText_InParty b _081D2F3A .pool _081D2F2C: @@ -25214,10 +25214,10 @@ _081D36CA: adds r4, 0xC movs r1, 0 ldrsh r0, [r4, r1] - ldr r1, =gUnknown_085EEA76 + ldr r1, =gText_Dash cmp r0, 0 blt _081D3704 - ldr r1, =gUnknown_085EEA73 + ldr r1, =gText_UnkCtrlF904 _081D3704: adds r0, r6, 0 bl StringCopy @@ -29757,7 +29757,7 @@ sub_81D5C8C: @ 81D5C8C movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r5, =gUnknown_085EF88A + ldr r5, =gText_TimeBoard movs r0, 0x1 adds r1, r5, 0 movs r2, 0xD0 @@ -29842,9 +29842,9 @@ _081D5CD6: movs r3, 0x2 bl ConvertIntToDecimalStringN mov r0, r9 - ldr r1, =gUnknown_085EF895 + ldr r1, =gText_TimeCleared bl StringCopy - ldr r1, =gUnknown_085EF8A3 + ldr r1, =gText_XMinYDotZSec bl StringExpandPlaceholders movs r0, 0x1 mov r1, r9 diff --git a/asm/record_mixing.s b/asm/record_mixing.s index a28af9a9a..a62022cc7 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -630,7 +630,7 @@ _080E726C: lsrs r0, 24 strh r0, [r5, 0x14] _080E7296: - ldr r0, =gUnknown_085EEA8E + ldr r0, =gText_RecordMixingComplete bl sub_80E70F4 strh r4, [r5, 0x10] b _080E730A @@ -739,7 +739,7 @@ _080E7370: b _080E7566 .pool _080E7384: - ldr r0, =gUnknown_085EEA7E + ldr r0, =gText_MixingRecords bl sub_80E70F4 movs r0, 0xE1 lsls r0, 3 diff --git a/asm/region_map.s b/asm/region_map.s index 1b1dfb4bd..150b4893e 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -3212,12 +3212,12 @@ sub_81245DC: @ 81245DC beq _081245F8 cmp r1, 0x57 bne _08124604 - ldr r1, =gUnknown_085EC9D2 + ldr r1, =gText_Ferry bl StringCopy b _0812460A .pool _081245F8: - ldr r1, =gUnknown_085EC9D8 + ldr r1, =gText_SecretBase bl StringCopy b _0812460A .pool @@ -3239,7 +3239,7 @@ sub_8124610: @ 8124610 bl sub_81245DC b _08124626 _08124620: - ldr r1, =gUnknown_085EC9E4 + ldr r1, =gText_Hideout bl StringCopy _08124626: pop {r1} diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 076ddbf0b..ac2c1181c 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -414,7 +414,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl StringCopy adds r7, r0, 0 - ldr r1, =gUnknown_085EE68A + ldr r1, =gText_Day bl StringCopy adds r7, r0, 0 adds r0, r4, 0 @@ -426,7 +426,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl StringCopy adds r7, r0, 0 - ldr r5, =gUnknown_085EE68E + ldr r5, =gText_Colon3 adds r1, r5, 0 bl StringCopy adds r7, r0, 0 @@ -514,7 +514,7 @@ sub_809ECB4: @ 809ECB4 movs r2, 0x1 mov r3, r9 bl sub_809EBC4 - ldr r2, =gUnknown_085EE690 + ldr r2, =gText_Confirm2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1011,7 +1011,7 @@ _0809F11C: movs r1, 0 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, =gUnknown_085ECA0D + ldr r2, =gText_PresentTime movs r0, 0x1 str r0, [sp] movs r4, 0xFF @@ -1033,7 +1033,7 @@ _0809F11C: movs r1, 0 movs r2, 0x11 bl sub_809EBC4 - ldr r2, =gUnknown_085ECA22 + ldr r2, =gText_PreviousTime movs r0, 0x21 str r0, [sp] str r4, [sp, 0x4] @@ -1062,7 +1062,7 @@ _0809F11C: movs r1, 0 movs r2, 0x31 bl sub_809EBC4 - ldr r0, =gUnknown_085EC9EC + ldr r0, =gText_ResetRTCConfirmCancel bl sub_809F0C0 movs r0, 0 movs r1, 0x2 @@ -1161,7 +1161,7 @@ _0809F276: cmp r0, 0x2 bne _0809F29C _0809F282: - ldr r0, =gUnknown_085ECAA7 + ldr r0, =gText_NoSaveFileCantSetTime bl sub_809F0C0 movs r0, 0x5 strh r0, [r5] @@ -1193,7 +1193,7 @@ _0809F2CA: movs r0, 0 movs r1, 0 bl sub_8198070 - ldr r0, =gUnknown_085ECA38 + ldr r0, =gText_PleaseResetTime bl sub_809F0C0 ldr r2, =gLocalTime ldr r0, =gSaveBlock2Ptr @@ -1261,7 +1261,7 @@ _0809F340: ldrh r1, [r4] bl VarSet bl DisableResetRTC - ldr r0, =gUnknown_085ECA4F + ldr r0, =gText_ClockHasBeenReset bl sub_809F0C0 movs r0, 0x4 strh r0, [r5] @@ -1274,14 +1274,14 @@ _0809F398: lsrs r0, 24 cmp r0, 0x1 bne _0809F3B8 - ldr r0, =gUnknown_085ECA8A + ldr r0, =gText_SaveCompleted bl sub_809F0C0 movs r0, 0x49 bl PlaySE b _0809F3C4 .pool _0809F3B8: - ldr r0, =gUnknown_085ECA9A + ldr r0, =gText_SaveFailed bl sub_809F0C0 movs r0, 0x16 bl PlaySE diff --git a/asm/rom6.s b/asm/rom6.s index bfa19101a..4bad6e35d 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -1064,23 +1064,23 @@ sub_8135DAC: @ 8135DAC movs r0, 0 adds r1, r4, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E931D + ldr r1, =gText_Spicy movs r0, 0x2 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9323 + ldr r1, =gText_Dry movs r0, 0x3 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9327 + ldr r1, =gText_Sweet movs r0, 0x4 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E932D + ldr r1, =gText_Bitter movs r0, 0x5 movs r2, 0 bl sub_8135D7C - ldr r1, =gUnknown_085E9334 + ldr r1, =gText_Sour movs r0, 0x6 movs r2, 0 bl sub_8135D7C @@ -1148,7 +1148,7 @@ _08135E7C: adds r4, r7 ldr r0, [r5] adds r0, r4 - ldr r1, =gUnknown_085E9344 + ldr r1, =gText_StowCase bl StringCopy ldr r1, [r5] lsls r2, r6, 3 @@ -1231,7 +1231,7 @@ sub_8135F04: @ 8135F04 movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E934F + ldr r1, =gText_LvVar1 adds r0, r4, 0 bl StringExpandPlaceholders pop {r4-r6} @@ -2598,7 +2598,7 @@ sub_8136AB4: @ 8136AB4 ldr r1, [r1] bl StringCopy ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E9353 + ldr r1, =gText_ThrowAwayVar1 adds r0, r5, 0 bl StringExpandPlaceholders bl sav2_get_text_speed @@ -2654,7 +2654,7 @@ sub_8136B78: @ 8136B78 lsls r4, 24 lsrs r4, 24 ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E9367 + ldr r1, =gText_Var1ThrownAway adds r0, r5, 0 bl StringExpandPlaceholders bl sav2_get_text_speed @@ -4796,14 +4796,14 @@ sub_8137D5C: @ 8137D5C movs r2, 0 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB5EE + ldr r1, =gText_SpaceTimes adds r0, r4, 0 bl StringAppend b _08137D90 .pool _08137D88: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB5CF + ldr r1, =gText_99TimesPlus bl StringCopy _08137D90: ldr r0, =0x00000e0f @@ -4833,14 +4833,14 @@ _08137D90: movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB5E5 + ldr r1, =gText_SpaceSeconds adds r0, r4, 0 bl StringAppend b _08137DF8 .pool _08137DF0: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085EB5DA + ldr r1, =gText_1MinutePlus bl StringCopy _08137DF8: movs r4, 0 @@ -6425,13 +6425,13 @@ sub_8138B10: @ 8138B10 cmp r0, 0 bne _08138B34 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB5F9 + ldr r1, =gText_BigGuy bl StringCopy b _08138B3C .pool _08138B34: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB601 + ldr r1, =gText_BigGirl bl StringCopy _08138B3C: pop {r0} @@ -6448,13 +6448,13 @@ sub_8138B48: @ 8138B48 cmp r0, 0 bne _08138B6C ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB60E + ldr r1, =gText_Daughter bl StringCopy b _08138B74 .pool _08138B6C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB60A + ldr r1, =gText_Son bl StringCopy _08138B74: pop {r0} @@ -8511,7 +8511,7 @@ sub_8139B60: @ 8139B60 ldrb r0, [r5] movs r1, 0 bl SetStandardWindowBorderStyle - ldr r4, =gUnknown_085EB6A5 + ldr r4, =gText_ElevatorNowOn movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -10131,7 +10131,7 @@ sub_813A8FC: @ 813A8FC movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085EB6AD + ldr r1, =gText_BP bl StringCopy movs r0, 0x1 add r1, sp, 0xC @@ -12650,37 +12650,37 @@ _0813BE58: .4byte _0813BEC0 _0813BE70: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD14 + ldr r1, =gText_Steven bl StringCopy b _0813BF04 .pool _0813BE84: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD1B + ldr r1, =gText_Brawly bl StringCopy b _0813BF04 .pool _0813BE98: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD22 + ldr r1, =gText_Winona bl StringCopy b _0813BF04 .pool _0813BEAC: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD29 + ldr r1, =gText_Phoebe bl StringCopy b _0813BF04 .pool _0813BEC0: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD30 + ldr r1, =gText_Glacia bl StringCopy b _0813BF04 .pool _0813BED4: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD0C + ldr r1, =gText_Wallace bl StringCopy b _0813BF04 .pool diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index 247c765b6..182ff8954 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -268,7 +268,7 @@ _08178FF8: ldrb r0, [r4] movs r1, 0x1 bl CopyWindowToVram - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -340,7 +340,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC917 + ldr r0, =gText_CheckCompleted movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -353,7 +353,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC816 + ldr r0, =gText_SaveFailedCheckingBackup movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -373,7 +373,7 @@ _081792EC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged b _08179330 .pool _0817931C: @@ -385,7 +385,7 @@ _0817931C: ldr r0, [r0] cmp r0, 0 bne _08179370 - ldr r0, =gUnknown_085EC94F + ldr r0, =gText_SaveCompleteGameCannotContinue _08179330: movs r1, 0x1 movs r2, 0 @@ -397,7 +397,7 @@ _08179348: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC86F + ldr r0, =gText_BackupMemoryDamaged movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -406,7 +406,7 @@ _08179348: b _08179380 .pool _08179370: - ldr r0, =gUnknown_085EC9A2 + ldr r0, =gText_SaveCompletePressA movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -436,7 +436,7 @@ sub_8179390: @ 8179390 ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, =gUnknown_085EC8D4 + ldr r0, =gText_GamePlayCannotBeContinued movs r1, 0x1 movs r2, 0 bl sub_8178F44 diff --git a/asm/script_menu.s b/asm/script_menu.s index 6c5e6d2bd..8aecbf696 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -724,7 +724,7 @@ _080E23AC: lsls r0, 24 cmp r0, 0 beq _080E23D4 - ldr r0, =gUnknown_085EB18B + ldr r0, =gText_HallOfFame adds r1, r5, 0 bl display_text_and_get_width adds r5, r0, 0 @@ -751,7 +751,7 @@ _080E23D4: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB18B + ldr r2, =gText_HallOfFame movs r0, 0x21 str r0, [sp] movs r5, 0xFF @@ -762,7 +762,7 @@ _080E23D4: movs r1, 0x1 adds r3, r7, 0 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB198 + ldr r2, =gText_LogOff movs r0, 0x31 str r0, [sp] str r5, [sp, 0x4] @@ -786,7 +786,7 @@ _080E2448: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB198 + ldr r2, =gText_LogOff movs r0, 0x21 str r0, [sp] movs r0, 0xFF @@ -803,7 +803,7 @@ _080E247A: lsrs r1, r0, 24 cmp r1, 0 beq _080E24B0 - ldr r2, =gUnknown_085EB176 + ldr r2, =gText_LanettesPC movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -817,7 +817,7 @@ _080E247A: b _080E24C6 .pool _080E24B0: - ldr r2, =gUnknown_085EB169 + ldr r2, =gText_SomeonesPC movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -829,7 +829,7 @@ _080E24B0: bl PrintTextOnWindow _080E24C6: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EB183 + ldr r1, =gText_PlayersPC adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r6, 0 @@ -1677,7 +1677,7 @@ CreateStartMenu: @ 80E2BAC adds r0, r4, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, =gUnknown_085EB25C + ldr r2, =gText_MenuOptionPokedex movs r0, 0x9 str r0, [sp] movs r5, 0xFF @@ -1688,7 +1688,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB264 + ldr r2, =gText_MenuOptionPokemon movs r0, 0x19 str r0, [sp] str r5, [sp, 0x4] @@ -1697,7 +1697,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB26C + ldr r2, =gText_MenuOptionBag movs r0, 0x29 str r0, [sp] str r5, [sp, 0x4] @@ -1706,7 +1706,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB270 + ldr r2, =gText_MenuOptionPokenav movs r0, 0x39 str r0, [sp] str r5, [sp, 0x4] @@ -1725,7 +1725,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB279 + ldr r2, =gText_MenuOptionSave movs r0, 0x59 str r0, [sp] str r5, [sp, 0x4] @@ -1734,7 +1734,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB27E + ldr r2, =gText_MenuOptionOption movs r0, 0x69 str r0, [sp] str r5, [sp, 0x4] @@ -1743,7 +1743,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - ldr r2, =gUnknown_085EB285 + ldr r2, =gText_MenuOptionExit movs r0, 0x79 str r0, [sp] str r5, [sp, 0x4] diff --git a/asm/secret_base.s b/asm/secret_base.s index 5cf0f3697..fd4fe6701 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -1576,7 +1576,7 @@ sub_80E9780: @ 80E9780 ldrb r1, [r0] adds r0, r6, 0 bl ConvertInternationalString - ldr r1, =gUnknown_085EA72F + ldr r1, =gText_ApostropheSBase adds r0, r6, 0 bl StringAppend pop {r3} @@ -2204,7 +2204,7 @@ sub_80E9C9C: @ 80E9C9C b _080E9D1A .pool _080E9D10: - ldr r1, =gUnknown_085EA785 + ldr r1, =gText_NoRegistry ldr r2, =task_pc_turn_off adds r0, r6, 0 bl DisplayItemMessageOnField @@ -2583,7 +2583,7 @@ sub_80E9FFC: @ 80E9FFC ldrb r1, [r4, 0x8] bl sub_80E9780 ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EA737 + ldr r1, =gText_OkayToDeleteFromRegistry adds r0, r4, 0 bl StringExpandPlaceholders ldr r2, =sub_80EA06C @@ -2683,7 +2683,7 @@ sub_80EA120: @ 80EA120 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_085EA762 + ldr r1, =gText_RegisteredDataDeleted ldr r2, =sub_80EA08C bl DisplayItemMessageOnField pop {r0} diff --git a/asm/shop.s b/asm/shop.s index 9e03399fc..646390732 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -325,14 +325,14 @@ Task_ExitSellMenu: @ 80DFCF8 ldrb r0, [r0, 0xF] cmp r0, 0x2 bne _080DFD2C - ldr r1, =gUnknown_085E95C7 + ldr r1, =gText_CanIHelpWithAnythingElse ldr r2, =ReturnToShopMenuAfterExitingSellMenu adds r0, r4, 0 bl DisplayItemMessageOnField b _080DFD36 .pool _080DFD2C: - ldr r1, =gUnknown_085E959B + ldr r1, =gText_AnythingElseICanHelp ldr r2, =ReturnToShopMenuAfterExitingSellMenu adds r0, r5, 0 bl DisplayItemMessageOnField @@ -748,7 +748,7 @@ _080E00D8: b _080E00EA .pool _080E00E8: - ldr r4, =gUnknown_085E93E0 + ldr r4, =gText_QuitShopping _080E00EA: movs r0, 0x2 movs r1, 0 @@ -817,7 +817,7 @@ _080E0164: bl ConvertIntToDecimalStringN _080E0176: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x7 @@ -2060,7 +2060,7 @@ _080E0B92: lsls r0, 24 cmp r0, 0 bne _080E0BD0 - ldr r1, =gUnknown_085E9539 + ldr r1, =gText_YouDontHaveMoney ldr r2, =BuyMenuReturnToItemList b _080E0C28 .pool @@ -2091,11 +2091,11 @@ _080E0BD0: adds r1, r0 adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_085E9417 + ldr r1, =gText_Var1CertainlyHowMany2 b _080E0C26 .pool _080E0C24: - ldr r1, =gUnknown_085E93EF + ldr r1, =gText_Var1CertainlyHowMany _080E0C26: ldr r2, =Task_BuyHowManyDialogueInit _080E0C28: @@ -2121,13 +2121,13 @@ _080E0C38: cmp r0, 0x1 bne _080E0C7C ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9468 + ldr r1, =gText_Var1IsItThatllBeVar2 bl StringExpandPlaceholders b _080E0C84 .pool _080E0C7C: ldr r0, =gStringVar4 - ldr r1, =gUnknown_085E9493 + ldr r1, =gText_YouWantedVar1ThatllBeVar2 bl StringExpandPlaceholders _080E0C84: ldr r1, =gStringVar4 @@ -2171,7 +2171,7 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4 movs r3, 0x4 bl ConvertIntToDecimalStringN ldr r4, =gStringVar4 - ldr r1, =gUnknown_085E93D5 + ldr r1, =gText_InBagVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -2319,7 +2319,7 @@ _080E0DF0: movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085E943F + ldr r1, =gText_Var1AndYouWantedVar2 ldr r2, =BuyMenuConfirmPurchase adds r0, r6, 0 bl BuyMenuDisplayMessage @@ -2400,7 +2400,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC lsrs r0, 24 cmp r0, 0x1 bne _080E0F30 - ldr r1, =gUnknown_085E94C5 + ldr r1, =gText_HereYouGoThankYou ldr r2, =BuyMenuSubtractMoney adds r0, r5, 0 bl BuyMenuDisplayMessage @@ -2409,7 +2409,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC b _080E0F7A .pool _080E0F30: - ldr r1, =gUnknown_085E9558 + ldr r1, =gText_NoMoreRoomForThis ldr r2, =BuyMenuReturnToItemList b _080E0F60 .pool @@ -2422,11 +2422,11 @@ _080E0F40: ldrb r0, [r6, 0xF] cmp r0, 0x1 bne _080E0F5C - ldr r1, =gUnknown_085E94E7 + ldr r1, =gText_ThankYouIllSendItHome b _080E0F5E .pool _080E0F5C: - ldr r1, =gUnknown_085E9510 + ldr r1, =gText_ThanksIllSendItHome _080E0F5E: ldr r2, =BuyMenuSubtractMoney _080E0F60: @@ -2435,7 +2435,7 @@ _080E0F60: b _080E0F7A .pool _080E0F70: - ldr r1, =gUnknown_085E957F + ldr r1, =gText_SpaceForVar1Full ldr r2, =BuyMenuReturnToItemList adds r0, r7, 0 bl BuyMenuDisplayMessage @@ -2536,7 +2536,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C lsrs r0, 24 cmp r0, 0x1 bne _080E106C - ldr r1, =gUnknown_085E95EA + ldr r1, =gText_ThrowInPremierBall ldr r2, =BuyMenuReturnToItemList adds r0, r4, 0 bl BuyMenuDisplayMessage diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6fdd1a214..6bd62ed9f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -976,7 +976,7 @@ sub_812ACF4: @ 812ACF4 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF734 + ldr r2, =gText_YouDontHaveThreeCoins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1544,7 +1544,7 @@ sub_812B158: @ 812B158 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF6E9 + ldr r2, =gText_QuitTheGame movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1634,7 +1634,7 @@ sub_812B214: @ 812B214 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF6F8 + ldr r2, =gText_YouveGot9999Coins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1687,7 +1687,7 @@ sub_812B280: @ 812B280 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, =gUnknown_085EF710 + ldr r2, =gText_YouveRunOutOfCoins movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -7209,7 +7209,7 @@ sub_812DD78: @ 812DD78 str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, =gUnknown_085EF750 + ldr r0, =gText_ReelTimeHelp str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 diff --git a/asm/start_menu.s b/asm/start_menu.s index f71df1046..4f8544eea 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1862,7 +1862,7 @@ _080A0710: bl PrintTextOnWindow movs r4, 0x11 ldrb r0, [r6] - ldr r2, =gUnknown_085EED26 + ldr r2, =gText_SavingPlayer str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1887,7 +1887,7 @@ _080A0710: bl sub_819A024 movs r4, 0x21 ldrb r0, [r6] - ldr r2, =gUnknown_085EED2D + ldr r2, =gText_SavingBadges str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1922,7 +1922,7 @@ _080A0710: bne _080A0802 movs r4, 0x31 ldrb r0, [r6] - ldr r2, =gUnknown_085EED34 + ldr r2, =gText_SavingPokedex str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -1952,7 +1952,7 @@ _080A0710: _080A0802: adds r4, 0x10 ldrb r0, [r6] - ldr r2, =gUnknown_085EED3C + ldr r2, =gText_SavingTime lsls r4, 24 lsrs r4, 24 str r4, [sp] diff --git a/asm/trade.s b/asm/trade.s index 3f9323971..77eaac095 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -9004,7 +9004,7 @@ _0807C0F8: .pool _0807C120: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE942 + ldr r1, =gText_XWillBeSentToY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -9070,7 +9070,7 @@ _0807C178: adds r0, 0x1 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE959 + ldr r1, =gText_ByeByeVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -10471,7 +10471,7 @@ _0807CDDC: movs r0, 0 bl SetGpuReg ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE966 + ldr r1, =gText_XSentOverY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -10542,7 +10542,7 @@ _0807CE70: movs r5, 0 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE977 + ldr r1, =gText_TakeGoodCareOfX adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -11066,7 +11066,7 @@ _0807D4D4: .pool _0807D4FC: ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE942 + ldr r1, =gText_XWillBeSentToY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -11132,7 +11132,7 @@ _0807D554: adds r0, 0x1 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE959 + ldr r1, =gText_ByeByeVar1 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -12576,7 +12576,7 @@ _0807E228: movs r0, 0 bl SetGpuReg ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE966 + ldr r1, =gText_XSentOverY adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -12647,7 +12647,7 @@ _0807E2BC: movs r5, 0 strh r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EE977 + ldr r1, =gText_TakeGoodCareOfX adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -13751,7 +13751,7 @@ _0807ED10: adds r0, 0x1 strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 b _0807EDA6 .pool _0807ED2C: @@ -14634,7 +14634,7 @@ _0807F4C0: movs r0, 0x1 strb r0, [r1] ldr r4, =gStringVar4 - ldr r1, =gUnknown_085EF6D2 + ldr r1, =gText_CommunicationStandby5 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 diff --git a/asm/trader.s b/asm/trader.s index e93bceccb..877d17382 100644 --- a/asm/trader.s +++ b/asm/trader.s @@ -87,7 +87,7 @@ sub_8133A78: @ 8133A78 ldr r0, [r0] str r0, [sp, 0xC] str r1, [sp, 0x10] - ldr r1, =gUnknown_085EB7EA + ldr r1, =gText_Exit movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -193,7 +193,7 @@ _08133B94: cmp r5, 0x3 bls _08133B3C ldrb r0, [r7, 0x6] - ldr r2, =gUnknown_085EB7EA + ldr r2, =gText_Exit lsls r1, r5, 4 adds r1, 0x1 lsls r1, 24 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index ec0b58653..7552d7ace 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -410,7 +410,7 @@ _080C2A2C: movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r2, =gUnknown_085ED042 + ldr r2, =gText_WaitingTrainerFinishReading movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -1714,7 +1714,7 @@ sub_80C3548: @ 80C3548 sub_80C3574: @ 80C3574 push {r4,r5,lr} sub sp, 0x2C - ldr r1, =gUnknown_085ECF71 + ldr r1, =gText_TrainerCardName add r0, sp, 0xC bl StringCopy adds r5, r0, 0 @@ -1775,7 +1775,7 @@ _080C35FA: sub_80C3608: @ 80C3608 push {r4,lr} sub sp, 0x2C - ldr r1, =gUnknown_085ECF78 + ldr r1, =gText_TrainerCardIDNo add r0, sp, 0xC bl StringCopy ldr r4, =gUnknown_02039CE8 @@ -1842,7 +1842,7 @@ sub_80C3684: @ 80C3684 movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF7E + ldr r0, =gText_TrainerCardMoney str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1857,7 +1857,7 @@ _080C36C4: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF7E + ldr r0, =gText_TrainerCardMoney str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1876,7 +1876,7 @@ _080C36DE: movs r3, 0x6 bl ConvertIntToDecimalStringN ldr r5, =gStringVar4 - ldr r1, =gUnknown_085E969C + ldr r1, =gText_PokedollarVar1 adds r0, r5, 0 bl StringExpandPlaceholders ldr r0, [r4] @@ -1958,7 +1958,7 @@ sub_80C378C: @ 80C378C movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF86 + ldr r0, =gText_TrainerCardPokedex str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1973,7 +1973,7 @@ _080C37DC: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF86 + ldr r0, =gText_TrainerCardPokedex str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -1992,7 +1992,7 @@ _080C37F6: movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r1, =gUnknown_085ECF8E + ldr r1, =gText_EmptyString6 bl StringCopy ldr r0, [r4] ldr r1, =0x0000052b @@ -2054,7 +2054,7 @@ sub_80C3880: @ 80C3880 movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF99 + ldr r0, =gText_TrainerCardTime str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2069,7 +2069,7 @@ _080C38C8: movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ECF99 + ldr r0, =gText_TrainerCardTime str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2105,7 +2105,7 @@ _080C391C: bls _080C3922 movs r6, 0x3B _080C3922: - ldr r1, =gUnknown_085ECF8F + ldr r1, =gText_Colon2 movs r0, 0x1 movs r2, 0 bl GetStringWidth @@ -2172,7 +2172,7 @@ _080C395C: ldr r0, [r0] str r0, [sp] str r5, [sp, 0x4] - ldr r0, =gUnknown_085ECF8F + ldr r0, =gText_Colon2 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -2331,7 +2331,7 @@ sub_80C3AF0: @ 80C3AF0 bl StringCopy ldr r0, [r4] adds r0, 0x4D - ldr r1, =gUnknown_085ECFA6 + ldr r1, =gText_Var1sTrainerCard bl StringExpandPlaceholders _080C3B30: pop {r4} @@ -2512,7 +2512,7 @@ sub_80C3CCC: @ 80C3CCC ldrb r0, [r2, 0xB] cmp r0, 0 beq _080C3CE4 - ldr r1, =gUnknown_085ECFB8 + ldr r1, =gText_HallOfFameDebut adds r2, 0x93 ldr r3, =gUnknown_0856FB0F movs r0, 0 @@ -2585,7 +2585,7 @@ sub_80C3D60: @ 80C3D60 adds r1, r2 bl StringCopy ldr r4, =gStringVar4 - ldr r1, =gUnknown_085ECFED + ldr r1, =gText_WinsLosses adds r0, r4, 0 bl StringExpandPlaceholders ldr r1, [r5] @@ -2631,7 +2631,7 @@ sub_80C3DF0: @ 80C3DF0 ldrb r0, [r2, 0x10] cmp r0, 0 beq _080C3E0A - ldr r1, =gUnknown_085ED010 + ldr r1, =gText_PokemonTrades ldr r0, =0x00000237 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2685,7 +2685,7 @@ sub_80C3E58: @ 80C3E58 ldr r0, [r0] cmp r0, 0 beq _080C3E80 - ldr r1, =gUnknown_085ED036 + ldr r1, =gText_BerryCrush ldr r0, =0x000002c3 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2738,7 +2738,7 @@ sub_80C3ED4: @ 80C3ED4 ldr r0, [r0] cmp r0, 0 beq _080C3EFC - ldr r1, =gUnknown_085ED01F + ldr r1, =gText_UnionTradesAndBattles ldr r0, =0x0000034f adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2773,7 +2773,7 @@ sub_80C3F14: @ 80C3F14 ldr r0, [r4] ldr r1, =0x00000395 adds r0, r1 - ldr r1, =gUnknown_085ED096 + ldr r1, =gText_Var1DarkGreyShadowLightGrey bl StringExpandPlaceholders _080C3F46: pop {r4} @@ -2797,7 +2797,7 @@ sub_80C3F64: @ 80C3F64 ldrh r0, [r0] cmp r0, 0 beq _080C3F8C - ldr r1, =gUnknown_085ED085 + ldr r1, =gText_PokeblocksWithFriends ldr r0, =0x00000395 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2852,7 +2852,7 @@ sub_80C3FE0: @ 80C3FE0 ldrh r0, [r0] cmp r0, 0 beq _080C4008 - ldr r1, =gUnknown_085ED09F + ldr r1, =gText_WonContestsWFriends ldr r0, =0x000003db adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -2902,7 +2902,7 @@ _080C4044: ldr r0, [r4] ldr r1, =0x00000421 adds r0, r1 - ldr r1, =gUnknown_085ED0E0 + ldr r1, =gText_WSlashStraightSlash bl StringExpandPlaceholders b _080C40B6 .pool @@ -2920,7 +2920,7 @@ _080C4094: ldr r0, [r4] ldr r1, =0x00000421 adds r0, r1 - ldr r1, =gUnknown_085ED0C8 + ldr r1, =gText_Var1DarkLightGreyBP bl StringExpandPlaceholders _080C40B6: pop {r4} @@ -2949,7 +2949,7 @@ _080C40F0: ldrb r0, [r2, 0xD] cmp r0, 0 beq _080C412C - ldr r1, =gUnknown_085ED0D3 + ldr r1, =gText_BattleTower ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0C @@ -2963,7 +2963,7 @@ _080C4114: ldrh r0, [r0] cmp r0, 0 beq _080C412C - ldr r1, =gUnknown_085ED0B6 + ldr r1, =gText_BattlePtsWon ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0F @@ -6346,7 +6346,7 @@ _080C5DC2: lsrs r4, r0, 24 cmp r4, 0x4 bls _080C5DC2 - ldr r4, =gUnknown_085ED8FF + ldr r4, =gText_SymbolsEarned movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 @@ -6362,7 +6362,7 @@ _080C5DC2: movs r1, 0x1 movs r3, 0x5 bl box_print - ldr r4, =gUnknown_085ED90E + ldr r4, =gText_BattleRecord movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 @@ -6380,7 +6380,7 @@ _080C5DC2: str r6, [sp] mov r0, r8 str r0, [sp, 0x4] - ldr r0, =gUnknown_085ED91C + ldr r0, =gText_BattlePoints str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x8 diff --git a/asm/tv.s b/asm/tv.s index 2ebdfc0a1..3d57b3dba 100644 --- a/asm/tv.s +++ b/asm/tv.s @@ -7811,7 +7811,7 @@ GetMomOrDadStringForTVMessage: @ 80F00A4 cmp r0, 0 bne _080F0104 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy ldr r0, =0x00004003 movs r1, 0x1 @@ -7824,7 +7824,7 @@ _080F00EC: cmp r0, 0x2 bne _080F0104 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy ldr r0, =0x00004003 movs r1, 0x1 @@ -7859,13 +7859,13 @@ _080F0104: bne _080F0158 _080F0142: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy b _080F01A8 .pool _080F0158: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD04 + ldr r1, =gText_Dad bl StringCopy b _080F01A8 .pool @@ -7878,7 +7878,7 @@ _080F016C: cmp r0, 0 beq _080F0198 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD08 + ldr r1, =gText_Mom bl StringCopy adds r0, r4, 0 movs r1, 0x1 @@ -7887,7 +7887,7 @@ _080F016C: .pool _080F0198: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAD04 + ldr r1, =gText_Dad bl StringCopy adds r0, r4, 0 movs r1, 0x2 @@ -10790,13 +10790,13 @@ _080F1A40: cmp r0, 0x32 bne _080F1A58 ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAEB1 + ldr r1, =gText_Lv50 bl StringCopy b _080F1A60 .pool _080F1A58: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EAEB8 + ldr r1, =gText_OpenLevel bl StringCopy _080F1A60: ldrh r1, [r4, 0x16] @@ -12536,31 +12536,31 @@ _080F2C08: .4byte _080F2C6C _080F2C1C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0E8 + ldr r1, =gText_Cool bl StringCopy b _080F2C74 .pool _080F2C30: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0ED + ldr r1, =gText_Beauty bl StringCopy b _080F2C74 .pool _080F2C44: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0F4 + ldr r1, =gText_Cute bl StringCopy b _080F2C74 .pool _080F2C58: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0F9 + ldr r1, =gText_Smart bl StringCopy b _080F2C74 .pool _080F2C6C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085EB0FF + ldr r1, =gText_Tough bl StringCopy _080F2C74: ldr r0, =gStringVar2 @@ -13154,13 +13154,13 @@ _080F31CA: cmp r0, 0 bne _080F3200 ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ECB64 + ldr r1, =gText_Single bl StringCopy b _080F3208 .pool _080F3200: ldr r0, =gStringVar3 - ldr r1, =gUnknown_085ECB6B + ldr r1, =gText_Double bl StringCopy _080F3208: ldr r1, =gUnknown_0203A030 @@ -13369,38 +13369,38 @@ _080F3430: .4byte _080F3494 _080F3444: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB48 + ldr r1, =gText_Spicy2 bl StringCopy b _080F349C .pool _080F3458: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB4E + ldr r1, =gText_Dry2 bl StringCopy b _080F349C .pool _080F346C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB52 + ldr r1, =gText_Sweet2 bl StringCopy b _080F349C .pool _080F3480: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB58 + ldr r1, =gText_Bitter2 bl StringCopy b _080F349C .pool _080F3494: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB5F + ldr r1, =gText_Sour2 bl StringCopy _080F349C: ldrb r0, [r4, 0x2] cmp r0, 0x18 bls _080F34BC ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB2A + ldr r1, =gText_Excellent bl StringCopy b _080F34DC .pool @@ -13408,13 +13408,13 @@ _080F34BC: cmp r0, 0x16 bls _080F34D4 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB20 + ldr r1, =gText_VeryGood bl StringCopy b _080F34DC .pool _080F34D4: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB1B + ldr r1, =gText_Good bl StringCopy _080F34DC: ldr r0, =gStringVar3 @@ -13454,38 +13454,38 @@ _080F3524: .4byte _080F3588 _080F3538: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB48 + ldr r1, =gText_Spicy2 bl StringCopy b _080F3590 .pool _080F354C: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB4E + ldr r1, =gText_Dry2 bl StringCopy b _080F3590 .pool _080F3560: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB52 + ldr r1, =gText_Sweet2 bl StringCopy b _080F3590 .pool _080F3574: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB58 + ldr r1, =gText_Bitter2 bl StringCopy b _080F3590 .pool _080F3588: ldr r0, =gStringVar1 - ldr r1, =gUnknown_085ECB5F + ldr r1, =gText_Sour2 bl StringCopy _080F3590: ldrb r0, [r4, 0x2] cmp r0, 0x10 bls _080F35B0 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB34 + ldr r1, =gText_SoSo bl StringCopy b _080F35D0 .pool @@ -13493,13 +13493,13 @@ _080F35B0: cmp r0, 0xD bls _080F35C8 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB3A + ldr r1, =gText_Bad bl StringCopy b _080F35D0 .pool _080F35C8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB3E + ldr r1, =gText_TheWorst bl StringCopy _080F35D0: ldr r0, =gStringVar3 @@ -14418,13 +14418,13 @@ _080F3ECC: .pool _080F3EE8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3F04 .pool _080F3EFC: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3F04: ldrb r1, [r4, 0x2] @@ -14455,13 +14455,13 @@ _080F3F28: .pool _080F3F44: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3F60 .pool _080F3F58: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3F60: ldrh r1, [r4, 0x4] @@ -14485,13 +14485,13 @@ _080F3F78: .pool _080F3F94: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy b _080F3FB0 .pool _080F3FA8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy _080F3FB0: ldrh r1, [r4, 0x4] @@ -14517,13 +14517,13 @@ _080F3FCC: .pool _080F3FE8: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB12 + ldr r1, =gText_Roulette bl StringCopy b _080F4004 .pool _080F3FFC: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB0C + ldr r1, =gText_Slots bl StringCopy _080F4004: bl TVShowDone @@ -15097,7 +15097,7 @@ DoTVShowPokemonLotterWinnerFlashReport: @ 80F45A0 cmp r0, 0 bne _080F45FC ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB72 + ldr r1, =gText_Jackpot bl StringCopy b _080F4634 .pool @@ -15105,7 +15105,7 @@ _080F45FC: cmp r0, 0x1 bne _080F4614 ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB7A + ldr r1, =gText_First bl StringCopy b _080F4634 .pool @@ -15113,13 +15113,13 @@ _080F4614: cmp r0, 0x2 bne _080F462C ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB80 + ldr r1, =gText_Second bl StringCopy b _080F4634 .pool _080F462C: ldr r0, =gStringVar2 - ldr r1, =gUnknown_085ECB87 + ldr r1, =gText_Third bl StringCopy _080F4634: ldr r4, =gStringVar3 diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 67441ee8b..20d23a878 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1196,7 +1196,7 @@ sub_8166D44: @ 8166D44 bl GetMonData add r0, sp, 0xC bl StringGetEnd10 - ldr r1, =gUnknown_085EC7A0 + ldr r1, =gText_GetsAPokeBlockQuestion add r0, sp, 0xC bl StringAppend ldr r4, =gStringVar4 @@ -1426,7 +1426,7 @@ sub_8166F50: @ 8166F50 movs r1, 0x97 movs r2, 0xE bl sub_8098858 - ldr r2, =gUnknown_085EC800 + ldr r2, =gText_WontEatAnymore movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -1503,13 +1503,13 @@ _08166FEC: ldr r1, [r0] adds r0, r4, 0 bl StringCopy - ldr r1, =gUnknown_085EC7E1 + ldr r1, =gText_WasEnhanced adds r0, r4, 0 bl StringAppend b _08167018 .pool _08167010: - ldr r1, =gUnknown_085EC7EF + ldr r1, =gText_NothingChanged adds r0, r4, 0 bl StringCopy _08167018: @@ -2895,7 +2895,7 @@ sub_8167BA0: @ 8167BA0 ldr r0, [r7] ldr r6, =0x0000804a adds r0, r6 - ldr r1, =gUnknown_085EBF8D + ldr r1, =gText_NatureSlash bl StringCopy ldr r1, =gNatureNamePointers lsls r4, 2 diff --git a/asm/walda_phrase.s b/asm/walda_phrase.s index 2f1f7da60..9b27b99cb 100755 --- a/asm/walda_phrase.s +++ b/asm/walda_phrase.s @@ -53,7 +53,7 @@ _081D9A44: bl sub_80D2578 cmp r0, 0 beq _081D9A5C - ldr r0, =gUnknown_085EE49A + ldr r0, =gText_Peekaboo bl sub_80D255C b _081D9A68 .pool diff --git a/asm/wallclock.s b/asm/wallclock.s index 0d6f05a23..f8cc87fe8 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -353,7 +353,7 @@ Cb2_StartWallClock: @ 81349F4 movs r0, 0x5A strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE0 + ldr r2, =gText_Confirm3 movs r0, 0x1 str r0, [sp] mov r1, r8 @@ -500,7 +500,7 @@ _08134BA4: ldrh r0, [r0, 0xC] strh r0, [r1, 0x30] bl sub_813498C - ldr r2, =gUnknown_085EFAE8 + ldr r2, =gText_Cancel4 movs r0, 0x1 str r0, [sp] mov r1, r9 @@ -683,7 +683,7 @@ sub_8134DC4: @ 8134DC4 adds r2, r5, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r2, =gUnknown_085EFAC6 + ldr r2, =gText_IsThisTheCorrectTime movs r0, 0x1 str r0, [sp] movs r0, 0 diff --git a/data/battle_message.s b/data/battle_message.s index 03e1baa12..9addf0879 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -1214,10 +1214,10 @@ gText_GiveNicknameCaptured:: @ 85CBFDB gText_PkmnSentToPC:: @ 85CBFFF .string "{RIVAL} was sent to\n{STRING 39} PC.$" -gText_SomeonesPC:: @ 85CC015 +gText_Someones:: @ 85CC015 .string "someone’s$" -gText_LanettesPC:: @ 85CC01F +gText_Lanettes:: @ 85CC01F .string "LANETTE’s$" gText_PkmnDataAddedToDex:: @ 85CC029 diff --git a/data/link.s b/data/link.s index 3aa87ef67..38be746d9 100644 --- a/data/link.s +++ b/data/link.s @@ -1633,7 +1633,7 @@ gUnknown_082F025C:: @ 82F025C window_template 0x00, 0x12, 0x07, 0x10, 0x06, 0x0f, 0x0001 gUnknown_082F0264:: @ 82F0264 - .4byte gUnknown_085EA333, 0x00000001 + .4byte gText_Register, 0x00000001 .4byte gUnknown_082EFD8C, 0x00000002 .4byte gUnknown_082EFD7C, 0x00000003 @@ -1913,14 +1913,14 @@ gUnknown_082F0600:: @ 82F0600 .align 2 gUnknown_082F0608:: @ 82F0608 - .4byte gUnknown_085EEDEC, 0x00000000 - .4byte gUnknown_085EEDFC, 0x00000001 - .4byte gUnknown_085EEE28, 0xfffffffe + .4byte gText_WonderCards, 0x00000000 + .4byte gText_WonderNews, 0x00000001 + .4byte gText_Exit3, 0xfffffffe .align 2 gUnknown_082F0620:: @ 82F0620 - .4byte gUnknown_085EEE08, 0x00000000 - .4byte gUnknown_085EEE20, 0x00000001 + .4byte gText_WirelessCommunication, 0x00000000 + .4byte gText_Friend2, 0x00000001 .4byte gText_Cancel2, 0xfffffffe .align 2 @@ -1933,26 +1933,26 @@ gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate .align 2 gUnknown_082F0650:: @ 82F0650 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE38, 0x00000001 - .4byte gUnknown_085EEE40, 0x00000002 + .4byte gText_Receive, 0x00000000 + .4byte gText_Send, 0x00000001 + .4byte gText_Toss, 0x00000002 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F0670:: @ 82F0670 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE40, 0x00000002 + .4byte gText_Receive, 0x00000000 + .4byte gText_Toss, 0x00000002 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F0688:: @ 82F0688 - .4byte gUnknown_085EEE30, 0x00000000 - .4byte gUnknown_085EEE38, 0x00000001 + .4byte gText_Receive, 0x00000000 + .4byte gText_Send, 0x00000001 .4byte gText_Cancel2, 0xfffffffe .align 2 gUnknown_082F06A0:: @ 82F06A0 - .4byte gUnknown_085EEE30, 0x00000000 + .4byte gText_Receive, 0x00000000 .4byte gText_Cancel2, 0xfffffffe .align 2 @@ -1988,10 +1988,10 @@ gUnknown_082F06F8:: @ 82F06F8 .byte 0x21, 0x31, 0x00, 0x01 .align 2 - .4byte gUnknown_085EEE48 - .4byte gUnknown_085EEE8C - .4byte gUnknown_085EEEB8 - .4byte gUnknown_085EEED4 + .4byte gText_VarietyOfEventsImportedWireless + .4byte gText_WonderCardsInPossession + .4byte gText_ReadNewsThatArrived + .4byte gText_ReturnToTitle .align 2 gUnknown_082F0720:: @ 82F0720 struct TextColor @@ -2065,11 +2065,11 @@ gUnknown_082F0D3C:: @ 82F0D3C .align 2 gUnknown_082F0D5C:: @ 82F0D5C - .4byte gUnknown_085EED41 - .4byte gUnknown_085EED5F - .4byte gUnknown_085EED6F - .4byte gUnknown_085EED80 - .4byte gUnknown_085EED9A + .4byte gText_WirelessCommStatus + .4byte gText_PeopleTrading + .4byte gText_PeopleBattling + .4byte gText_PeopleInUnionRoom + .4byte gText_PeopleCommunicating .align 2 gUnknown_082F0D70:: @ 82F0D70 @@ -2780,37 +2780,37 @@ gUnknown_082F2C98:: @ 82F2C98 .align 2 gUnknown_082F2D40:: @ 82F2D40 - .4byte gUnknown_085ED265 + .4byte gText_QuitChatting .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED274 + .4byte gText_RegisterTextWhere .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED289 + .4byte gText_RegisterTextHere .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED29D + .4byte gText_InputText .byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED2E8 + .4byte gText_ExitingChat .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 - .4byte gUnknown_085ED2FA + .4byte gText_LeaderLeftEndingChat .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 - .4byte gUnknown_085ED325 + .4byte gText_RegisteredTextChanged .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED368 + .4byte gText_AlreadySavedFile .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED3A3 + .4byte gText_SavingDontTurnOff .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 - .4byte gUnknown_085ED3C5 + .4byte gText_PlayerSavedGame .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00 - .4byte gUnknown_085ED3D8 + .4byte gText_IfLeaderLeavesChatEnds .byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00 .align 2 @@ -2819,11 +2819,11 @@ gText_Ellipsis:: @ 82F2DC4 .align 2 gUnknown_082F2DC8:: @ 82F2DC8 - .4byte gUnknown_085ED23C, 0x00000000 - .4byte gUnknown_085ED242, 0x00000000 - .4byte gUnknown_085ED24F, 0x00000000 - .4byte gUnknown_085ED257, 0x00000000 - .4byte gUnknown_085ED260, 0x00000000 + .4byte gText_Upper, 0x00000000 + .4byte gText_Lower, 0x00000000 + .4byte gText_Symbols, 0x00000000 + .4byte gText_Register2, 0x00000000 + .4byte gText_Exit2, 0x00000000 .align 2 gUnknown_082F2DF0:: @ 82F2DF0 @@ -3002,15 +3002,15 @@ gUnknown_082F3290:: @ 82F3290 .align 2 gUnknown_082F32A4:: @ 82F32A4 - .4byte gUnknown_085ED5F0 - .4byte gUnknown_085ED62C - .4byte gUnknown_085ED65C - .4byte gUnknown_085ED6C8 - .4byte gUnknown_085ED704 - .4byte gUnknown_085ED724 - .4byte gUnknown_085ED754 - .4byte gUnknown_085ED788 - .4byte gUnknown_085ED7BC + .4byte gText_ReadyToBerryCrush + .4byte gText_WaitForAllChooseBerry + .4byte gText_EndedWithXUnitsPowder + .4byte gText_RecordingGameResults + .4byte gText_PlayBerryCrushAgain + .4byte gText_YouHaveNoBerries + .4byte gText_MemberDroppedOut + .4byte gText_TimesUpNoGoodPowder + .4byte gText_CommunicationStandby2 .align 2 gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate @@ -3307,12 +3307,12 @@ gUnknown_082F4384:: @ 82F4384 .align 2 gUnknown_082F43B4:: @ 82F43B4 - .4byte gUnknown_085ED7E8 - .4byte gUnknown_085ED7F4 - .4byte gUnknown_085ED7FC - .4byte gUnknown_085ED88C - .4byte gUnknown_085ED8A0 - .4byte gUnknown_085ED8B8 + .4byte gText_SpaceTimes2 + .4byte gText_XDotY + .4byte gText_Var1Berry + .4byte gText_NeatnessRankings + .4byte gText_CoopRankings + .4byte gText_PressingPowerRankings .align 2 gUnknown_082F43CC:: @ 82F43CC @@ -3575,9 +3575,9 @@ gUnknown_082F7B2C:: @ 82F7B2C .align 2 gUnknown_082F7B34:: @ 82F7B34 - .4byte gUnknown_085EDD02 - .4byte gUnknown_085EDD12 - .4byte gUnknown_085EDD1E + .4byte gText_BerriesPicked + .4byte gText_BestScore + .4byte gText_BerriesInRowFivePlayers .align 2 gUnknown_082F7B40:: @ 82F7B40 @@ -4040,11 +4040,11 @@ gUnknown_082FB3C8:: @ 82FB3C8 .align 2 gUnknown_082FB3DC:: @ 82FB3DC - .4byte gUnknown_085EDDAE - .4byte gUnknown_085EDDB1 - .4byte gUnknown_085EDDB4 - .4byte gUnknown_085EDDB7 - .4byte gUnknown_085EDDBA + .4byte gText_1Colon + .4byte gText_2Colon + .4byte gText_3Colon + .4byte gText_4Colon + .4byte gText_5Colon .align 2 gUnknown_082FB3F0:: @ 82FB3F0 @@ -4632,9 +4632,9 @@ gUnknown_082FE270:: @ 82FE270 .align 2 gUnknown_082FE278:: @ 82FE278 - .4byte gUnknown_085EDEA2 - .4byte gUnknown_085EDEB2 - .4byte gUnknown_085EDEBE + .4byte gText_JumpsInARow + .4byte gText_BestScore2 + .4byte gText_ExcellentsInARow .align 2 gPkmnJump321StartPal1:: @ 82FE284 diff --git a/data/strings.s b/data/strings.s index 30143a91b..4d0183a4c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -490,7 +490,7 @@ gText_ThePC:: @ 85E9178 .string "the PC$" .align 2 -gUnknown_085E9180:: @ 85E9180 +gReturnToXStringsTable:: @ 85E9180 .4byte gText_TheField .4byte gText_TheBattle .4byte gText_ThePokemonList @@ -505,7 +505,7 @@ gUnknown_085E9180:: @ 85E9180 .4byte gText_ThePC .align 2 -gUnknown_085E91B0:: @ 85E91B0 +gReturnToXStringsTable2:: @ 85E91B0 .4byte gText_TheField .4byte gText_TheBattle .4byte gText_ThePokemonList @@ -531,7 +531,7 @@ gText_KeyItemsPocket:: @ 85E91F1 .string "KEY ITEMS$" .align 2 -gPocketNames:: @ 85E91FC +gPocketNamesStringsTable:: @ 85E91FC .4byte gText_ItemsPocket .4byte gText_PokeBallsPocket .4byte gText_TMHMPocket @@ -539,29 +539,30 @@ gPocketNames:: @ 85E91FC .4byte gText_KeyItemsPocket .align 2 -gUnknown_085E9210:: @ 85E9210 +gText_UnkF908Var1Clear7Var2:: @ 85E9210 .string "{UNK_CTRL_F908}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}$" -gUnknown_085E921A:: @ 85E921A +gText_ClearTo11Var1Clear5Var2:: @ 85E921A .string "{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}$" -gUnknown_085E9225:: @ 85E9225 +gText_SizeSlash:: @ 85E9225 .string "SIZE /$" -gUnknown_085E922C:: @ 85E922C +gText_FirmSlash:: @ 85E922C .string "FIRM /$" -gUnknown_085E9233:: @ 85E9233 +gText_Var1DotVar2:: @ 85E9233 .string "{STR_VAR_1}.{STR_VAR_2}”$" .include "data/text/berry_firmness_strings.inc" -gUnknown_085E9263:: @ 85E9263 +gText_UnkF908Var1Var2:: @ 85E9263 .string "{UNK_CTRL_F908}{STR_VAR_1} {STR_VAR_2}$" -gUnknown_085E926B:: @ 85E926B +gText_BerryTag:: @ 85E926B .string "BERRY TAG$" + .string "RED {POKEBLOCK}$" .string "BLUE {POKEBLOCK}$" .string "PINK {POKEBLOCK}$" @@ -577,109 +578,112 @@ gUnknown_085E926B:: @ 85E926B .string "WHITE {POKEBLOCK}$" .string "GOLD {POKEBLOCK}$" -gUnknown_085E931D:: @ 85E931D +gText_Spicy:: @ 85E931D .string "SPICY$" -gUnknown_085E9323:: @ 85E9323 +gText_Dry:: @ 85E9323 .string "DRY$" -gUnknown_085E9327:: @ 85E9327 +gText_Sweet:: @ 85E9327 .string "SWEET$" -gUnknown_085E932D:: @ 85E932D +gText_Bitter:: @ 85E932D .string "BITTER$" -gUnknown_085E9334:: @ 85E9334 +gText_Sour:: @ 85E9334 .string "SOUR$" + .string "TASTY$" .string "FEEL$" -gUnknown_085E9344:: @ 85E9344 +gText_StowCase:: @ 85E9344 .string "Stow CASE.$" -gUnknown_085E934F:: @ 85E934F +gText_LvVar1:: @ 85E934F .string "{LV}{STR_VAR_1}$" -gUnknown_085E9353:: @ 85E9353 +gText_ThrowAwayVar1:: @ 85E9353 .string "Throw away this\n{STR_VAR_1}?$" -gUnknown_085E9367:: @ 85E9367 +gText_Var1ThrownAway:: @ 85E9367 .string "The {STR_VAR_1}\nwas thrown away.$" -gUnknown_085E937F:: @ 85E937F +gText_Var1AteTheVar2:: @ 85E937F .string "{STR_VAR_1} ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9390:: @ 85E9390 +gText_Var1HappilyAteVar2:: @ 85E9390 .string "{STR_VAR_1} happily ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E93A9:: @ 85E93A9 +gText_Var1DisdainfullyAteVar2:: @ 85E93A9 .string "{STR_VAR_1} disdainfully ate the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" + .string "BUY$" .string "SELL$" .string "QUIT$" -gUnknown_085E93D5:: @ 85E93D5 +gText_InBagVar1:: @ 85E93D5 .string "IN BAG: {STR_VAR_1}$" -gUnknown_085E93E0:: @ 85E93E0 +gText_QuitShopping:: @ 85E93E0 .string "Quit shopping.$" -gUnknown_085E93EF:: @ 85E93EF +gText_Var1CertainlyHowMany:: @ 85E93EF .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" -gUnknown_085E9417:: @ 85E9417 +gText_Var1CertainlyHowMany2:: @ 85E9417 .string "{STR_VAR_1}? Certainly.\nHow many would you like?$" -gUnknown_085E943F:: @ 85E943F +gText_Var1AndYouWantedVar2:: @ 85E943F .string "{STR_VAR_1}? And you wanted {STR_VAR_2}?\nThat will be ¥{STR_VAR_3}.$" -gUnknown_085E9468:: @ 85E9468 +gText_Var1IsItThatllBeVar2:: @ 85E9468 .string "{STR_VAR_1}, is it?\nThat’ll be ¥{STR_VAR_2}. Do you want it?$" -gUnknown_085E9493:: @ 85E9493 +gText_YouWantedVar1ThatllBeVar2:: @ 85E9493 .string "You wanted {STR_VAR_1}?\nThat’ll be ¥{STR_VAR_2}. Will that be okay?$" -gUnknown_085E94C5:: @ 85E94C5 +gText_HereYouGoThankYou:: @ 85E94C5 .string "Here you go!\nThank you very much.$" -gUnknown_085E94E7:: @ 85E94E7 +gText_ThankYouIllSendItHome:: @ 85E94E7 .string "Thank you!\nI’ll send it to your home PC.$" -gUnknown_085E9510:: @ 85E9510 +gText_ThanksIllSendItHome:: @ 85E9510 .string "Thanks!\nI’ll send it to your PC at home.$" -gUnknown_085E9539:: @ 85E9539 +gText_YouDontHaveMoney:: @ 85E9539 .string "You don’t have enough money.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9558:: @ 85E9558 +gText_NoMoreRoomForThis:: @ 85E9558 .string "You have no more room for this\nitem.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E957F:: @ 85E957F +gText_SpaceForVar1Full:: @ 85E957F .string "The space for {STR_VAR_1} is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E959B:: @ 85E959B +gText_AnythingElseICanHelp:: @ 85E959B .string "Is there anything else I can help\nyou with?$" -gUnknown_085E95C7:: @ 85E95C7 +gText_CanIHelpWithAnythingElse:: @ 85E95C7 .string "Can I help you with anything else?$" -gUnknown_085E95EA:: @ 85E95EA +gText_ThrowInPremierBall:: @ 85E95EA .string "I’ll throw in a PREMIER BALL, too.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E960F:: @ 85E960F +gText_CantBuyKeyItem:: @ 85E960F .string "{STR_VAR_2}? Oh, no.\nI can’t buy that.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E962F:: @ 85E962F +gText_HowManyToSell:: @ 85E962F .string "{STR_VAR_2}?\nHow many would you like to sell?$" -gUnknown_085E9654:: @ 85E9654 +gText_ICanPayVar1:: @ 85E9654 .string "I can pay ¥{STR_VAR_1}.\nWould that be okay?$" -gUnknown_085E9677:: @ 85E9677 +gText_TurnedOverVar1ForVar2:: @ 85E9677 .string "Turned over the {STR_VAR_2}\nand received ¥{STR_VAR_1}.$" -gUnknown_085E969C:: @ 85E969C +gText_PokedollarVar1:: @ 85E969C .string "¥{STR_VAR_1}$" + .string "SHIFT$" .string "SEND OUT$" .string "SWITCH$" @@ -691,165 +695,167 @@ gUnknown_085E969C:: @ 85E969C .string "READ$" .string "TRADE$" -gUnknown_085E96E3:: @ 85E96E3 +gText_HP3:: @ 85E96E3 .string "HP$" -gUnknown_085E96E6:: @ 85E96E6 +gText_SpAtk3:: @ 85E96E6 .string "SP. ATK$" -gUnknown_085E96EE:: @ 85E96EE +gText_SpDef3:: @ 85E96EE .string "SP. DEF$" -gUnknown_085E96F6:: @ 85E96F6 +gText_WontHaveEffect:: @ 85E96F6 .string "It won’t have any effect.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9712:: @ 85E9712 +gText_CantBeUsedOnPkmn:: @ 85E9712 .string "This can’t be used on\nthat POKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9738:: @ 85E9738 +gText_PkmnCantSwitchOut:: @ 85E9738 .string "{STR_VAR_1} can’t be switched\nout!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9754:: @ 85E9754 +gText_PkmnAlreadyInBattle:: @ 85E9754 .string "{STR_VAR_1} is already\nin battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E976F:: @ 85E976F +gText_PkmnAlreadySelected:: @ 85E976F .string "{STR_VAR_1} has already been\nselected.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E978F:: @ 85E978F +gText_PkmnHasNoEnergy:: @ 85E978F .string "{STR_VAR_1} has no energy\nleft to battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97B2:: @ 85E97B2 +gText_CantSwitchWithAlly:: @ 85E97B2 .string "You can’t switch {STR_VAR_1}’s\nPOKéMON with one of yours!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97E5:: @ 85E97E5 +gText_EggCantBattle:: @ 85E97E5 .string "An EGG can’t battle!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E97FC:: @ 85E97FC +gText_CantUseUntilNewBadge:: @ 85E97FC .string "This can’t be used until a new\nBADGE is obtained.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9830:: @ 85E9830 +gText_NoMoreThanVar1Pkmn:: @ 85E9830 .string "No more than {STR_VAR_1} POKéMON\nmay enter.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9855:: @ 85E9855 +gText_SendMailToPC:: @ 85E9855 .string "Send the removed MAIL to\nyour PC?$" -gUnknown_085E9877:: @ 85E9877 +gText_MailSentToPC:: @ 85E9877 .string "The MAIL was sent to your PC.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9897:: @ 85E9897 +gText_PCMailboxFull:: @ 85E9897 .string "Your PC’s MAILBOX is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E98B4:: @ 85E98B4 +gText_MailMessageWillBeLost:: @ 85E98B4 .string "If the MAIL is removed, the\nmessage will be lost. Okay?$" -gUnknown_085E98EC:: @ 85E98EC +gText_RemoveMailBeforeItem:: @ 85E98EC .string "MAIL must be removed before\nholding an item.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E991B:: @ 85E991B +gText_PkmnWasGivenItem:: @ 85E991B .string "{STR_VAR_1} was given the\n{STR_VAR_2} to hold.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E993A:: @ 85E993A +gText_SwitchPkmnItem:: @ 85E993A .string "{STR_VAR_1} is already holding\none {STR_VAR_2}.\pWould you like to switch the\ntwo items?$" -gUnknown_085E9980:: @ 85E9980 +gText_PkmnNotHolding:: @ 85E9980 .string "{STR_VAR_1} isn’t holding\nanything.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E999D:: @ 85E999D +gText_RecievedItemFromPkmn:: @ 85E999D .string "Received the {STR_VAR_2}\nfrom {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E99B8:: @ 85E99B8 +gText_MailTakenFromPkmn:: @ 85E99B8 .string "MAIL was taken from the\nPOKéMON.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E99DB:: @ 85E99DB +gText_SwitchedPkmnItem:: @ 85E99DB .string "The {STR_VAR_2} was taken and\nreplaced with the {STR_VAR_1}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A08:: @ 85E9A08 +gText_PkmnHoldingItemCantHoldMail:: @ 85E9A08 .string "This POKéMON is holding an\nitem. It cannot hold MAIL.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A40:: @ 85E9A40 +gText_MailTransferredFromMailbox:: @ 85E9A40 .string "MAIL was transferred from\nthe MAILBOX.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9A69:: @ 85E9A69 +gText_BagFullCouldNotRemoveItem:: @ 85E9A69 .string "The BAG is full. The POKéMON’s\nitem could not be removed.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9AA5:: @ 85E9AA5 +gText_PkmnLearnedMove3:: @ 85E9AA5 .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" -gUnknown_085E9AB4:: @ 85E9AB4 +gText_PkmnCantLearnMove:: @ 85E9AB4 .string "{STR_VAR_1} and {STR_VAR_2}\nare not compatible.\p{STR_VAR_2} can’t be\nlearned.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9AE9:: @ 85E9AE9 +gText_PkmnNeedsToReplaceMove:: @ 85E9AE9 .string "{STR_VAR_1} wants to learn the\nmove {STR_VAR_2}.\pHowever, {STR_VAR_1} already\nknows four moves.\pShould a move be deleted and\nreplaced with {STR_VAR_2}?$" -gUnknown_085E9B5D:: @ 85E9B5D +gText_StopLearningMove2:: @ 85E9B5D .string "Stop trying to teach\n{STR_VAR_2}?$" -gUnknown_085E9B76:: @ 85E9B76 +gText_MoveNotLearned:: @ 85E9B76 .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9B96:: @ 85E9B96 +gText_WhichMoveToForget:: @ 85E9B96 .string "Which move should be forgotten?{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9BB8:: @ 85E9BB8 +gText_12PoofForgotMove:: @ 85E9BB8 .string "1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C00:: @ 85E9C00 +gText_PkmnAlreadyKnows:: @ 85E9C00 .string "{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C17:: @ 85E9C17 +gText_PkmnHPRestoredByVar2:: @ 85E9C17 .string "{STR_VAR_1}’s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C3E:: @ 85E9C3E +gText_PkmnCuredOfPoison:: @ 85E9C3E .string "{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C5F:: @ 85E9C5F +gText_PkmnCuredOfParalysis:: @ 85E9C5F .string "{STR_VAR_1} was cured of\nparalysis.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C7C:: @ 85E9C7C +gText_PkmnWokeUp2:: @ 85E9C7C .string "{STR_VAR_1} woke up.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9C8A:: @ 85E9C8A +gText_PkmnBurnHealed:: @ 85E9C8A .string "{STR_VAR_1}’s burn was healed.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CA2:: @ 85E9CA2 +gText_PkmnThawedOut:: @ 85E9CA2 .string "{STR_VAR_1} was thawed out.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CB7:: @ 85E9CB7 +gText_PPWasRestored:: @ 85E9CB7 .string "PP was restored.{PAUSE_UNTIL_PRESS}$" + .string "{STR_VAR_1} regained health.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CE0:: @ 85E9CE0 +gText_PkmnBecameHealthy:: @ 85E9CE0 .string "{STR_VAR_1} became healthy.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9CF5:: @ 85E9CF5 +gText_MovesPPIncreased:: @ 85E9CF5 .string "{STR_VAR_1}’s PP increased.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D0A:: @ 85E9D0A +gText_PkmnElevatedToLvVar2:: @ 85E9D0A .string "{STR_VAR_1} was elevated to\nLv. {STR_VAR_2}.$" -gUnknown_085E9D25:: @ 85E9D25 +gText_PkmnBaseVar2StatIncreased:: @ 85E9D25 .string "{STR_VAR_1}’s base {STR_VAR_2}\nstat was raised.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D45:: @ 85E9D45 +gText_PkmnFriendlyBaseVar2Fell:: @ 85E9D45 .string "{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D6D:: @ 85E9D6D +gText_PkmnAdoresBaseVar2Fell:: @ 85E9D6D .string "{STR_VAR_1} adores you!\nThe base {STR_VAR_2} fell!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9D90:: @ 85E9D90 +gText_PkmnFriendlyBaseVar2CantFall:: @ 85E9D90 .string "{STR_VAR_1} turned friendly.\nThe base {STR_VAR_2} can’t fall!{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9DBE:: @ 85E9DBE +gText_PkmnSnappedOutOfConfusion:: @ 85E9DBE .string "{STR_VAR_1} snapped out of its\nconfusion.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9DE1:: @ 85E9DE1 +gText_PkmnGotOverInfatuation:: @ 85E9DE1 .string "{STR_VAR_1} got over its\ninfatuation.{PAUSE_UNTIL_PRESS}$" -gUnknown_085E9E00:: @ 85E9E00 +gText_ThrowAwayItem:: @ 85E9E00 .string "Throw away this\n{STR_VAR_1}?$" -gUnknown_085E9E14:: @ 85E9E14 +gText_ItemThrownAway:: @ 85E9E14 .string "The {STR_VAR_1}\nwas thrown away.{PAUSE_UNTIL_PRESS}$" + .string "Teach which POKéMON?$" .string "Choose a POKéMON.$" .string "Move to where?$" @@ -891,43 +897,43 @@ gUnknown_085E9E14:: @ 85E9E14 .string "DON’T HAVE$" .string "FOURTH$" -gUnknown_085EA0EE:: @ 85EA0EE +gText_PkmnCantParticipate:: @ 85EA0EE .string "That POKéMON can’t participate.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA110:: @ 85EA110 +gText_CancelParticipation:: @ 85EA110 .string "Cancel participation?$" -gUnknown_085EA126:: @ 85EA126 +gText_CancelBattle:: @ 85EA126 .string "Cancel the battle?$" -gUnknown_085EA139:: @ 85EA139 +gText_ReturnToWaitingRoom:: @ 85EA139 .string "Return to the WAITING ROOM?$" -gUnknown_085EA155:: @ 85EA155 +gText_CancelChallenge:: @ 85EA155 .string "Cancel the challenge?$" -gUnknown_085EA16B:: @ 85EA16B +gText_EscapeFromHere:: @ 85EA16B .string "Want to escape from here and return\nto {STR_VAR_1}?$" -gUnknown_085EA196:: @ 85EA196 +gText_ReturnToHealingSpot:: @ 85EA196 .string "Want to return to the healing spot\nused last in {STR_VAR_1}?$" -gUnknown_085EA1CA:: @ 85EA1CA +gText_PauseUntilPress:: @ 85EA1CA .string "{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA1CD:: @ 85EA1CD +gJPText_PutVar1IntoSpinner:: @ 85EA1CD .string "{STR_VAR_1}を ぐるぐるこうかんに\nだして よろしいですか？$" @ "{STR_VAR_1}wo gurugurukoukanni\ndashite yoroshiidesuka?" ("do you want to put {STR_VAR_1} into the spinner?" in Japanese) .align 2 -gUnknown_085EA1E8:: @ 85EA1E8 +gText_OnlyPkmnForBattle:: @ 85EA1E8 .string "That’s your only\nPOKéMON for battle.$" .align 2 -gUnknown_085EA210:: @ 85EA210 +gText_PkmnCantBeTradedNow:: @ 85EA210 .string "That POKéMON can’t be traded\nnow.$" .align 2 -gUnknown_085EA234:: @ 85EA234 +gText_EggCantBeTradedNow:: @ 85EA234 .string "An EGG can’t be traded now.$" .align 2 @@ -945,162 +951,167 @@ gUnknown_085EA234:: @ 85EA234 .align 2 .string "That isn’t an EGG.$" -gUnknown_085EA333:: @ 85EA333 +gText_Register:: @ 85EA333 .string "REGISTER$" -gUnknown_085EA33C:: @ 85EA33C +gText_Attack3:: @ 85EA33C .string "ATTACK$" -gUnknown_085EA343:: @ 85EA343 +gText_Defense3:: @ 85EA343 .string "DEFENSE$" -gUnknown_085EA34B:: @ 85EA34B +gText_SpAtk4:: @ 85EA34B .string "SP. ATK$" -gUnknown_085EA353:: @ 85EA353 +gText_SpDef4:: @ 85EA353 .string "SP. DEF$" -gUnknown_085EA35B:: @ 85EA35B +gText_Speed2:: @ 85EA35B .string "SPEED$" -gUnknown_085EA361:: @ 85EA361 +gText_HP4:: @ 85EA361 .string "HP$" + .string "$" -gUnknown_085EA365:: @ 85EA365 +gText_OTSlash:: @ 85EA365 .string "OT/$" -gUnknown_085EA369:: @ 85EA369 +gText_RentalPkmn:: @ 85EA369 .string "RENTAL POKéMON$" -gUnknown_085EA378:: @ 85EA378 +gText_TypeSlash:: @ 85EA378 .string "TYPE/$" -gUnknown_085EA37E:: @ 85EA37E +gText_Power:: @ 85EA37E .string "POWER$" -gUnknown_085EA384:: @ 85EA384 +gText_Accuracy2:: @ 85EA384 .string "ACCURACY$" -gUnknown_085EA38D:: @ 85EA38D +gText_Appeal:: @ 85EA38D .string "APPEAL$" -gUnknown_085EA394:: @ 85EA394 +gText_Jam:: @ 85EA394 .string "JAM$" -gUnknown_085EA398:: @ 85EA398 +gText_Status:: @ 85EA398 .string "STATUS$" -gUnknown_085EA39F:: @ 85EA39F +gText_ExpPoints:: @ 85EA39F .string "EXP. POINTS$" -gUnknown_085EA3AB:: @ 85EA3AB +gText_NextLv:: @ 85EA3AB .string "NEXT LV.$" -gUnknown_085EA3B4:: @ 85EA3B4 +gText_RibbonsVar1:: @ 85EA3B4 .string "RIBBONS: {STR_VAR_1}$" -gUnknown_085EA3C0:: @ 85EA3C0 +gText_EmptyString5:: @ 85EA3C0 .string "$" + .string "EVENTS$" -gUnknown_085EA3C8:: @ 85EA3C8 +gText_Switch:: @ 85EA3C8 .string "SWITCH$" -gUnknown_085EA3CF:: @ 85EA3CF +gText_PkmnInfo:: @ 85EA3CF .string "POKéMON INFO$" -gUnknown_085EA3DC:: @ 85EA3DC +gText_PkmnSkills:: @ 85EA3DC .string "POKéMON SKILLS$" -gUnknown_085EA3EB:: @ 85EA3EB +gText_BattleMoves:: @ 85EA3EB .string "BATTLE MOVES$" -gUnknown_085EA3F8:: @ 85EA3F8 +gText_ContestMoves:: @ 85EA3F8 .string "C0NTEST MOVES$" -gUnknown_085EA406:: @ 85EA406 +gText_Info:: @ 85EA406 .string "INFO$" -gUnknown_085EA40B:: @ 85EA40B +gText_EggWillTakeALongTime:: @ 85EA40B .string "It looks like this EGG will\ntake a long time to hatch.$" -gUnknown_085EA442:: @ 85EA442 +gText_EggWillTakeSomeTime:: @ 85EA442 .string "What will hatch from this?\nIt will take some time.$" -gUnknown_085EA475:: @ 85EA475 +gText_EggWillHatchSoon:: @ 85EA475 .string "It moves occasionally.\nIt should hatch soon.$" -gUnknown_085EA4A2:: @ 85EA4A2 +gText_EggAboutToHatch:: @ 85EA4A2 .string "It’s making sounds.\nIt’s about to hatch!$" -gUnknown_085EA4CB:: @ 85EA4CB +gText_HMMovesCantBeForgotten2:: @ 85EA4CB .string "HM moves can’t be\nforgotten now.$" -gUnknown_085EA4EC:: @ 85EA4EC +gText_XNatureMetAtYZ:: @ 85EA4EC .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA516:: @ 85EA516 +gText_XNatureHatchedAtYZ:: @ 85EA516 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA544:: @ 85EA544 +gText_XNatureObtainedInTrade:: @ 85EA544 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a trade.$" -gUnknown_085EA56A:: @ 85EA56A +gText_XNatureFatefulEncounter:: @ 85EA56A .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nobtained in a fateful\nencounter at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA5A8:: @ 85EA5A8 +gText_XNatureProbablyMetAt:: @ 85EA5A8 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nprobably met at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01},\n{SPECIAL_F7 0x00}{SPECIAL_F7 0x04}{SPECIAL_F7 0x01}.$" -gUnknown_085EA5DB:: @ 85EA5DB +gText_XNature:: @ 85EA5DB .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature$" -gUnknown_085EA5EB:: @ 85EA5EB +gText_XNatureMetSomewhereAt:: @ 85EA5EB .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nmet somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA617:: @ 85EA617 +gText_XNatureHatchedSomewhereAt:: @ 85EA617 .string "{SPECIAL_F7 0x00}{SPECIAL_F7 0x02}{SPECIAL_F7 0x01}{SPECIAL_F7 0x05} nature,\nhatched somewhere at {UNK_CTRL_F905}{SPECIAL_F7 0x00}{SPECIAL_F7 0x03}{SPECIAL_F7 0x01}.$" -gUnknown_085EA647:: @ 85EA647 +gText_OddEggFoundByCouple:: @ 85EA647 .string "An odd POKéMON EGG found\nby the DAY CARE couple.$" -gUnknown_085EA678:: @ 85EA678 +gText_PeculiarEggNicePlace:: @ 85EA678 .string "A peculiar POKéMON EGG\nobtained at the nice place.$" -gUnknown_085EA6AB:: @ 85EA6AB +gText_PeculiarEggTrade:: @ 85EA6AB .string "A peculiar POKéMON EGG\nobtained in a trade.$" -gUnknown_085EA6D7:: @ 85EA6D7 +gText_EggFromHotSprings:: @ 85EA6D7 .string "A POKéMON EGG obtained\nat the hot springs.$" -gUnknown_085EA702:: @ 85EA702 +gText_EggFromTraveler:: @ 85EA702 .string "An odd POKéMON EGG\nobtained from a traveler.$" -gUnknown_085EA72F:: @ 85EA72F +gText_ApostropheSBase:: @ 85EA72F .string "’s BASE$" -gUnknown_085EA737:: @ 85EA737 +gText_OkayToDeleteFromRegistry:: @ 85EA737 .string "Is it okay to delete {STR_VAR_1}\nfrom the REGISTRY?$" -gUnknown_085EA762:: @ 85EA762 +gText_RegisteredDataDeleted:: @ 85EA762 .string "The registered data was deleted.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EA785:: @ 85EA785 +gText_NoRegistry:: @ 85EA785 .string "There is no REGISTRY.{PAUSE_UNTIL_PRESS}$" + .string "DEL REGIST.$" .string "{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}$" .string "DECORATE$" .string "PUT AWAY$" .string "TOSS$" -gUnknown_085EA7C8:: @ 85EA7C8 +gText_Color161Shadow161:: @ 85EA7C8 .string "{COLOR 161}{SHADOW 161}$" + .string "Put out the selected decoration item.$" .string "Store the chosen decoration in the PC.$" .string "Throw away unwanted decorations.$" -gUnknown_085EA83D:: @ 85EA83D +gText_NoDecorations:: @ 85EA83D .string "There are no decorations.{PAUSE_UNTIL_PRESS}$" + .string "DESK$" .string "CHAIR$" .string "PLANT$" @@ -1110,57 +1121,59 @@ gUnknown_085EA83D:: @ 85EA83D .string "DOLL$" .string "CUSHION$" -gUnknown_085EA88B:: @ 85EA88B +gText_Gold:: @ 85EA88B .string "GOLD$" -gUnknown_085EA890:: @ 85EA890 +gText_Silver:: @ 85EA890 .string "SILVER$" -gUnknown_085EA897:: @ 85EA897 +gText_PlaceItHere:: @ 85EA897 .string "Place it here?$" -gUnknown_085EA8A6:: @ 85EA8A6 +gText_CantBePlacedHere:: @ 85EA8A6 .string "It can’t be placed here.$" -gUnknown_085EA8BF:: @ 85EA8BF +gText_CancelDecorating:: @ 85EA8BF .string "Cancel decorating?$" -gUnknown_085EA8D2:: @ 85EA8D2 +gText_InUseAlready:: @ 85EA8D2 .string "This is in use already.$" -gUnknown_085EA8EA:: @ 85EA8EA +gText_NoMoreDecorations:: @ 85EA8EA .string "No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.$" -gUnknown_085EA931:: @ 85EA931 +gText_NoMoreDecorations2:: @ 85EA931 .string "No more decorations can be placed.\nThe most that can be placed are {STR_VAR_1}.$" + .string "This can’t be placed here.\nIt must be on a DESK, etc.$" -gUnknown_085EA9AE:: @ 85EA9AE +gText_CantPlaceInRoom:: @ 85EA9AE .string "This decoration can’t be placed in\nyour own room.$" -gUnknown_085EA9E0:: @ 85EA9E0 +gText_CantThrowAwayInUse:: @ 85EA9E0 .string "This decoration is in use.\nIt can’t be thrown away.$" -gUnknown_085EAA14:: @ 85EAA14 +gText_DecorationWillBeDiscarded:: @ 85EAA14 .string "This {STR_VAR_1} will be discarded.\nIs that okay?$" -gUnknown_085EAA3D:: @ 85EAA3D +gText_DecorationThrownAway:: @ 85EAA3D .string "The decoration item was thrown away.$" -gUnknown_085EAA62:: @ 85EAA62 +gText_StopPuttingAwayDecorations:: @ 85EAA62 .string "Stop putting away decorations?$" -gUnknown_085EAA81:: @ 85EAA81 +gText_NoDecorationHere:: @ 85EAA81 .string "There is no decoration item here.$" -gUnknown_085EAAA3:: @ 85EAAA3 +gText_ReturnDecorationToPC:: @ 85EAAA3 .string "Return this decoration to the PC?$" -gUnknown_085EAAC5:: @ 85EAAC5 +gText_DecorationReturnedToPC:: @ 85EAAC5 .string "The decoration was returned to the PC.$" -gUnknown_085EAAEC:: @ 85EAAEC +gText_NoDecorationsInUse:: @ 85EAAEC .string "There are no decorations in use.{PAUSE_UNTIL_PRESS}$" + .string "TRISTAN$" .string "PHILIP$" .string "DENNIS$" @@ -1169,72 +1182,76 @@ gUnknown_085EAAEC:: @ 85EAAEC .string "DECORATION$" .string "ITEM STORAGE$" -gUnknown_085EAB4E:: @ 85EAB4E +gText_Mailbox:: @ 85EAB4E .string "MAILBOX$" + .string "DEPOSIT ITEM$" -gUnknown_085EAB63:: @ 85EAB63 +gText_WithdrawItem:: @ 85EAB63 .string "WITHDRAW ITEM$" -gUnknown_085EAB71:: @ 85EAB71 +gText_TossItem:: @ 85EAB71 .string "TOSS ITEM$" + .string "Store items in the PC.$" .string "Take out items from the PC.$" .string "Throw away items stored in the PC.$" -gUnknown_085EABD1:: @ 85EABD1 +gText_NoItems:: @ 85EABD1 .string "There are no items.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EABE7:: @ 85EABE7 +gText_NoRoomInBag:: @ 85EABE7 .string "There is no more\nroom in the BAG.$" -gUnknown_085EAC09:: @ 85EAC09 +gText_WithdrawHowManyItems:: @ 85EAC09 .string "Withdraw how many\n{STR_VAR_1}(s)?$" -gUnknown_085EAC22:: @ 85EAC22 +gText_WithdrawXItems:: @ 85EAC22 .string "Withdrew {STR_VAR_2}\n{STR_VAR_1}(s).$" + .string "READ$" .string "MOVE TO BAG$" .string "GIVE$" -gUnknown_085EAC4B:: @ 85EAC4B +gText_NoMailHere:: @ 85EAC4B .string "There’s no MAIL here.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAC63:: @ 85EAC63 +gText_WhatToDoWithVar1sMail:: @ 85EAC63 .string "What would you like to do with\n{STR_VAR_1}’s MAIL?$" -gUnknown_085EAC8D:: @ 85EAC8D +gText_MessageWillBeLost:: @ 85EAC8D .string "The message will be lost.\nIs that okay?$" -gUnknown_085EACB5:: @ 85EACB5 +gText_BagIsFull:: @ 85EACB5 .string "The BAG is full.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EACC8:: @ 85EACC8 +gText_MailToBagMessageErased:: @ 85EACC8 .string "The MAIL was returned to the BAG\nwith its message erased.{PAUSE_UNTIL_PRESS}$" -gUnknown_085EAD04:: @ 85EAD04 +gText_Dad:: @ 85EAD04 .string "DAD$" -gUnknown_085EAD08:: @ 85EAD08 +gText_Mom:: @ 85EAD08 .string "MOM$" -gUnknown_085EAD0C:: @ 85EAD0C +gText_Wallace:: @ 85EAD0C .string "WALLACE$" -gUnknown_085EAD14:: @ 85EAD14 +gText_Steven:: @ 85EAD14 .string "STEVEN$" -gUnknown_085EAD1B:: @ 85EAD1B +gText_Brawly:: @ 85EAD1B .string "BRAWLY$" -gUnknown_085EAD22:: @ 85EAD22 +gText_Winona:: @ 85EAD22 .string "WINONA$" -gUnknown_085EAD29:: @ 85EAD29 +gText_Phoebe:: @ 85EAD29 .string "PHOEBE$" -gUnknown_085EAD30:: @ 85EAD30 +gText_Glacia:: @ 85EAD30 .string "GLACIA$" + .string "PETALBURG$" .string "SLATEPORT$" .string "LITTLEROOT$" @@ -1269,11 +1286,12 @@ gUnknown_085EAD30:: @ 85EAD30 .string "Saw it$" .string "Not yet$" -gUnknown_085EAE62:: @ 85EAE62 +gText_Yes:: @ 85EAE62 .string "YES$" -gUnknown_085EAE66:: @ 85EAE66 +gText_No:: @ 85EAE66 .string "NO$" + .string "INFO$" .string "SINGLE BATTLE$" .string "DOUBLE BATTLE$" @@ -1282,11 +1300,12 @@ gUnknown_085EAE66:: @ 85EAE66 .string "CHALLENGE$" .string "INFO$" -gUnknown_085EAEB1:: @ 85EAEB1 +gText_Lv50:: @ 85EAEB1 .string "LV. 50$" -gUnknown_085EAEB8:: @ 85EAEB8 +gText_OpenLevel:: @ 85EAEB8 .string "OPEN LEVEL$" + .string "FRESH WATER{CLEAR_TO 0x48}¥200$" .string "SODA POP{CLEAR_TO 0x48}¥300$" .string "LEMONADE{CLEAR_TO 0x48}¥350$" @@ -1327,20 +1346,21 @@ gUnknown_085EAEB8:: @ 85EAEB8 .string "TM24{CLEAR_TO 0x48}4,000 COINS$" .string "TM13{CLEAR_TO 0x48}4,000 COINS$" -gUnknown_085EB0E8:: @ 85EB0E8 +gText_Cool:: @ 85EB0E8 .string "COOL$" -gUnknown_085EB0ED:: @ 85EB0ED +gText_Beauty:: @ 85EB0ED .string "BEAUTY$" -gUnknown_085EB0F4:: @ 85EB0F4 +gText_Cute:: @ 85EB0F4 .string "CUTE$" -gUnknown_085EB0F9:: @ 85EB0F9 +gText_Smart:: @ 85EB0F9 .string "SMART$" -gUnknown_085EB0FF:: @ 85EB0FF +gText_Tough:: @ 85EB0FF .string "TOUGH$" + .string "NORMAL$" .string "SUPER$" .string "HYPER$" @@ -1356,20 +1376,21 @@ gUnknown_085EB0FF:: @ 85EB0FF .string "TMs & HMs$" .string "BERRIES$" -gUnknown_085EB169:: @ 85EB169 +gText_SomeonesPC:: @ 85EB169 .string "SOMEONE’S PC$" -gUnknown_085EB176:: @ 85EB176 +gText_LanettesPC:: @ 85EB176 .string "LANETTE’S PC$" -gUnknown_085EB183:: @ 85EB183 +gText_PlayersPC:: @ 85EB183 .string "{PLAYER}’s PC$" -gUnknown_085EB18B:: @ 85EB18B +gText_HallOfFame:: @ 85EB18B .string "HALL OF FAME$" -gUnknown_085EB198:: @ 85EB198 +gText_LogOff:: @ 85EB198 .string "LOG OFF$" + .string "OPPONENT$" .string "TOURNEY TREE$" .string "READY TO START$" @@ -1389,28 +1410,31 @@ gUnknown_085EB198:: @ 85EB198 .string "E-MODE$" .string "G-MODE$" -gUnknown_085EB25C:: @ 85EB25C +gText_MenuOptionPokedex:: @ 85EB25C .string "POKéDEX$" -gUnknown_085EB264:: @ 85EB264 +gText_MenuOptionPokemon:: @ 85EB264 .string "POKéMON$" -gUnknown_085EB26C:: @ 85EB26C +gText_MenuOptionBag:: @ 85EB26C .string "BAG$" -gUnknown_085EB270:: @ 85EB270 +gText_MenuOptionPokenav:: @ 85EB270 .string "POKéNAV$" + .string "$" -gUnknown_085EB279:: @ 85EB279 +gText_MenuOptionSave:: @ 85EB279 .string "SAVE$" -gUnknown_085EB27E:: @ 85EB27E +gText_MenuOptionOption:: @ 85EB27E .string "OPTION$" -gUnknown_085EB285:: @ 85EB285 +gText_MenuOptionExit:: @ 85EB285 .string "EXIT$" - .string " 5BP$" + + .align 2 + .string "5BP$" .string "10BP$" .string "15BP$" .string "RED TENT$" @@ -1482,30 +1506,32 @@ gUnknown_085EB285:: @ 85EB285 .string "REST$" .string "RETIRE$" -gUnknown_085EB5CF:: @ 85EB5CF +gText_99TimesPlus:: @ 85EB5CF .string "99 times +$" -gUnknown_085EB5DA:: @ 85EB5DA +gText_1MinutePlus:: @ 85EB5DA .string "1 minute +$" -gUnknown_085EB5E5:: @ 85EB5E5 +gText_SpaceSeconds:: @ 85EB5E5 .string " seconds$" -gUnknown_085EB5EE:: @ 85EB5EE +gText_SpaceTimes:: @ 85EB5EE .string " time(s)$" + .string ".$" -gUnknown_085EB5F9:: @ 85EB5F9 +gText_BigGuy:: @ 85EB5F9 .string "Big guy$" -gUnknown_085EB601:: @ 85EB601 +gText_BigGirl:: @ 85EB601 .string "Big girl$" -gUnknown_085EB60A:: @ 85EB60A +gText_Son:: @ 85EB60A .string "son$" -gUnknown_085EB60E:: @ 85EB60E +gText_Daughter:: @ 85EB60E .string "daughter$" + .string "BLUE FLUTE$" .string "YELLOW FLUTE$" .string "RED FLUTE$" @@ -1530,11 +1556,12 @@ gUnknown_085EB60E:: @ 85EB60E .string "B4F$" .string "ROOFTOP$" -gUnknown_085EB6A5:: @ 85EB6A5 +gText_ElevatorNowOn:: @ 85EB6A5 .string "Now on:$" -gUnknown_085EB6AD:: @ 85EB6AD +gText_BP:: @ 85EB6AD .string "BP$" + .string "ENERGYPOWDER{CLEAR_TO 0x72}{SIZE 0}50$" .string "ENERGY ROOT{CLEAR_TO 0x72}{SIZE 0}80$" .string "HEAL POWDER{CLEAR_TO 0x72}{SIZE 0}50$" @@ -1555,8 +1582,9 @@ gUnknown_085EB6AD:: @ 85EB6AD .string "SKY PILLAR$" .string "Don’t remember$" -gUnknown_085EB7EA:: @ 85EB7EA +gText_Exit:: @ 85EB7EA .string "EXIT$" + .string "Exit from the BOX?$" .string "What do you want to do?$" .string "Please pick a theme.$" @@ -1637,22 +1665,24 @@ gUnknown_085EB7EA:: @ 85EB7EA .string "Move items held by any POKéMON\nin a BOX or your party.$" .string "Return to the previous menu.$" -gUnknown_085EBC89:: @ 85EBC89 +gText_JustOnePkmn:: @ 85EBC89 .string "There is just one POKéMON with you.$" -gUnknown_085EBCAD:: @ 85EBCAD +gText_PartyFull:: @ 85EBCAD .string "Your party is full!$" -gUnknown_085EBCC1:: @ 85EBCC1 +gText_Box:: @ 85EBCC1 .string "BOX$" + .string "Check the map of the HOENN region.$" .string "Check POKéMON in detail.$" .string "Call a registered TRAINER.$" .string "Check obtained RIBBONS.$" .string "Put away the POKéNAV.$" -gUnknown_085EBD4A:: @ 85EBD4A +gText_NoRibbonWinners:: @ 85EBD4A .string "There are no RIBBON winners.$" + .string "No TRAINERS are registered.$" .string "Check party POKéMON in detail.$" .string "Check all POKéMON in detail.$" @@ -1664,11 +1694,12 @@ gUnknown_085EBD4A:: @ 85EBD4A .string "Find tough POKéMON.$" .string "Return to the CONDITION menu.$" -gUnknown_085EBE5F:: @ 85EBE5F +gText_NumberRegistered:: @ 85EBE5F .string "No. registered$" -gUnknown_085EBE6E:: @ 85EBE6E +gText_NumberOfBattles:: @ 85EBE6E .string "No. of battles$" + .string "DETAIL$" .string "CALL$" .string "EXIT$" @@ -1689,33 +1720,36 @@ gUnknown_085EBE6E:: @ 85EBE6E .string "{UNK_CTRL_F800}CHECK {UNK_CTRL_F801}CANCEL$" .string "{UNK_CTRL_F801}CANCEL$" -gUnknown_085EBF8D:: @ 85EBF8D +gText_NatureSlash:: @ 85EBF8D .string "NATURE/$" -gUnknown_085EBF95:: @ 85EBF95 +gText_TrainerCloseBy:: @ 85EBF95 .string "That TRAINER is close by.\nTalk to the TRAINER in person!$" -gUnknown_085EBFCE:: @ 85EBFCE +gText_InParty:: @ 85EBFCE .string "IN PARTY$" -gUnknown_085EBFD7:: @ 85EBFD7 +gText_Number2:: @ 85EBFD7 .string "No. $" + .string "RIBBONS$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}$" .string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}$" -gUnknown_085EC00F:: @ 85EC00F +gText_Unknown:: @ 85EC00F .string "UNKNOWN$" + .string "CALL$" .string "CHECK$" .string "CANCEL$" -gUnknown_085EC029:: @ 85EC029 +gText_NumberF700:: @ 85EC029 .string "No. {SPECIAL_F7 0x00}$" -gUnknown_085EC030:: @ 85EC030 +gText_RibbonsF700:: @ 85EC030 .string "RIBBONS {SPECIAL_F7 0x00}$" + .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_RED WHITE GREEN}♂{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" .string "{SPECIAL_F7 0x00}{COLOR_HIGHLIGHT_SHADOW LIGHT_GREEN WHITE BLUE}♀{COLOR_HIGHLIGHT_SHADOW DARK_GREY WHITE LIGHT_GREY}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" .string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$" @@ -1756,34 +1790,38 @@ gUnknown_085EC030:: @ 85EC030 .string "The quiz:$" .string "Apprentice’s phrase:$" -gUnknown_085EC3A6:: @ 85EC3A6 +gText_QuitEditing:: @ 85EC3A6 .string "Quit editing?$" -gUnknown_085EC3B4:: @ 85EC3B4 +gText_StopGivingPkmnMail:: @ 85EC3B4 .string "Stop giving the POKéMON MAIL?$" + .string "and fill out the questionnaire.$" .string "Let’s reply to the interview!$" -gUnknown_085EC410:: @ 85EC410 +gText_AllTextBeingEditedWill:: @ 85EC410 .string "All the text being edited will$" -gUnknown_085EC42F:: @ 85EC42F +gText_BeDeletedThatOkay:: @ 85EC42F .string "be deleted. Is that okay?$" + .string "Quit editing?$" .string "The edited text will not be saved.$" .string "Is that okay?$" .string "Please enter a phrase or word.$" .string "The entire text can’t be deleted.$" -gUnknown_085EC4C9:: @ 85EC4C9 +gText_OnlyOnePhrase:: @ 85EC4C9 .string "Only one phrase may be changed.$" -gUnknown_085EC4E9:: @ 85EC4E9 +gText_OriginalSongWillBeUsed:: @ 85EC4E9 .string "The original song will be used.$" + .string "That’s trendy already!$" -gUnknown_085EC520:: @ 85EC520 +gText_CombineTwoWordsOrPhrases:: @ 85EC520 .string "Combine two words or phrases.$" + .string "Quit giving information?$" .string "Stop giving the POKéMON MAIL?$" .string "Create a quiz!$" @@ -1802,166 +1840,171 @@ gUnknown_085EC520:: @ 85EC520 .string "Apprentice’s phrase$" .string "QUESTIONNAIRE$" -gUnknown_085EC672:: @ 85EC672 +gText_YouCannotQuitHere:: @ 85EC672 .string "You cannot quit here.$" -gUnknown_085EC688:: @ 85EC688 +gText_SectionMustBeCompleted:: @ 85EC688 .string "This section must be completed.$" -gUnknown_085EC6A8:: @ 85EC6A8 +gText_F700sQuiz:: @ 85EC6A8 .string "{SPECIAL_F7 0x00}’s quiz$" -gUnknown_085EC6B2:: @ 85EC6B2 +gText_Lady:: @ 85EC6B2 .string "Lady$" + .string "After you have read the quiz$" .string "question, press the A Button.$" .string "The quiz answer is?$" -gUnknown_085EC706:: @ 85EC706 +gText_LikeToQuitQuiz:: @ 85EC706 .string "Would you like to quit this quiz$" -gUnknown_085EC727:: @ 85EC727 +gText_ChallengeQuestionMark:: @ 85EC727 .string "challenge?$" + .string "Is this quiz OK?$" -gUnknown_085EC743:: @ 85EC743 +gText_CreateAQuiz:: @ 85EC743 .string "Create a quiz!$" -gUnknown_085EC752:: @ 85EC752 +gText_SelectTheAnswer:: @ 85EC752 .string "Select the answer!$" -gUnknown_085EC765:: @ 85EC765 +gText_LyricsCantBeDeleted:: @ 85EC765 .string "The lyrics can’t be deleted.$" + .string "POKéMON LEAGUE$" .string "POKéMON CENTER$" -gUnknown_085EC7A0:: @ 85EC7A0 +gText_GetsAPokeBlockQuestion:: @ 85EC7A0 .string " gets a {POKEBLOCK}?$" + .string "Coolness $" .string "Beauty $" .string "Cuteness $" .string "Smartness $" .string "Toughness $" -gUnknown_085EC7E1:: @ 85EC7E1 +gText_WasEnhanced:: @ 85EC7E1 .string "was enhanced!$" -gUnknown_085EC7EF:: @ 85EC7EF +gText_NothingChanged:: @ 85EC7EF .string "Nothing changed!$" -gUnknown_085EC800:: @ 85EC800 +gText_WontEatAnymore:: @ 85EC800 .string "It won’t eat anymore…$" -gUnknown_085EC816:: @ 85EC816 +gText_SaveFailedCheckingBackup:: @ 85EC816 .string "Save failed. Checking the backup\nmemory… Please wait.\n{COLOR RED}“Time required: about 1 minute”$" -gUnknown_085EC86F:: @ 85EC86F +gText_BackupMemoryDamaged:: @ 85EC86F .string "The backup memory is damaged, or\nthe internal battery has run dry.\nYou can still play, but not save.$" -gUnknown_085EC8D4:: @ 85EC8D4 +gText_GamePlayCannotBeContinued:: @ 85EC8D4 .string "{COLOR RED}“Game play cannot be continued.\nReturning to the title screen…”$" -gUnknown_085EC917:: @ 85EC917 +gText_CheckCompleted:: @ 85EC917 .string "Check completed.\nAttempting to save again.\nPlease wait.$" -gUnknown_085EC94F:: @ 85EC94F +gText_SaveCompleteGameCannotContinue:: @ 85EC94F .string "Save completed.\n{COLOR RED}“Game play cannot be continued.\nReturning to the title screen.”$" -gUnknown_085EC9A2:: @ 85EC9A2 +gText_SaveCompletePressA:: @ 85EC9A2 .string "Save completed.\n{COLOR RED}“Please press the A Button.”$" -gUnknown_085EC9D2:: @ 85EC9D2 +gText_Ferry:: @ 85EC9D2 .string "FERRY$" -gUnknown_085EC9D8:: @ 85EC9D8 +gText_SecretBase:: @ 85EC9D8 .string "SECRET BASE$" -gUnknown_085EC9E4:: @ 85EC9E4 +gText_Hideout:: @ 85EC9E4 .string "HIDEOUT$" -gUnknown_085EC9EC:: @ 85EC9EC +gText_ResetRTCConfirmCancel:: @ 85EC9EC .string "Reset RTC?\nA: Confirm, B: Cancel$" -gUnknown_085ECA0D:: @ 85ECA0D +gText_PresentTime:: @ 85ECA0D .string "Present time in game$" -gUnknown_085ECA22:: @ 85ECA22 +gText_PreviousTime:: @ 85ECA22 .string "Previous time in game$" -gUnknown_085ECA38:: @ 85ECA38 +gText_PleaseResetTime:: @ 85ECA38 .string "Please reset the time.$" -gUnknown_085ECA4F:: @ 85ECA4F +gText_ClockHasBeenReset:: @ 85ECA4F .string "The clock has been reset.\nData will be saved. Please wait.$" -gUnknown_085ECA8A:: @ 85ECA8A +gText_SaveCompleted:: @ 85ECA8A .string "Save completed.$" -gUnknown_085ECA9A:: @ 85ECA9A +gText_SaveFailed:: @ 85ECA9A .string "Save failed…$" -gUnknown_085ECAA7:: @ 85ECAA7 +gText_NoSaveFileCantSetTime:: @ 85ECAA7 .string "There is no save file, so the time\ncan’t be set.$" -gUnknown_085ECAD8:: @ 85ECAD8 +gText_InGameClockUsable:: @ 85ECAD8 .string "The in-game clock adjustment system\nis now useable.$" -gUnknown_085ECB0C:: @ 85ECB0C +gText_Slots:: @ 85ECB0C .string "SLOTS$" -gUnknown_085ECB12:: @ 85ECB12 +gText_Roulette:: @ 85ECB12 .string "ROULETTE$" -gUnknown_085ECB1B:: @ 85ECB1B +gText_Good:: @ 85ECB1B .string "Good$" -gUnknown_085ECB20:: @ 85ECB20 +gText_VeryGood:: @ 85ECB20 .string "Very good$" -gUnknown_085ECB2A:: @ 85ECB2A +gText_Excellent:: @ 85ECB2A .string "Excellent$" -gUnknown_085ECB34:: @ 85ECB34 +gText_SoSo:: @ 85ECB34 .string "So-so$" -gUnknown_085ECB3A:: @ 85ECB3A +gText_Bad:: @ 85ECB3A .string "Bad$" -gUnknown_085ECB3E:: @ 85ECB3E +gText_TheWorst:: @ 85ECB3E .string "The worst$" -gUnknown_085ECB48:: @ 85ECB48 +gText_Spicy2:: @ 85ECB48 .string "spicy$" -gUnknown_085ECB4E:: @ 85ECB4E +gText_Dry2:: @ 85ECB4E .string "dry$" -gUnknown_085ECB52:: @ 85ECB52 +gText_Sweet2:: @ 85ECB52 .string "sweet$" -gUnknown_085ECB58:: @ 85ECB58 +gText_Bitter2:: @ 85ECB58 .string "bitter$" -gUnknown_085ECB5F:: @ 85ECB5F +gText_Sour2:: @ 85ECB5F .string "sour$" -gUnknown_085ECB64:: @ 85ECB64 +gText_Single:: @ 85ECB64 .string "SINGLE$" -gUnknown_085ECB6B:: @ 85ECB6B +gText_Double:: @ 85ECB6B .string "DOUBLE$" -gUnknown_085ECB72:: @ 85ECB72 +gText_Jackpot:: @ 85ECB72 .string "jackpot$" -gUnknown_085ECB7A:: @ 85ECB7A +gText_First:: @ 85ECB7A .string "first$" -gUnknown_085ECB80:: @ 85ECB80 +gText_Second:: @ 85ECB80 .string "second$" -gUnknown_085ECB87:: @ 85ECB87 +gText_Third:: @ 85ECB87 .string "third$" + .string "0 pts$" .string "10 pts$" .string "20 pts$" @@ -2025,79 +2068,84 @@ gUnknown_085ECB87:: @ 85ECB87 .string "THUNDERPUNCH{CLEAR_TO 0x4E}48BP$" .string "FIRE PUNCH{CLEAR_TO 0x4E}48BP$" -gUnknown_085ECF5D:: @ 85ECF5D +gText_PkmnFainted3:: @ 85ECF5D .string "{STR_VAR_1} fainted…\p\n$" -gOtherText_Marco:: @ 85ECF6B +gText_Marco:: @ 85ECF6B .string "MARCO$" -gUnknown_085ECF71:: @ 85ECF71 +gText_TrainerCardName:: @ 85ECF71 .string "NAME: $" -gUnknown_085ECF78:: @ 85ECF78 +gText_TrainerCardIDNo:: @ 85ECF78 .string "IDNo.$" -gUnknown_085ECF7E:: @ 85ECF7E +gText_TrainerCardMoney:: @ 85ECF7E .string "MONEY$" + .string "¥$" -gUnknown_085ECF86:: @ 85ECF86 +gText_TrainerCardPokedex:: @ 85ECF86 .string "POKéDEX$" -gUnknown_085ECF8E:: @ 85ECF8E +gText_EmptyString6:: @ 85ECF8E .string "$" -gUnknown_085ECF8F:: @ 85ECF8F +gText_Colon2:: @ 85ECF8F .string ":$" + .string " points$" -gUnknown_085ECF99:: @ 85ECF99 +gText_TrainerCardTime:: @ 85ECF99 .string "TIME$" + .string "ゲ-ムポイント$" @ "geemupointo" ("game point" in Japanese) -gUnknown_085ECFA6:: @ 85ECFA6 +gText_Var1sTrainerCard:: @ 85ECFA6 .string "{STR_VAR_1}’s TRAINER CARD$" -gUnknown_085ECFB8:: @ 85ECFB8 +gText_HallOfFameDebut:: @ 85ECFB8 .string "HALL OF FAME DEBUT $" + .string "LINK BATTLES$" .string "LINK CABLE BATTLES$" -gUnknown_085ECFED:: @ 85ECFED +gText_WinsLosses:: @ 85ECFED .string "W:{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} L:{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}$" -gUnknown_085ED010:: @ 85ED010 +gText_PokemonTrades:: @ 85ED010 .string "POKéMON TRADES$" -gUnknown_085ED01F:: @ 85ED01F +gText_UnionTradesAndBattles:: @ 85ED01F .string "UNION TRADES & BATTLES$" -gUnknown_085ED036:: @ 85ED036 +gText_BerryCrush:: @ 85ED036 .string "BERRY CRUSH$" -gUnknown_085ED042:: @ 85ED042 +gText_WaitingTrainerFinishReading:: @ 85ED042 .string "Waiting for the other TRAINER to\nfinish reading your TRAINER CARD.$" -gUnknown_085ED085:: @ 85ED085 +gText_PokeblocksWithFriends:: @ 85ED085 .string "{POKEBLOCK}S W/FRIENDS$" -gUnknown_085ED096:: @ 85ED096 +gText_Var1DarkGreyShadowLightGrey:: @ 85ED096 .string "{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}$" -gUnknown_085ED09F:: @ 85ED09F +gText_WonContestsWFriends:: @ 85ED09F .string "WON CONTESTS W/FRIENDS$" -gUnknown_085ED0B6:: @ 85ED0B6 +gText_BattlePtsWon:: @ 85ED0B6 .string "BATTLE POINTS WON$" -gUnknown_085ED0C8:: @ 85ED0C8 +gText_Var1DarkLightGreyBP:: @ 85ED0C8 .string "{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}BP$" -gUnknown_085ED0D3:: @ 85ED0D3 +gText_BattleTower:: @ 85ED0D3 .string "BATTLE TOWER$" -gUnknown_085ED0E0:: @ 85ED0E0 +gText_WSlashStraightSlash:: @ 85ED0E0 .string "W/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_1}{COLOR DARK_GREY}{SHADOW LIGHT_GREY} STRAIGHT/{COLOR RED}{SHADOW LIGHT_RED}{STR_VAR_2}$" + .string "BATTLE TOWER$" .string "BATTLE DOME$" .string "BATTLE PALACE$" @@ -2121,147 +2169,151 @@ gUnknown_085ED0E0:: @ 85ED0E0 .align 2 .string "{STR_VAR_1}$" -gUnknown_085ED193:: @ 85ED193 +gText_Give:: @ 85ED193 .string "Give$" -gUnknown_085ED198:: @ 85ED198 +gText_NoNeed:: @ 85ED198 .string "No need$" -gUnknown_085ED1A0:: @ 85ED1A0 +gText_ColorLightShadowDarkGrey:: @ 85ED1A0 .string "{COLOR LIGHT_GREY}{SHADOW DARK_GREY}$" -gUnknown_085ED1A7:: @ 85ED1A7 +gText_ColorBlue:: @ 85ED1A7 .string "{COLOR BLUE}$" -gUnknown_085ED1AB:: @ 85ED1AB +gText_ColorTransparent:: @ 85ED1AB .string "{HIGHLIGHT TRANSPARENT}{COLOR TRANSPARENT}$" -gUnknown_085ED1B2:: @ 85ED1B2 +gText_CDot:: @ 85ED1B2 .string "C.$" -gUnknown_085ED1B5:: @ 85ED1B5 +gText_BDot:: @ 85ED1B5 .string "B.$" -gUnknown_085ED1B8:: @ 85ED1B8 +gText_AnnouncingResults:: @ 85ED1B8 .string "Announcing the results!$" -gUnknown_085ED1D0:: @ 85ED1D0 +gText_PreliminaryResults:: @ 85ED1D0 .string "The preliminary results!$" -gUnknown_085ED1E9:: @ 85ED1E9 +gText_Round2Results:: @ 85ED1E9 .string "Round 2 results!$" -gUnknown_085ED1FA:: @ 85ED1FA +gText_Var1sVar2Won:: @ 85ED1FA .string "{STR_VAR_1}’s {STR_VAR_2} won!$" -gUnknown_085ED207:: @ 85ED207 +gText_CommunicationStandby:: @ 85ED207 .string "Communication standby…$" -gUnknown_085ED21E:: @ 85ED21E +gText_ColorDarkGrey:: @ 85ED21E .string "{COLOR DARK_GREY}$" + .string "{COLOR_HIGHLIGHT_SHADOW DYNAMIC_COLOR6 WHITE DYNAMIC_COLOR5}$" -gUnknown_085ED228:: @ 85ED228 +gText_HighlightDarkGrey:: @ 85ED228 .string "{HIGHLIGHT DARK_GREY}$" + .string " $" -gUnknown_085ED22E:: @ 85ED22E +gText_DynColor2Male:: @ 85ED22E .string "{COLOR DYNAMIC_COLOR2}♂$" -gUnknown_085ED233:: @ 85ED233 +gText_DynColor1Female:: @ 85ED233 .string "{COLOR DYNAMIC_COLOR1}♀$" -gUnknown_085ED238:: @ 85ED238 +gText_DynColor2:: @ 85ED238 .string "{COLOR DYNAMIC_COLOR2}$" -gUnknown_085ED23C:: @ 85ED23C +gText_Upper:: @ 85ED23C .string "UPPER$" -gUnknown_085ED242:: @ 85ED242 +gText_Lower:: @ 85ED242 .string "lower$" -gUnknown_085ED248:: @ 85ED248 +gText_Others:: @ 85ED248 .string "OTHERS$" -gUnknown_085ED24F:: @ 85ED24F +gText_Symbols:: @ 85ED24F .string "SYMBOLS$" -gUnknown_085ED257:: @ 85ED257 +gText_Register2:: @ 85ED257 .string "REGISTER$" -gUnknown_085ED260:: @ 85ED260 +gText_Exit2:: @ 85ED260 .string "EXIT$" -gUnknown_085ED265:: @ 85ED265 +gText_QuitChatting:: @ 85ED265 .string "Quit chatting?$" -gUnknown_085ED274:: @ 85ED274 +gText_RegisterTextWhere:: @ 85ED274 .string "Register text where?$" -gUnknown_085ED289:: @ 85ED289 +gText_RegisterTextHere:: @ 85ED289 .string "Register text here?$" -gUnknown_085ED29D:: @ 85ED29D +gText_InputText:: @ 85ED29D .string "Input text.$" -gUnknown_085ED2A9:: @ 85ED2A9 +gText_F700JoinedChat:: @ 85ED2A9 .string "{SPECIAL_F7 0x00} joined the chat!$" -gUnknown_085ED2BD:: @ 85ED2BD +gText_F700LeftChat:: @ 85ED2BD .string "{SPECIAL_F7 0x00} left the chat.$" + .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめ:$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikime" .string "{SPECIAL_F7 0x00}の{SPECIAL_F7 0x01}ひきめは いません$" @ "{SPECIAL_F7 0x00}'s {SPECIAL_F7 0x01}hikimeha imasen" -gUnknown_085ED2E8:: @ 85ED2E8 +gText_ExitingChat:: @ 85ED2E8 .string "Exiting the chat…$" -gUnknown_085ED2FA:: @ 85ED2FA +gText_LeaderLeftEndingChat:: @ 85ED2FA .string "The LEADER, {SPECIAL_F7 0x00}, has\nleft, ending the chat.$" -gUnknown_085ED325:: @ 85ED325 +gText_RegisteredTextChanged:: @ 85ED325 .string "The registered text has been changed.\nIs it okay to save the game?$" -gUnknown_085ED368:: @ 85ED368 +gText_AlreadySavedFile:: @ 85ED368 .string "There is already a saved file.\nIs it okay to overwrite it?$" -gUnknown_085ED3A3:: @ 85ED3A3 +gText_SavingDontTurnOff:: @ 85ED3A3 .string "SAVING…\nDON’T TURN OFF THE POWER.$" -gUnknown_085ED3C5:: @ 85ED3C5 +gText_PlayerSavedGame:: @ 85ED3C5 .string "{SPECIAL_F7 0x00} saved the game.$" -gUnknown_085ED3D8:: @ 85ED3D8 +gText_IfLeaderLeavesChatEnds:: @ 85ED3D8 .string "If the LEADER leaves, the chat\nwill end. Is that okay?$" -gUnknown_085ED40F:: @ 85ED40F +gText_Hello:: @ 85ED40F .string "HELLO$" -gUnknown_085ED415:: @ 85ED415 +gText_Pokemon2:: @ 85ED415 .string "POKéMON$" -gUnknown_085ED41D:: @ 85ED41D +gText_Trade:: @ 85ED41D .string "TRADE$" -gUnknown_085ED423:: @ 85ED423 +gText_Battle:: @ 85ED423 .string "BATTLE$" -gUnknown_085ED42A:: @ 85ED42A +gText_Lets:: @ 85ED42A .string "LET’S$" -gUnknown_085ED430:: @ 85ED430 +gText_Ok:: @ 85ED430 .string "OK!$" -gUnknown_085ED434:: @ 85ED434 +gText_Sorry:: @ 85ED434 .string "SORRY$" -gUnknown_085ED43A:: @ 85ED43A +gText_YayUnkF9F9:: @ 85ED43A .string "YAY{UNK_CTRL_F9F9}$" -gUnknown_085ED440:: @ 85ED440 +gText_ThankYou:: @ 85ED440 .string "THANK YOU$" -gUnknown_085ED44A:: @ 85ED44A +gText_ByeBye:: @ 85ED44A .string "BYE-BYE!$" + .string "Attack the weak points!$" .string "Ultimate STEEL POKéMON.$" .string "I’d climb even waterfalls$" @@ -2277,145 +2329,146 @@ gUnknown_085ED44A:: @ 85ED44A .string "My POKéMON and I help$" .string "my father’s research.$" -gUnknown_085ED5A5:: @ 85ED5A5 +gText_PkmnHatchedFromEgg:: @ 85ED5A5 .string "{STR_VAR_1} hatched from the EGG!$" -gUnknown_085ED5BE:: @ 85ED5BE +gText_NameHatchedPkmn:: @ 85ED5BE .string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$" .align 2 -gUnknown_085ED5F0:: @ 85ED5F0 +gText_ReadyToBerryCrush:: @ 85ED5F0 .string "Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p$" .align 2 -gUnknown_085ED62C:: @ 85ED62C +gText_WaitForAllChooseBerry:: @ 85ED62C .string "Please wait while each member\nchooses a BERRY.$" .align 2 -gUnknown_085ED65C:: @ 85ED65C +gText_EndedWithXUnitsPowder:: @ 85ED65C .string "{PAUSE_MUSIC}{PLAY_BGM BGM_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p$" .align 2 -gUnknown_085ED6C8:: @ 85ED6C8 +gText_RecordingGameResults:: @ 85ED6C8 .string "Recording your game results in the\nsave file.\lPlease wait.$" .align 2 -gUnknown_085ED704:: @ 85ED704 +gText_PlayBerryCrushAgain:: @ 85ED704 .string "Want to play BERRY CRUSH again?$" .align 2 -gUnknown_085ED724:: @ 85ED724 +gText_YouHaveNoBerries:: @ 85ED724 .string "You have no BERRIES.\nThe game will be canceled.$" .align 2 -gUnknown_085ED754:: @ 85ED754 +gText_MemberDroppedOut:: @ 85ED754 .string "A member dropped out.\nThe game will be canceled.$" .align 2 -gUnknown_085ED788:: @ 85ED788 +gText_TimesUpNoGoodPowder:: @ 85ED788 .string "Time’s up.\pGood BERRY POWDER could not be\nmade…\p$" .align 2 -gUnknown_085ED7BC:: @ 85ED7BC +gText_CommunicationStandby2:: @ 85ED7BC .string "Communication standby…$" .align 2 -gUnknown_085ED7D4:: @ 85ED7D4 +gText_1DotBlueF700:: @ 85ED7D4 .string "1. {COLOR BLUE}{SHADOW LIGHT_BLUE}{SPECIAL_F7 0x00}$" .align 2 -gUnknown_085ED7E0:: @ 85ED7E0 +gText_1DotF700:: @ 85ED7E0 .string "1. {SPECIAL_F7 0x00}$" .align 2 -gUnknown_085ED7E8:: @ 85ED7E8 +gText_SpaceTimes2:: @ 85ED7E8 .string " time(s)$" .align 2 -gUnknown_085ED7F4:: @ 85ED7F4 +gText_XDotY:: @ 85ED7F4 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED7FC:: @ 85ED7FC +gText_Var1Berry:: @ 85ED7FC .string "{STR_VAR_1} BERRY$" .align 2 -gUnknown_085ED808:: @ 85ED808 +gText_TimeColon:: @ 85ED808 .string "Time:$" .align 2 -gUnknown_085ED810:: @ 85ED810 +gText_PressingSpeed:: @ 85ED810 .string "Pressing Speed:$" .align 2 -gUnknown_085ED820:: @ 85ED820 +gText_Silkiness:: @ 85ED820 .string "Silkiness:$" .align 2 -gUnknown_085ED82C:: @ 85ED82C +gText_StrVar1:: @ 85ED82C .string "{STR_VAR_1}$" .align 2 -gUnknown_085ED830:: @ 85ED830 +gText_SpaceMin:: @ 85ED830 .string " min. $" .align 2 -gUnknown_085ED838:: @ 85ED838 +gText_XDotY2:: @ 85ED838 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED840:: @ 85ED840 +gText_SpaceSec:: @ 85ED840 .string " sec.$" .align 2 -gUnknown_085ED848:: @ 85ED848 +gText_XDotY3:: @ 85ED848 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_085ED850:: @ 85ED850 +gText_TimesPerSec:: @ 85ED850 .string " Times/sec.$" .align 2 -gUnknown_085ED85C:: @ 85ED85C +gText_Var1Percent:: @ 85ED85C .string "{STR_VAR_1}%$" .align 2 -gUnknown_085ED860:: @ 85ED860 +gText_PressesRankings:: @ 85ED860 .string "No. of Presses Rankings$" .align 2 -gUnknown_085ED878:: @ 85ED878 +gText_CrushingResults:: @ 85ED878 .string "Crushing Results$" .align 2 -gUnknown_085ED88C:: @ 85ED88C +gText_NeatnessRankings:: @ 85ED88C .string "Neatness Rankings$" .align 2 -gUnknown_085ED8A0:: @ 85ED8A0 +gText_CoopRankings:: @ 85ED8A0 .string "Cooperative Rankings$" .align 2 -gUnknown_085ED8B8:: @ 85ED8B8 +gText_PressingPowerRankings:: @ 85ED8B8 .string "Pressing-Power Rankings$" -gUnknown_085ED8D0:: @ 85ED8D0 +gText_BerryCrush2:: @ 85ED8D0 .string "BERRY CRUSH$" -gUnknown_085ED8DC:: @ 85ED8DC +gText_PressingSpeedRankings:: @ 85ED8DC .string "Pressing-Speed Rankings$" -gUnknown_085ED8F4:: @ 85ED8F4 +gText_Var1Players:: @ 85ED8F4 .string "{STR_VAR_1} PLAYERS$" -gUnknown_085ED8FF:: @ 85ED8FF +gText_SymbolsEarned:: @ 85ED8FF .string "Symbols Earned$" -gUnknown_085ED90E:: @ 85ED90E +gText_BattleRecord:: @ 85ED90E .string "Battle Record$" -gUnknown_085ED91C:: @ 85ED91C +gText_BattlePoints:: @ 85ED91C .string "Battle Points$" + .string "CANCEL$" .string "$" .string "Check BATTLE FRONTIER MAP.$" @@ -2447,140 +2500,141 @@ gUnknown_085ED91C:: @ 85ED91C .string "Select one of three paths to battle!\nYour luck will be tested.$" .string "Aim for the top with exploration!\nYour bravery will be tested.$" -gUnknown_085EDCC3:: @ 85EDCC3 +gText_ContinueMenuPlayer:: @ 85EDCC3 .string "PLAYER$" -gUnknown_085EDCCA:: @ 85EDCCA +gText_ContinueMenuTime:: @ 85EDCCA .string "TIME$" -gUnknown_085EDCCF:: @ 85EDCCF +gText_ContinueMenuPokedex:: @ 85EDCCF .string "POKéDEX$" -gUnknown_085EDCD7:: @ 85EDCD7 +gText_ContinueMenuBadges:: @ 85EDCD7 .string "BADGES$" -gUnknown_085EDCDE:: @ 85EDCDE +gText_Powder:: @ 85EDCDE .string "POWDER$" -gUnknown_085EDCE5:: @ 85EDCE5 +gText_BerryPickingRecords:: @ 85EDCE5 .string "DODRIO BERRY-PICKING RECORDS$" -gUnknown_085EDD02:: @ 85EDD02 +gText_BerriesPicked:: @ 85EDD02 .string "BERRIES picked:$" -gUnknown_085EDD12:: @ 85EDD12 +gText_BestScore:: @ 85EDD12 .string "Best score:$" -gUnknown_085EDD1E:: @ 85EDD1E +gText_BerriesInRowFivePlayers:: @ 85EDD1E .string "BERRIES picked in a row with\nfive players:$" -gUnknown_085EDD49:: @ 85EDD49 +gText_BerryPickingResults:: @ 85EDD49 .string "Announcing BERRY-PICKING results!$" -gUnknown_085EDD6B:: @ 85EDD6B +gText_10P30P50P50P:: @ 85EDD6B .string "{CLEAR_TO 0x03}10P{CLEAR_TO 0x2B}30P{CLEAR_TO 0x53}50P{CLEAR_TO 0x77}{UNK_CTRL_F9DD}50P$" -gUnknown_085EDD86:: @ 85EDD86 +gText_AnnouncingRankings:: @ 85EDD86 .string "Announcing rankings!$" -gUnknown_085EDD9B:: @ 85EDD9B +gText_AnnouncingPrizes:: @ 85EDD9B .string "Announcing prizes!$" -gUnknown_085EDDAE:: @ 85EDDAE +gText_1Colon:: @ 85EDDAE .string "1:$" -gUnknown_085EDDB1:: @ 85EDDB1 +gText_2Colon:: @ 85EDDB1 .string "2:$" -gUnknown_085EDDB4:: @ 85EDDB4 +gText_3Colon:: @ 85EDDB4 .string "3:$" -gUnknown_085EDDB7:: @ 85EDDB7 +gText_4Colon:: @ 85EDDB7 .string "4:$" -gUnknown_085EDDBA:: @ 85EDDBA +gText_5Colon:: @ 85EDDBA .string "5:$" -gUnknown_085EDDBD:: @ 85EDDBD +gText_FirstPlacePrize:: @ 85EDDBD .string "The first-place winner gets\nthis {SPECIAL_F7 0x00}!$" -gUnknown_085EDDE2:: @ 85EDDE2 +gText_CantHoldAnyMore:: @ 85EDDE2 .string "You can’t hold any more!$" -gUnknown_085EDDFB:: @ 85EDDFB +gText_FilledStorageSpace:: @ 85EDDFB .string "It filled its storage space.$" -gUnknown_085EDE18:: @ 85EDE18 +gText_WantToPlayAgain:: @ 85EDE18 .string "Want to play again?$" -gUnknown_085EDE2C:: @ 85EDE2C +gText_SomeoneDroppedOut:: @ 85EDE2C .string "Somebody dropped out.\nThe link will be canceled.$" -gUnknown_085EDE5D:: @ 85EDE5D +gText_SpacePoints:: @ 85EDE5D .string " points$" -gUnknown_085EDE65:: @ 85EDE65 +gText_CommunicationStandby3:: @ 85EDE65 .string "Communication standby…$" -gUnknown_085EDE7C:: @ 85EDE7C +gText_SpacePoints2:: @ 85EDE7C .string " points$" -gUnknown_085EDE84:: @ 85EDE84 +gText_SpaceTimes3:: @ 85EDE84 .string " time(s)$" -gUnknown_085EDE8D:: @ 85EDE8D +gText_PkmnJumpRecords:: @ 85EDE8D .string "POKéMON JUMP RECORDS$" -gUnknown_085EDEA2:: @ 85EDEA2 +gText_JumpsInARow:: @ 85EDEA2 .string "Jumps in a row:$" -gUnknown_085EDEB2:: @ 85EDEB2 +gText_BestScore2:: @ 85EDEB2 .string "Best score:$" -gUnknown_085EDEBE:: @ 85EDEBE +gText_ExcellentsInARow:: @ 85EDEBE .string "EXCELLENTS in a row:$" -gUnknown_085EDED3:: @ 85EDED3 +gText_AwesomeWonF701F700:: @ 85EDED3 .string "Awesome score! You’ve\nwon {SPECIAL_F7 0x01} {SPECIAL_F7 0x00}!$" -gUnknown_085EDEF4:: @ 85EDEF4 +gText_FilledStorageSpace2:: @ 85EDEF4 .string "It filled its storage space.$" -gUnknown_085EDF11:: @ 85EDF11 +gText_CantHoldMore:: @ 85EDF11 .string "You can’t hold any more!$" -gUnknown_085EDF2A:: @ 85EDF2A +gText_WantToPlayAgain2:: @ 85EDF2A .string "Want to play again?$" -gUnknown_085EDF3E:: @ 85EDF3E +gText_SomeoneDroppedOut2:: @ 85EDF3E .string "Somebody dropped out.\nThe link will be canceled.$" -gUnknown_085EDF6F:: @ 85EDF6F +gText_CommunicationStandby4:: @ 85EDF6F .string "Communication standby…$" -gUnknown_085EDF86:: @ 85EDF86 +gText_LinkContestResults:: @ 85EDF86 .string "{PLAYER}’s Link Contest Results$" -gUnknown_085EDFA0:: @ 85EDFA0 +gText_1st:: @ 85EDFA0 .string "1st$" -gUnknown_085EDFA4:: @ 85EDFA4 +gText_2nd:: @ 85EDFA4 .string "2nd$" -gUnknown_085EDFA8:: @ 85EDFA8 +gText_3rd:: @ 85EDFA8 .string "3rd$" -gUnknown_085EDFAC:: @ 85EDFAC +gText_4th:: @ 85EDFAC .string "4th$" -gUnknown_085EDFB0:: @ 85EDFB0 +gText_Friend:: @ 85EDFB0 .string "Friend$" + .string "POKeMON$" -gUnknown_085EDFBF:: @ 85EDFBF +gJPText_MysteryGift:: @ 85EDFBF .string "ふしぎなもらいもの$" @ "fushiginamoraimono" ("Mystery Gift" in Japanese) -gUnknown_085EDFC9:: @ 85EDFC9 +gJPText_DecideStop:: @ 85EDFC9 .string "{UNK_CTRL_F800}けってい {UNK_CTRL_F801}やめる$" @ "{UNK_CTRL_F800}kettei {UNK_CTRL_F801}yameru" ("{UNK_CTRL_F800}decide {UNK_CTRL_F801}stop" in Japanese) @ A bunch of Japanese strings here, waiting for updated datadump to dump properly @@ -2630,89 +2684,88 @@ gUnknown_085EE12D:: @ 85EE12D .string "BLUE$" .string "---$" -gUnknown_085EE158:: @ 85EE158 +gText_SingleBattleRoomResults:: @ 85EE158 .string "{PLAYER}’s Single Battle Room Results$" -gUnknown_085EE178:: @ 85EE178 +gText_DoubleBattleRoomResults:: @ 85EE178 .string "{PLAYER}’s Double Battle Room Results$" -gUnknown_085EE198:: @ 85EE198 +gText_MultiBattleRoomResults:: @ 85EE198 .string "{PLAYER}’s Multi Battle Room Results$" -gUnknown_085EE1B7:: @ 85EE1B7 +gText_LinkMultiBattleRoomResults:: @ 85EE1B7 .string "{PLAYER}’s Link Multi Battle Room Results$" -gUnknown_085EE1DB:: @ 85EE1DB +gText_SingleBattleTourneyResults:: @ 85EE1DB .string "{PLAYER}’s Single Battle Tourney Results$" -gUnknown_085EE1FE:: @ 85EE1FE +gText_DoubleBattleTourneyResults:: @ 85EE1FE .string "{PLAYER}’s Double Battle Tourney Results$" -gUnknown_085EE221:: @ 85EE221 +gText_SingleBattleHallResults:: @ 85EE221 .string "{PLAYER}’s Single Battle Hall Results$" -gUnknown_085EE241:: @ 85EE241 +gText_DoubleBattleHallResults:: @ 85EE241 .string "{PLAYER}’s Double Battle Hall Results$" -gUnknown_085EE261:: @ 85EE261 +gText_BattleChoiceResults:: @ 85EE261 .string "{PLAYER}’s Battle Choice Results$" -gUnknown_085EE27C:: @ 85EE27C +gText_SetKOTourneyResults:: @ 85EE27C .string "{PLAYER}’s Set KO Tourney Results$" -gUnknown_085EE298:: @ 85EE298 +gText_BattleSwapSingleResults:: @ 85EE298 .string "{PLAYER}’s Battle Swap Single Results$" -gUnknown_085EE2B8:: @ 85EE2B8 +gText_BattleSwapDoubleResults:: @ 85EE2B8 .string "{PLAYER}’s Battle Swap Double Results$" -gUnknown_085EE2D8:: @ 85EE2D8 +gText_BattleQuestResults:: @ 85EE2D8 .string "{PLAYER}’s Battle Quest Results$" -gUnknown_085EE2F2:: @ 85EE2F2 +gText_Lv502:: @ 85EE2F2 .string "LV. 50$" -gUnknown_085EE2F9:: @ 85EE2F9 +gText_OpenLv:: @ 85EE2F9 .string "OPEN LV.$" -gUnknown_085EE302:: @ 85EE302 +gText_WinStreak:: @ 85EE302 .string "Win streak: {STR_VAR_1}$" -gUnknown_085EE311:: @ 85EE311 +gText_Current:: @ 85EE311 .string "CURRENT$" -gUnknown_085EE319:: @ 85EE319 +gText_Record:: @ 85EE319 .string "RECORD$" -gUnknown_085EE320:: @ 85EE320 +gText_Prev:: @ 85EE320 .string "PREV.$" -gUnknown_085EE326:: @ 85EE326 +gText_RentalSwap:: @ 85EE326 .string "Rental/Swap$" -gUnknown_085EE332:: @ 85EE332 +gText_Total:: @ 85EE332 .string "Total$" -gUnknown_085EE338:: @ 85EE338 +gText_ClearStreak:: @ 85EE338 .string "Clear streak: {STR_VAR_1}$" -gUnknown_085EE349:: @ 85EE349 +gText_Championships:: @ 85EE349 .string "Championships: {STR_VAR_1}$" -gUnknown_085EE35B:: @ 85EE35B +gText_RoomsCleared:: @ 85EE35B .string "Rooms cleared: {STR_VAR_1}$" -gUnknown_085EE36D:: @ 85EE36D +gText_TimesCleared:: @ 85EE36D .string "Times cleared:{CLEAR 0x05}{STR_VAR_1}$" -gUnknown_085EE381:: @ 85EE381 +gText_KOsInARow:: @ 85EE381 .string "KOs in a row: {STR_VAR_1}$" -gUnknown_085EE392:: @ 85EE392 +gText_TimesVar1:: @ 85EE392 .string "Times: {STR_VAR_1}$" - - .align 2 -gUnknown_085EE39C:: @ 85EE39C + +gText_FloorsCleared:: @ 85EE39C .string "Floors cleared: {STR_VAR_1}$" .align 2 @@ -2737,46 +2790,48 @@ gUnknown_085EE39C:: @ 85EE39C .string "Floors cleared: {STR_VAR_2}$" .align 2 -gUnknown_085EE424:: @ 85EE424 +gText_1Dot:: @ 85EE424 .string "1.$" + .string "2.$" .string "3.$" -gUnknown_085EE42D:: @ 85EE42D +gText_SavingDontTurnOff2:: @ 85EE42D .string "SAVING…\nDON’T TURN OFF THE POWER.$" -gUnknown_085EE44F:: @ 85EE44F +gText_BlenderMaxSpeedRecord:: @ 85EE44F .string "BERRY BLENDER\nMAXIMUM SPEED RECORD!$" -gUnknown_085EE473:: @ 85EE473 +gText_234Players:: @ 85EE473 .string "2 PLAYERS\n3 PLAYERS\n4 PLAYERS$" -gUnknown_085EE491:: @ 85EE491 +gText_YesNo:: @ 85EE491 .string "YES\nNO$" -gUnknown_085EE498:: @ 85EE498 +gText_SelectorArrow3:: @ 85EE498 .string "▶$" -gUnknown_085EE49A:: @ 85EE49A +gText_Peekaboo:: @ 85EE49A .string "PEEKABOO!$" -gUnknown_085EE4A4:: @ 85EE4A4 +gText_CommErrorCheckConnections:: @ 85EE4A4 .string "Communication error…\nPlease check all connections,\nthen turn the power OFF and ON.$" -gUnknown_085EE4F7:: @ 85EE4F7 +gText_CommErrorEllipsis:: @ 85EE4F7 .string "Communication error…$" -gUnknown_085EE50C:: @ 85EE50C +gText_MoveCloserToLinkPartner:: @ 85EE50C .string "Move closer to your link partner(s).\nAvoid obstacles between partners.$" -gUnknown_085EE553:: @ 85EE553 +gText_ABtnRegistrationCounter:: @ 85EE553 .string "A Button: Registration Counter$" -gUnknown_085EE572:: @ 85EE572 +gText_ABtnTitleScreen:: @ 85EE572 .string "A Button: Title Screen$" -gUnknown_085EE589:: @ 85EE589 +gText_Option:: @ 85EE589 .string "OPTION$" + .string "TEXT SPEED$" .string "BATTLE SCENE$" .string "BATTLE STYLE$" @@ -2785,63 +2840,65 @@ gUnknown_085EE589:: @ 85EE589 .string "CANCEL$" .string "BUTTON MODE$" -gUnknown_085EE5D4:: @ 85EE5D4 +gText_TextSpeedSlow:: @ 85EE5D4 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SLOW$" -gUnknown_085EE5DF:: @ 85EE5DF +gText_TextSpeedMid:: @ 85EE5DF .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}MID$" -gUnknown_085EE5E9:: @ 85EE5E9 +gText_TextSpeedFast:: @ 85EE5E9 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}FAST$" -gUnknown_085EE5F4:: @ 85EE5F4 +gText_BattleSceneOn:: @ 85EE5F4 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}ON$" -gUnknown_085EE5FD:: @ 85EE5FD +gText_BattleSceneOff:: @ 85EE5FD .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}OFF$" -gUnknown_085EE607:: @ 85EE607 +gText_BattleStyleShift:: @ 85EE607 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SHIFT$" -gUnknown_085EE613:: @ 85EE613 +gText_BattleStyleSet:: @ 85EE613 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}SET$" -gUnknown_085EE61D:: @ 85EE61D +gText_SoundMono:: @ 85EE61D .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}MONO$" -gUnknown_085EE628:: @ 85EE628 +gText_SoundStereo:: @ 85EE628 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}STEREO$" -gUnknown_085EE635:: @ 85EE635 +gText_FrameType:: @ 85EE635 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}TYPE$" -gUnknown_085EE640:: @ 85EE640 +gText_FrameTypeNumber:: @ 85EE640 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}$" -gUnknown_085EE647:: @ 85EE647 +gText_ButtonTypeNormal:: @ 85EE647 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}NORMAL$" -gUnknown_085EE654:: @ 85EE654 +gText_ButtonTypeLR:: @ 85EE654 .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}LR$" -gUnknown_085EE65D:: @ 85EE65D +gText_ButtonTypeLEqualsA:: @ 85EE65D .string "{COLOR GREEN}{SHADOW LIGHT_GREEN}L=A$" -gUnknown_085EE667:: @ 85EE667 +gText_XPLink:: @ 85EE667 .string "{STR_VAR_1}P LINK$" + .string "BRONZE$" .string "COPPER$" .string "SILVER$" .string "GOLD$" -gUnknown_085EE68A:: @ 85EE68A +gText_Day:: @ 85EE68A .string "DAY$" -gUnknown_085EE68E:: @ 85EE68E +gText_Colon3:: @ 85EE68E .string ":$" -gUnknown_085EE690:: @ 85EE690 +gText_Confirm2:: @ 85EE690 .string "CONFIRM$" + .string "Days$" .string "Time:$" .string "Game time$" @@ -2858,11 +2915,12 @@ gUnknown_085EE690:: @ 85EE690 .string "RETIRE$" .string "REST$" -gOtherText_SafariStock:: @ 85EE6FF +gText_SafariBallStock:: @ 85EE6FF .string "SAFARI BALLS\nStock: {STR_VAR_1}$" -gOtherText_BattlePyramid_X:: @ 85EE716 +gText_BattlePyramidFloor:: @ 85EE716 .string "Battle Pyramid\n{STR_VAR_1}$" + .string "Floor 1$" .string "Floor 2$" .string "Floor 3$" @@ -2872,70 +2930,72 @@ gOtherText_BattlePyramid_X:: @ 85EE716 .string "Floor 7$" .string "Peak$" -gUnknown_085EE765:: @ 85EE765 +gText_LinkStandby2:: @ 85EE765 .string "Link standby…\n… … B Button: Cancel$" -gUnknown_085EE788:: @ 85EE788 +gText_PressAToLoadEvent:: @ 85EE788 .string "Press the A Button to load event.\n… … B Button: Cancel$" -gUnknown_085EE7BF:: @ 85EE7BF +gText_LoadingEvent:: @ 85EE7BF .string "Loading event…$" -gUnknown_085EE7CE:: @ 85EE7CE +gText_DontRemoveCableTurnOff:: @ 85EE7CE .string "Don’t remove the Game Link cable.\nDon’t turn off the power.$" -gUnknown_085EE80A:: @ 85EE80A +gText_EventSafelyLoaded:: @ 85EE80A .string "The event was safely loaded.$" -gUnknown_085EE827:: @ 85EE827 +gText_LoadErrorEndingSession:: @ 85EE827 .string "Loading error.\nEnding session.$" + .string "プレイヤー$" @ "pureiyaa" ("player" in Japanese) .string "さま$" @ "sama" (a very high honorific) -gUnknown_085EE84F:: @ 85EE84F +gText_DexHoenn:: @ 85EE84F .string "HOENN$" -gUnknown_085EE855:: @ 85EE855 +gText_DexNational:: @ 85EE855 .string "NATIONAL$" -gUnknown_085EE85E:: @ 85EE85E +gText_PokedexDiploma:: @ 85EE85E .string "PLAYER: {CLEAR 0x10}{COLOR RED}{SHADOW LIGHT_RED}{PLAYER}{COLOR DARK_GREY}{SHADOW LIGHT_GREY}\n\nThis document certifies\nthat you have successfully\ncompleted your\n{STR_VAR_1} POKéDEX.\n\n{CLEAR_TO 0x42}{COLOR RED}{SHADOW LIGHT_RED}GAME FREAK$" .string "{COLOR RED}{SHADOW LIGHT_RED}ゲ-ムフリ-ク$" @ geemufuriku ("Game Freak" in Japanese) .string "{COLOR RED}{SHADOW LIGHT_RED}$" -gUnknown_085EE8F1:: @ 85EE8F1 +gText_Hoenn:: @ 85EE8F1 .string "HOENN$" -gUnknown_085EE8F7:: @ 85EE8F7 +gText_OhABite:: @ 85EE8F7 .string "Oh! A bite!$" -gUnknown_085EE903:: @ 85EE903 +gText_PokemonOnHook:: @ 85EE903 .string "A POKéMON’s on the hook!{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE91E:: @ 85EE91E +gText_NotEvenANibble:: @ 85EE91E .string "Not even a nibble…{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE933:: @ 85EE933 +gText_ItGotAway:: @ 85EE933 .string "It got away…{PAUSE_UNTIL_PRESS}$" -gUnknown_085EE942:: @ 85EE942 +gText_XWillBeSentToY:: @ 85EE942 .string "{STR_VAR_2} will be\nsent to {STR_VAR_1}.$" -gUnknown_085EE959:: @ 85EE959 +gText_ByeByeVar1:: @ 85EE959 .string "Bye-bye, {STR_VAR_2}!$" -gUnknown_085EE966:: @ 85EE966 +gText_XSentOverY:: @ 85EE966 .string "{STR_VAR_1} sent over {STR_VAR_3}.$" -gUnknown_085EE977:: @ 85EE977 +gText_TakeGoodCareOfX:: @ 85EE977 .string "Take good care of {STR_VAR_3}!$" .include "data/text/easy_chat/easy_chat_group_names.inc" -gUnknown_085EEA42:: @ 85EEA42 +gText_ThreeQuestionMarks:: @ 85EEA42 .string "???$" + .string "MAX. HP$" .string "ATTACK$" .string "DEFENSE$" @@ -2943,30 +3003,32 @@ gUnknown_085EEA42:: @ 85EEA42 .string "SP. ATK$" .string "SP. DEF$" -gUnknown_085EEA73:: @ 85EEA73 +gText_UnkCtrlF904:: @ 85EEA73 .string "{UNK_CTRL_F904}$" -gUnknown_085EEA76:: @ 85EEA76 +gText_Dash:: @ 85EEA76 .string "-$" -gUnknown_085EEA78:: @ 85EEA78 +gText_FromSpace:: @ 85EEA78 .string "From $" -gUnknown_085EEA7E:: @ 85EEA7E +gText_MixingRecords:: @ 85EEA7E .string "Mixing records…$" -gUnknown_085EEA8E:: @ 85EEA8E +gText_RecordMixingComplete:: @ 85EEA8E .string "Record mixing completed.\nThank you for waiting.$" + .string "YOUR NAME?$" .string "BOX NAME?$" .string "{STR_VAR_1}’s nickname?$" .string "Tell him the words.$" -gUnknown_085EEAF6:: @ 85EEAF6 +gText_MoveOkBack:: @ 85EEAF6 .string "{UNK_CTRL_F80C}MOVE {UNK_CTRL_F800}OK {UNK_CTRL_F801}BACK$" -gUnknown_085EEB0B:: @ 85EEB0B +gText_CallCantBeMadeHere:: @ 85EEB0B .string "A call can’t be made from here.$" + .string "HANDSOME$" .string "VINNY$" .string "MOREME$" @@ -2978,8 +3040,9 @@ gUnknown_085EEB0B:: @ 85EEB0B .string "smartness$" .string "toughness$" -gUnknown_085EEB7E:: @ 85EEB7E +gText_Lady2:: @ 85EEB7E .string "Lady$" + .string "slippery$" .string "roundish$" .string "wham-ish$" @@ -2987,473 +3050,480 @@ gUnknown_085EEB7E:: @ 85EEB7E .string "sticky$" .string "pointy$" -gUnknown_085EEBB2:: @ 85EEBB2 +gText_RentalPkmn2:: @ 85EEBB2 .string "RENTAL POKéMON$" -gUnknown_085EEBC1:: @ 85EEBC1 +gText_SelectFirstPkmn:: @ 85EEBC1 .string "Select the first POKéMON.$" -gUnknown_085EEBDB:: @ 85EEBDB +gText_SelectSecondPkmn:: @ 85EEBDB .string "Select the second POKéMON.$" -gUnknown_085EEBF6:: @ 85EEBF6 +gText_SelectThirdPkmn:: @ 85EEBF6 .string "Select the third POKéMON.$" -gUnknown_085EEC10:: @ 85EEC10 +gText_Rent:: @ 85EEC10 .string "RENT$" -gUnknown_085EEC15:: @ 85EEC15 +gText_Summary:: @ 85EEC15 .string "SUMMARY$" -gUnknown_085EEC1D:: @ 85EEC1D +gText_Others2:: @ 85EEC1D .string "OTHERS$" -gUnknown_085EEC24:: @ 85EEC24 +gText_Deselect:: @ 85EEC24 .string "DESELECT$" -gUnknown_085EEC2D:: @ 85EEC2D +gText_TheseThreePkmnOkay:: @ 85EEC2D .string "Are these three POKéMON OK?$" -gUnknown_085EEC49:: @ 85EEC49 +gText_Yes2:: @ 85EEC49 .string "YES$" -gUnknown_085EEC4D:: @ 85EEC4D +gText_No2:: @ 85EEC4D .string "NO$" -gUnknown_085EEC50:: @ 85EEC50 +gText_CantSelectSamePkmn:: @ 85EEC50 .string "Can’t select same {PKMN}.$" -gUnknown_085EEC66:: @ 85EEC66 +gText_PkmnSwap:: @ 85EEC66 .string "POKéMON SWAP$" -gUnknown_085EEC73:: @ 85EEC73 +gText_SelectPkmnToSwap:: @ 85EEC73 .string "Select POKéMON to swap.$" -gUnknown_085EEC8B:: @ 85EEC8B +gText_SelectPkmnToAccept:: @ 85EEC8B .string "Select POKéMON to accept.$" -gUnknown_085EECA5:: @ 85EECA5 +gText_Swap:: @ 85EECA5 .string "SWAP$" -gUnknown_085EECAA:: @ 85EECAA +gText_Summary2:: @ 85EECAA .string "SUMMARY$" -gUnknown_085EECB2:: @ 85EECB2 +gText_Rechoose:: @ 85EECB2 .string "RECHOOSE$" -gUnknown_085EECBB:: @ 85EECBB +gText_QuitSwapping:: @ 85EECBB .string "Quit swapping?$" -gUnknown_085EECCA:: @ 85EECCA +gText_Yes3:: @ 85EECCA .string "YES$" -gUnknown_085EECCE:: @ 85EECCE +gText_No3:: @ 85EECCE .string "NO$" -gUnknown_085EECD1:: @ 85EECD1 +gText_PkmnForSwap:: @ 85EECD1 .string "{PKMN} FOR SWAP$" -gUnknown_085EECDD:: @ 85EECDD +gText_Cancel3:: @ 85EECDD .string "CANCEL$" + .string "SWAP$" .string "ACCEPT$" -gUnknown_085EECF0:: @ 85EECF0 +gText_AcceptThisPkmn:: @ 85EECF0 .string "Accept this POKéMON?$" + .string " $" -gUnknown_085EED0A:: @ 85EED0A +gText_SamePkmnInPartyAlready:: @ 85EED0A .string "Same {PKMN} in party already.$" -gOtherText_DecimalPoint:: @ 85EED24 +gText_DecimalPoint:: @ 85EED24 .string ".$" -gUnknown_085EED26:: @ 85EED26 +gText_SavingPlayer:: @ 85EED26 .string "PLAYER$" -gUnknown_085EED2D:: @ 85EED2D +gText_SavingBadges:: @ 85EED2D .string "BADGES$" -gUnknown_085EED34:: @ 85EED34 +gText_SavingPokedex:: @ 85EED34 .string "POKéDEX$" -gUnknown_085EED3C:: @ 85EED3C +gText_SavingTime:: @ 85EED3C .string "TIME$" -gUnknown_085EED41:: @ 85EED41 +gText_WirelessCommStatus:: @ 85EED41 .string "Wireless Communication Status$" -gUnknown_085EED5F:: @ 85EED5F +gText_PeopleTrading:: @ 85EED5F .string "People trading:$" -gUnknown_085EED6F:: @ 85EED6F +gText_PeopleBattling:: @ 85EED6F .string "People battling:$" -gUnknown_085EED80:: @ 85EED80 +gText_PeopleInUnionRoom:: @ 85EED80 .string "People in the UNION ROOM:$" -gUnknown_085EED9A:: @ 85EED9A +gText_PeopleCommunicating:: @ 85EED9A .string "People communicating:$" -gUnknown_085EEDB0:: @ 85EEDB0 +gText_F700Players:: @ 85EEDB0 .string "{SPECIAL_F7 0} players$" -gUnknown_085EEDBB:: @ 85EEDBB +gText_F701Players:: @ 85EEDBB .string "{SPECIAL_F7 1} players$" -gUnknown_085EEDC6:: @ 85EEDC6 +gText_F702Players:: @ 85EEDC6 .string "{SPECIAL_F7 2} players$" -gUnknown_085EEDD1:: @ 85EEDD1 +gText_F703Players:: @ 85EEDD1 .string "{SPECIAL_F7 3} players$" .align 2 - .4byte gUnknown_085EEDB0 - .4byte gUnknown_085EEDBB - .4byte gUnknown_085EEDC6 - .4byte gUnknown_085EEDD1 + .4byte gText_F700Players + .4byte gText_F701Players + .4byte gText_F702Players + .4byte gText_F703Players .align 2 -gUnknown_085EEDEC:: @ 85EEDEC +gText_WonderCards:: @ 85EEDEC .string "WONDER CARDS$" .align 2 -gUnknown_085EEDFC:: @ 85EEDFC +gText_WonderNews:: @ 85EEDFC .string "WONDER NEWS$" .align 2 -gUnknown_085EEE08:: @ 85EEE08 +gText_WirelessCommunication:: @ 85EEE08 .string "WIRELESS COMMUNICATION$" .align 2 -gUnknown_085EEE20:: @ 85EEE20 +gText_Friend2:: @ 85EEE20 .string "FRIEND$" .align 2 -gUnknown_085EEE28:: @ 85EEE28 +gText_Exit3:: @ 85EEE28 .string "EXIT$" .align 2 -gUnknown_085EEE30:: @ 85EEE30 +gText_Receive:: @ 85EEE30 .string "RECEIVE$" .align 2 -gUnknown_085EEE38:: @ 85EEE38 +gText_Send:: @ 85EEE38 .string "SEND$" .align 2 -gUnknown_085EEE40:: @ 85EEE40 +gText_Toss:: @ 85EEE40 .string "TOSS$" .align 2 -gUnknown_085EEE48:: @ 85EEE48 +gText_VarietyOfEventsImportedWireless:: @ 85EEE48 .string "A variety of events will be imported\nover Wireless Communication.$" .align 2 -gUnknown_085EEE8C:: @ 85EEE40 +gText_WonderCardsInPossession:: @ 85EEE40 .string "Read the WONDER CARDS in your\npossession.$" .align 2 -gUnknown_085EEEB8:: @ 85EEEB8 +gText_ReadNewsThatArrived:: @ 85EEEB8 .string "Read the NEWS that arrived.$" .align 2 -gUnknown_085EEED4:: @ 85EEED4 +gText_ReturnToTitle:: @ 85EEED4 .string "Return to the title screen.$" .align 2 -gUnknown_085EEEF0:: @ 85EEEF0 +gText_DontHaveCardNewOneInput:: @ 85EEEF0 .string "You don’t have a WONDER CARD,\nso a new CARD will be input.$" .align 2 -gUnknown_085EEF2C:: @ 85EEF2C +gText_DontHaveNewsNewOneInput:: @ 85EEF2C .string "You don’t have any WONDER NEWS,\nso new NEWS will be input.$" .align 2 -gUnknown_085EEF68:: @ 85EEF68 +gText_WhereShouldCardBeAccessed:: @ 85EEF68 .string "Where should the WONDER CARD\nbe accessed?$" .align 2 -gUnknown_085EEF94:: @ 85EEF94 +gText_WhereShouldNewsBeAccessed:: @ 85EEF94 .string "Where should the WONDER NEWS\nbe accessed?$" .align 2 .string "Communication standby…\nB Button: Cancel$" .align 2 -gUnknown_085EEFE8:: @ 85EEFE8 +gText_Communicating:: @ 85EEFE8 .string "Communicating…$" .align 2 -gUnknown_085EEFF8:: @ 85EEFF8 +gText_CommunicationCompleted:: @ 85EEFF8 .string "Communication completed.$" .align 2 -gUnknown_085EF014:: @ 85EF014 +gText_CommunicationError:: @ 85EF014 .string "Communication error.$" .align 2 -gUnknown_085EF02C:: @ 85EF02C +gText_CommunicationCanceled:: @ 85EF02C .string "Communication has been canceled.$" .align 2 -gUnknown_085EF050:: @ 85EF050 +gText_ThrowAwayWonderCard:: @ 85EF050 .string "Throw away the WONDER CARD\nand input a new CARD?$" .align 2 -gUnknown_085EF084:: @ 85EF084 +gText_HaventReceivedCardsGift:: @ 85EF084 .string "You haven’t received the CARD’s gift\nyet. Input a new CARD anyway?$" .align 2 -gUnknown_085EF0C8:: @ 85EF0C8 +gText_WonderCardReceivedFrom:: @ 85EF0C8 .string "A WONDER CARD has been received\nfrom {STR_VAR_1}.$" .align 2 -gUnknown_085EF0F4:: @ 85EF0F4 +gText_WonderNewsReceivedFrom:: @ 85EF0F4 .string "A WONDER NEWS item has been\nreceived from {STR_VAR_1}.$" .align 2 -gUnknown_085EF124:: @ 85EF124 +gText_WonderCardReceived:: @ 85EF124 .string "A new WONDER CARD has been\nreceived.$" .align 2 -gUnknown_085EF14C:: @ 85EF14C +gText_WonderNewsReceived:: @ 85EF14C .string "A new WONDER NEWS item has been\nreceived.$" .align 2 -gUnknown_085EF178:: @ 85EF178 +gText_NewStampReceived:: @ 85EF178 .string "A new STAMP has been received.$" .align 2 -gUnknown_085EF198:: @ 85EF198 +gText_NewTrainerReceived:: @ 85EF198 .string "A new TRAINER has arrived.$" .align 2 -gUnknown_085EF1B4:: @ 85EF1B4 +gText_AlreadyHadCard:: @ 85EF1B4 .string "You already had that\nWONDER CARD.$" .align 2 -gUnknown_085EF1D8:: @ 85EF1D8 +gText_AlreadyHadNews:: @ 85EF1D8 .string "You already had that\nWONDER NEWS item.$" .align 2 -gUnknown_085EF200:: @ 85EF200 +gText_AlreadyHadStamp:: @ 85EF200 .string "You already had that\nSTAMP.$" .align 2 -gUnknown_085EF21C:: @ 85EF21C +gText_NoMoreRoomForStamps:: @ 85EF21C .string "There’s no more room for adding\nSTAMPS.$" .align 2 -gUnknown_085EF244:: @ 85EF244 +gText_RecordUploadedViaWireless:: @ 85EF244 .string "Your record has been uploaded via\nWIRELESS COMMUNICATION.$" .align 2 -gUnknown_085EF280:: @ 85EF280 +gText_CantAcceptCardFromTrainer:: @ 85EF280 .string "You can’t accept a WONDER CARD\nfrom this TRAINER.$" .align 2 -gUnknown_085EF2B4:: @ 85EF2B4 +gText_CantAcceptNewsFromTrainer:: @ 85EF2B4 .string "You can’t accept WONDER NEWS\nfrom this TRAINER.$" .align 2 -gUnknown_085EF2E4:: @ 85EF2E4 +gText_NothingSentOver:: @ 85EF2E4 .string "Nothing was sent over…$" .align 2 -gUnknown_085EF2FC:: @ 85EF2FC +gText_WhatToDoWithCards:: @ 85EF2FC .string "What would you like to do\nwith the WONDER CARDS?$" .align 2 -gUnknown_085EF330:: @ 85EF330 +gText_WhatToDoWithNews:: @ 85EF330 .string "What would you like to do\nwith the WONDER NEWS?$" .align 2 -gUnknown_085EF360:: @ 85EF360 +gText_SendingWonderCard:: @ 85EF360 .string "Sending your WONDER CARD…$" .align 2 -gUnknown_085EF37C:: @ 85EF37C +gText_SendingWonderNews:: @ 85EF37C .string "Sending your WONDER NEWS item…$" .align 2 -gUnknown_085EF39C:: @ 85EF39C +gText_WonderCardSentTo:: @ 85EF39C .string "Your WONDER CARD has been sent\nto {STR_VAR_1}.$" .align 2 -gUnknown_085EF3C4:: @ 85EF3C4 +gText_WonderNewsSentTo:: @ 85EF3C4 .string "Your WONDER NEWS item has been\nsent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF3F0:: @ 85EF3F0 +gText_StampSentTo:: @ 85EF3F0 .string "A STAMP has been sent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF410:: @ 85EF410 +gText_GiftSentTo:: @ 85EF410 .string "A GIFT has been sent to {STR_VAR_1}.$" .align 2 -gUnknown_085EF42C:: @ 85EF42C +gText_OtherTrainerHasCard:: @ 85EF42C .string "The other TRAINER has the same\nWONDER CARD already.$" .align 2 -gUnknown_085EF460:: @ 85EF460 +gText_OtherTrainerHasNews:: @ 85EF460 .string "The other TRAINER has the same\nWONDER NEWS already.$" .align 2 -gUnknown_085EF494:: @ 85EF494 +gText_OtherTrainerHasStamp:: @ 85EF494 .string "The other TRAINER has the same\nSTAMP already.$" .align 2 -gUnknown_085EF4C4:: @ 85EF4C4 +gText_OtherTrainerCanceled:: @ 85EF4C4 .string "The other TRAINER canceled\ncommunication.$" .align 2 -gUnknown_085EF4F0:: @ 85EF4F0 +gText_CantSendGiftToTrainer:: @ 85EF4F0 .string "You can’t send a MYSTERY GIFT to\nthis TRAINER.$" .align 2 -gUnknown_085EF520:: @ 85EF520 +gText_IfThrowAwayCardEventWontHappen:: @ 85EF520 .string "If you throw away the CARD,\nits event won’t happen. Okay?$" .align 2 -gUnknown_085EF55C:: @ 85EF55C +gText_OkayToDiscardNews:: @ 85EF55C .string "Is it okay to discard this\nNEWS item?$" .align 2 -gUnknown_085EF584:: @ 85EF584 +gText_HaventReceivedGiftOkayToDiscard:: @ 85EF584 .string "You haven’t received the\nGIFT. Is it okay to discard?$" .align 2 -gUnknown_085EF5BC:: @ 85EF5BC +gText_DataWillBeSaved:: @ 85EF5BC .string "Data will be saved.\nPlease wait.$" .align 2 -gUnknown_085EF5E0:: @ 85EF5E0 +gText_SaveCompletedPressA:: @ 85EF5E0 .string "Save completed.\nPlease press the A Button.$" .align 2 -gUnknown_085EF60C:: @ 85EF60C +gText_WonderCardThrownAway:: @ 85EF60C .string "The WONDER CARD was thrown away.$" .align 2 -gUnknown_085EF630:: @ 85EF630 +gText_WonderNewsThrownAway:: @ 85EF630 .string "The WONDER NEWS was thrown away.$" .align 2 -gUnknown_085EF654:: @ 85EF654 +gText_MysteryGift:: @ 85EF654 .string "MYSTERY GIFT$" .align 2 -gUnknown_085EF664:: @ 85EF664 +gText_PickOKExit:: @ 85EF664 .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}EXIT$" .align 2 -gUnknown_085EF678:: @ 85EF678 +gText_PickOKCancel:: @ 85EF678 .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}OK {UNK_CTRL_F801}CANCEL$" -gUnknown_085EF68D:: @ 85EF68D +gText_PlayersBattleResults:: @ 85EF68D .string "{PLAYER}’s BATTLE RESULTS$" -gUnknown_085EF6A1:: @ 85EF6A1 +gText_TotalRecordWLD:: @ 85EF6A1 .string "TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}$" -gUnknown_085EF6BD:: @ 85EF6BD +gText_WinLoseDraw:: @ 85EF6BD .string "{CLEAR_TO 0x53}WIN{CLEAR_TO 0x80}LOSE{CLEAR_TO 0xB0}DRAW$" -gUnknown_085EF6D2:: @ 85EF6D2 +gText_CommunicationStandby5:: @ 85EF6D2 .string "Communication standby…$" -gUnknown_085EF6E9:: @ 85EF6E9 +gText_QuitTheGame:: @ 85EF6E9 .string "Quit the game?$" -gUnknown_085EF6F8:: @ 85EF6F8 +gText_YouveGot9999Coins:: @ 85EF6F8 .string "You’ve got 9,999 COINS.$" -gUnknown_085EF710:: @ 85EF710 +gText_YouveRunOutOfCoins:: @ 85EF710 .string "You’ve run out of COINS.\nGame over!$" -gUnknown_085EF734:: @ 85EF734 +gText_YouDontHaveThreeCoins:: @ 85EF734 .string "You don’t have three COINS.$" -gUnknown_085EF750:: @ 85EF750 +gText_ReelTimeHelp:: @ 85EF750 .string "REEL TIME\nHere’s your chance to take\naim and nail marks!\nReel Time continues for the\nawarded number of spins.\nIt all ends on a Big Bonus.$" + .string "The two seem to get along\nvery well.$" .string "The two seem to get along.$" .string "The two don’t seem to like\neach other much.$" .string "The two prefer to play with other\nPOKéMON than each other.$" -gUnknown_085EF881:: @ 85EF881 +gText_NewLine2:: @ 85EF881 .string "\n$" -gUnknown_085EF883:: @ 85EF883 +gText_Exit4:: @ 85EF883 .string "EXIT$" -gUnknown_085EF888:: @ 85EF888 +gText_Lv:: @ 85EF888 .string "{LV}$" -gUnknown_085EF88A:: @ 85EF88A +gText_TimeBoard:: @ 85EF88A .string "TIME BOARD$" -gUnknown_085EF895:: @ 85EF895 +gText_TimeCleared:: @ 85EF895 .string "TIME CLEARED $" -gUnknown_085EF8A3:: @ 85EF8A3 +gText_XMinYDotZSec:: @ 85EF8A3 .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" + .string "1F$" .string "2F$" .string "3F$" .string "4F$" -gUnknown_085EF8C2:: @ 85EF8C2 +gText_TeachWhichMoveToPkmn:: @ 85EF8C2 .string "Teach which move to {STR_VAR_1}?$" -gUnknown_085EF8DA:: @ 85EF8DA +gText_TeachX:: @ 85EF8DA .string "Teach {STR_VAR_2}?$" -gUnknown_085EF8E4:: @ 85EF8E4 +gText_PkmnLearnedMove4:: @ 85EF8E4 .string "{STR_VAR_1} learned\n{STR_VAR_2}!$" -gUnknown_085EF8F3:: @ 85EF8F3 +gText_PkmnTryingToLearnMove:: @ 85EF8F3 .string "{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can’t learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?$" -gUnknown_085EF960:: @ 85EF960 +gText_StopTryingToTeachMove:: @ 85EF960 .string "Stop trying to teach\n{STR_VAR_2}?$" -gUnknown_085EF979:: @ 85EF979 +gText_12AndPoof:: @ 85EF979 .string "{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE 0x0038}Poof!\p$" -gUnknown_085EF9A6:: @ 85EF9A6 +gText_PkmnForgotMoveAndLearnedNew:: @ 85EF9A6 .string "{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}.$" + .string "{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.$" -gUnknown_085EF9E6:: @ 85EF9E6 +gText_GiveUpTeachingNewMove:: @ 85EF9E6 .string "Give up trying to teach a new\nmove to {STR_VAR_1}?$" -gUnknown_085EFA10:: @ 85EFA10 +gText_WhichMoveToForget2:: @ 85EFA10 .string "Which move should be\nforgotten?\p$" -gUnknown_085EFA31:: @ 85EFA31 +gText_BattleMoves2:: @ 85EFA31 .string "BATTLE MOVES$" -gUnknown_085EFA3E:: @ 85EFA3E +gText_ContestMoves2:: @ 85EFA3E .string "CONTEST MOVES$" + .string "TYPE/$" -gUnknown_085EFA52:: @ 85EFA52 +gText_PPSlash:: @ 85EFA52 .string "PP/$" -gUnknown_085EFA56:: @ 85EFA56 +gText_PowerSlash:: @ 85EFA56 .string "POWER/$" -gUnknown_085EFA5D:: @ 85EFA5D +gText_AccuracySlash:: @ 85EFA5D .string "ACCURACY/$" -gUnknown_085EFA67:: @ 85EFA67 +gText_Appeal2:: @ 85EFA67 .string "APPEAL$" -gUnknown_085EFA6E:: @ 85EFA6E +gText_Jam2:: @ 85EFA6E .string "JAM$" + .string "KIRA$" .string "AMY$" .string "JOHN$" @@ -3461,20 +3531,21 @@ gUnknown_085EFA6E:: @ 85EFA6E .string "GABBY$" .string "ANNA$" -gUnknown_085EFA8F:: @ 85EFA8F +gText_ClearAllSaveData:: @ 85EFA8F .string "Clear all save data areas?$" -gUnknown_085EFAAA:: @ 85EFAAA +gText_ClearingData:: @ 85EFAAA .string "Clearing data…\nPlease wait.$" -gUnknown_085EFAC6:: @ 85EFAC6 +gText_IsThisTheCorrectTime:: @ 85EFAC6 .string "Is this the correct time?$" -gUnknown_085EFAE0:: @ 85EFAE0 +gText_Confirm3:: @ 85EFAE0 .string "CONFIRM$" -gUnknown_085EFAE8:: @ 85EFAE8 +gText_Cancel4:: @ 85EFAE8 .string "CANCEL$" + .string "DEVON PRES$" .string "MR. STONE$" .string "HARD AS ROCK$" @@ -3498,14 +3569,15 @@ gUnknown_085EFAE8:: @ 85EFAE8 .string "CHAMPION$" .string "{PKMN} PROF.$" -gUnknown_085EFBD2:: @ 85EFBD2 +gText_CommStandbyAwaitingOtherPlayer:: @ 85EFBD2 .string "Communication standby…\nAwaiting another player to choose.$" -gUnknown_085EFC0C:: @ 85EFC0C +gText_BattleWasRefused:: @ 85EFC0C .string "The battle was refused.{PAUSE 60}$" -gUnknown_085EFC27:: @ 85EFC27 +gText_RefusedBattle:: @ 85EFC27 .string "Refused the battle.{PAUSE 60}$" + .string "NO WEATHER$" .string "SUNNY$" .string "SUNNY2$" @@ -3527,12 +3599,12 @@ gUnknown_085EFC27:: @ 85EFC27 .string "QUIZ$" .string "ANSWER$" -gOtherText_PokeBalls:: @ 85EFCD4 +gText_PokeBalls:: @ 85EFCD4 .string "POKé BALLS$" -gOtherText_Berry:: @ 85EFCDF +gText_Berry:: @ 85EFCDF .string "BERRY$" -gOtherText_Berries:: @ 85EFCE5 +gText_Berries:: @ 85EFCE5 .string "BERRIES$" diff --git a/src/item.c b/src/item.c index c85e2fe1f..0114676b6 100644 --- a/src/item.c +++ b/src/item.c @@ -8,9 +8,9 @@ extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey); extern bool8 InBattlePyramid(void); -extern const u8 gOtherText_PokeBalls[]; -extern const u8 gOtherText_Berries[]; -extern const u8 gOtherText_Berry[]; +extern const u8 gText_PokeBalls[]; +extern const u8 gText_Berries[]; +extern const u8 gText_Berry[]; extern const u8 gUnknown_085897E4[][28]; // not sure what this one is bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); @@ -92,7 +92,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity) if (quantity < 2) StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name); else - StringCopy(string, gOtherText_PokeBalls); + StringCopy(string, gText_PokeBalls); } else { @@ -109,9 +109,9 @@ void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity) u8* txtPtr; if (quantity < 2) - berryString = gOtherText_Berry; + berryString = gText_Berry; else - berryString = gOtherText_Berries; + berryString = gText_Berries; txtPtr = StringCopy(dst, berryName); *txtPtr = CHAR_SPACE; StringCopy(txtPtr + 1, berryString); diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index 804dbda74..12d98bfd8 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -45,8 +45,8 @@ static const u8 sGiftRibbonsMonDataIds[] = MON_DATA_GIFT_RIBBON_7 }; -extern const u8 gOtherText_DecimalPoint[]; -extern const u8 gOtherText_Marco[]; +extern const u8 gText_DecimalPoint[]; +extern const u8 gText_Marco[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; #define CM_PER_INCH 2.54 @@ -103,7 +103,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size) #endif string = ConvertIntToDecimalStringN(string, size / 10, 0, 8); - string = StringAppend(string, gOtherText_DecimalPoint); + string = StringAppend(string, gText_DecimalPoint); ConvertIntToDecimalStringN(string, size % 10, 0, 1); } @@ -152,7 +152,7 @@ static void GetMonSizeRecordInfo(u16 species, u16 *sizeRecord) FormatMonSizeRecord(gStringVar3, size); StringCopy(gStringVar1, gSpeciesNames[species]); if (*sizeRecord == DEFAULT_MAX_SIZE) - StringCopy(gStringVar2, gOtherText_Marco); + StringCopy(gStringVar2, gText_Marco); else StringCopy(gStringVar2, gSaveBlock2Ptr->playerName); } diff --git a/src/start_menu.c b/src/start_menu.c index ffcab5220..ac393ce2e 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -151,7 +151,7 @@ static void BuildStartMenuActions_MultiBattleRoom(void) extern const struct WindowTemplate gSafariBallsWindowTemplate; extern const struct WindowTemplate gPyramidFloorWindowTemplate_1; extern const struct WindowTemplate gPyramidFloorWindowTemplate_2; -extern const u8 gOtherText_SafariStock[]; +extern const u8 gText_SafariBallStock[]; void DisplaySafariBallsWindow(void) { @@ -159,13 +159,13 @@ void DisplaySafariBallsWindow(void) PutWindowTilemap(sSafariBallsWindowId); sub_81973FC(sSafariBallsWindowId, 0); ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); - StringExpandPlaceholders(gStringVar4, gOtherText_SafariStock); + StringExpandPlaceholders(gStringVar4, gText_SafariBallStock); PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sSafariBallsWindowId, 2); } extern const u8* const gUnknown_08510510[]; -extern const u8 gOtherText_BattlePyramid_X[]; +extern const u8 gText_BattlePyramidFloor[]; void DisplayPyramidFloorWindow(void) { @@ -177,7 +177,7 @@ void DisplayPyramidFloorWindow(void) PutWindowTilemap(sBattlePyramidFloorWindowId); sub_81973FC(sBattlePyramidFloorWindowId, 0); StringCopy(gStringVar1, gUnknown_08510510[*(u16*)(&gSaveBlock2Ptr->field_CAA[8])]); - StringExpandPlaceholders(gStringVar4, gOtherText_BattlePyramid_X); + StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, 2); } From bf4319f25e52be0d77038de9fda8cc3a83930902 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 20:08:05 -0400 Subject: [PATCH 55/62] sub_818E6B0 --- asm/lilycove_lady.s | 66 --------------------------------------------- src/lilycove_lady.c | 23 ++++++++++++++++ 2 files changed, 23 insertions(+), 66 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 7a844c2fb..0610064f4 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,72 +5,6 @@ .text - thumb_func_start sub_818E674 -sub_818E674: @ 818E674 - push {lr} - ldr r2, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003b58 - adds r0, r1 - str r0, [r2] - movs r3, 0 - movs r1, 0x2 - strb r1, [r0] - ldr r0, [r2] - strb r3, [r0, 0x1] - ldr r2, [r2] - ldrb r0, [r2, 0x2] - cmp r0, 0x5 - beq _0818E69A - ldrb r0, [r2, 0x3] - cmp r0, 0x5 - bne _0818E69E -_0818E69A: - bl sub_818E604 -_0818E69E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E674 - - thumb_func_start sub_818E6B0 -sub_818E6B0: @ 818E6B0 - push {r4,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r4, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r3, =0x00003b58 - adds r1, r0, r3 - str r1, [r4] - ldrb r0, [r1, 0xC] - cmp r0, r2 - bhi _0818E6EA - strb r2, [r1, 0xC] - ldr r0, [r4] - adds r0, 0x4 - movs r1, 0xFF - movs r2, 0x8 - bl memset - ldr r1, [r4] - ldr r0, =gSaveBlock2Ptr - adds r1, 0x4 - ldr r0, [r0] - ldm r0!, {r2,r3} - stm r1!, {r2,r3} - ldr r1, [r4] - ldr r0, =gGameLanguage - ldrb r0, [r0] - strb r0, [r1, 0xE] -_0818E6EA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E6B0 - thumb_func_start sub_818E704 sub_818E704: @ 818E704 push {r4,r5,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index f6471828b..52f910598 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -733,3 +733,26 @@ void SetLilycoveContestLady(void) sub_818E604(); gUnknown_0203CD6C->language = gGameLanguage; } + +void sub_818E674(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; + gUnknown_0203CD6C->phase = 0; + if (gUnknown_0203CD6C->fave_pkblk == 5 || gUnknown_0203CD6C->other_pkblk == 5) + { + sub_818E604(); + } +} + +void sub_818E6B0(u8 sheen) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + if (gUnknown_0203CD6C->max_sheen <= sheen) + { + gUnknown_0203CD6C->max_sheen = sheen; + memset(gUnknown_0203CD6C->playerName, EOS, sizeof(gUnknown_0203CD6C->playerName)); + memcpy(gUnknown_0203CD6C->playerName, gSaveBlock2Ptr->playerName, sizeof(gUnknown_0203CD6C->playerName)); + gUnknown_0203CD6C->language = gGameLanguage; + } +} \ No newline at end of file From 25ffdf734284db4bd418d6f2ff74a9d895cb4498 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 20:16:11 -0400 Subject: [PATCH 56/62] sub_818E704 --- asm/lilycove_lady.s | 72 --------------------------------------------- src/lilycove_lady.c | 60 ++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 73 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 0610064f4..f3eca44e7 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,78 +5,6 @@ .text - thumb_func_start sub_818E704 -sub_818E704: @ 818E704 - push {r4,r5,lr} - adds r2, r0, 0 - movs r3, 0 - movs r4, 0 - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r5, =0x00003b58 - adds r0, r5 - str r0, [r1] - ldrb r0, [r0, 0xD] - adds r5, r1, 0 - cmp r0, 0x4 - bhi _0818E76A - lsls r0, 2 - ldr r1, =_0818E73C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0818E73C: - .4byte _0818E750 - .4byte _0818E754 - .4byte _0818E758 - .4byte _0818E75C - .4byte _0818E760 -_0818E750: - ldrb r0, [r2, 0x1] - b _0818E762 -_0818E754: - ldrb r0, [r2, 0x2] - b _0818E762 -_0818E758: - ldrb r0, [r2, 0x3] - b _0818E762 -_0818E75C: - ldrb r0, [r2, 0x4] - b _0818E762 -_0818E760: - ldrb r0, [r2, 0x5] -_0818E762: - cmp r0, 0 - beq _0818E76A - adds r3, r0, 0 - movs r4, 0x1 -_0818E76A: - cmp r4, 0x1 - bne _0818E784 - adds r0, r3, 0 - bl sub_818E6B0 - ldr r0, =gUnknown_0203CD6C - ldr r1, [r0] - ldrb r0, [r1, 0x2] - adds r0, 0x1 - strb r0, [r1, 0x2] - b _0818E78C - .pool -_0818E784: - ldr r1, [r5] - ldrb r0, [r1, 0x3] - adds r0, 0x1 - strb r0, [r1, 0x3] -_0818E78C: - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_818E704 - thumb_func_start sub_818E794 sub_818E794: @ 818E794 push {r4,r5,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 52f910598..30b5d6b21 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -755,4 +755,62 @@ void sub_818E6B0(u8 sheen) memcpy(gUnknown_0203CD6C->playerName, gSaveBlock2Ptr->playerName, sizeof(gUnknown_0203CD6C->playerName)); gUnknown_0203CD6C->language = gGameLanguage; } -} \ No newline at end of file +} + +bool8 sub_818E704(struct Pokeblock *pokeblock) +{ + u8 sheen; + bool8 response; + + sheen = 0; + response = FALSE; + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + switch (gUnknown_0203CD6C->category) + { + case 0: + if (pokeblock->spicy != 0) + { + sheen = pokeblock->spicy; + response = TRUE; + } + break; + case 1: + if (pokeblock->dry != 0) + { + sheen = pokeblock->dry; + response = TRUE; + } + break; + case 2: + if (pokeblock->sweet != 0) + { + sheen = pokeblock->sweet; + response = TRUE; + } + break; + case 3: + if (pokeblock->bitter != 0) + { + sheen = pokeblock->bitter; + response = TRUE; + } + break; + case 4: + if (pokeblock->sour != 0) + { + sheen = pokeblock->sour; + response = TRUE; + } + break; + } + if (response == TRUE) + { + sub_818E6B0(sheen); + gUnknown_0203CD6C->fave_pkblk ++; + } + else + { + gUnknown_0203CD6C->other_pkblk ++; + } + return response; +} From c56b6fc9a46d92824b8eb6b61bc2dc1f525c0757 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 20:24:22 -0400 Subject: [PATCH 57/62] sub_818E794 --- asm/lilycove_lady.s | 30 ------------------------------ src/lilycove_lady.c | 9 +++++++++ 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index f3eca44e7..a3f455065 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,36 +5,6 @@ .text - thumb_func_start sub_818E794 -sub_818E794: @ 818E794 - push {r4,r5,lr} - adds r5, r1, 0 - ldr r4, =gUnknown_0203CD6C - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r2, =0x00003b58 - adds r1, r2 - str r1, [r4] - ldr r2, =gUnknown_0860B324 - ldrb r1, [r1, 0xD] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - ldr r1, =gUnknown_0860B310 - ldr r0, [r4] - ldrb r0, [r0, 0xD] - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - adds r0, r5, 0 - bl StringCopy10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E794 - thumb_func_start sub_818E7E0 sub_818E7E0: @ 818E7E0 push {r4,lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 30b5d6b21..efbc791e8 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -35,6 +35,8 @@ extern const u16 *const gUnknown_0860B1A4[16]; extern const u16 gUnknown_0860B1E4[16]; extern const u16 gUnknown_0860B204[16]; extern const u8 gUnknown_085EEB7E[8]; +extern const u8 *const gUnknown_0860B324[5]; +extern const u8 *const gUnknown_0860B310[5]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; @@ -814,3 +816,10 @@ bool8 sub_818E704(struct Pokeblock *pokeblock) } return response; } + +void sub_818E794(u8 *dest1, u8 *dest2) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]); + StringCopy10(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]); +} From faf844f332e95d39660db3f76f78ed480d4845bf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 20:32:22 -0400 Subject: [PATCH 58/62] through sub_818E880 --- asm/lilycove_lady.s | 98 --------------------------------------------- src/lilycove_lady.c | 52 +++++++++++++++++++++--- 2 files changed, 47 insertions(+), 103 deletions(-) diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index a3f455065..835d2959c 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,104 +5,6 @@ .text - thumb_func_start sub_818E7E0 -sub_818E7E0: @ 818E7E0 - push {r4,lr} - adds r3, r1, 0 - ldr r2, =gUnknown_0203CD6C - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r4, =0x00003b58 - adds r1, r4 - str r1, [r2] - ldrb r2, [r1, 0xD] - strb r2, [r0] - ldr r2, =gUnknown_0860B310 - ldrb r0, [r1, 0xD] - lsls r0, 2 - adds r0, r2 - ldr r1, [r0] - adds r0, r3, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E7E0 - - thumb_func_start sub_818E81C -sub_818E81C: @ 818E81C - push {r4,lr} - ldr r3, =gUnknown_0203CD6C - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r4, =0x00003b58 - adds r2, r1, r4 - str r2, [r3] - ldr r2, =0x00003b5c - adds r1, r2 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E81C - - thumb_func_start sub_818E848 -sub_818E848: @ 818E848 - ldr r2, =gUnknown_0203CD6C - ldr r1, =gSaveBlock1Ptr - ldr r1, [r1] - ldr r3, =0x00003b58 - adds r1, r3 - str r1, [r2] - ldrb r1, [r1, 0xE] - strb r1, [r0] - bx lr - .pool - thumb_func_end sub_818E848 - - thumb_func_start sub_818E868 -sub_818E868: @ 818E868 - push {lr} - lsls r1, 24 - ldr r2, =gUnknown_0860B338 - lsrs r1, 22 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E868 - - thumb_func_start sub_818E880 -sub_818E880: @ 818E880 - push {lr} - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0x2] - cmp r0, 0x4 - bls _0818E8A4 - movs r0, 0x1 - b _0818E8AE - .pool -_0818E8A4: - cmp r0, 0 - beq _0818E8AC - movs r0, 0 - b _0818E8AE -_0818E8AC: - movs r0, 0x2 -_0818E8AE: - pop {r1} - bx r1 - thumb_func_end sub_818E880 - thumb_func_start sub_818E8B4 sub_818E8B4: @ 818E8B4 push {lr} diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index efbc791e8..d142323c4 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -26,17 +26,18 @@ u8 sub_818E13C(void); bool8 sub_818E1F4(void); u8 sub_818E258(const u8 *); +extern const u8 gUnknown_085EEB7E[8]; extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; -extern const u8 *const gUnknown_0860B224[]; -extern const u16 *const gUnknown_0860B2EC[6]; -extern const u16 gUnknown_0860B304[6]; extern const u16 *const gUnknown_0860B1A4[16]; extern const u16 gUnknown_0860B1E4[16]; extern const u16 gUnknown_0860B204[16]; -extern const u8 gUnknown_085EEB7E[8]; -extern const u8 *const gUnknown_0860B324[5]; +extern const u8 *const gUnknown_0860B224[]; +extern const u16 *const gUnknown_0860B2EC[6]; +extern const u16 gUnknown_0860B304[6]; extern const u8 *const gUnknown_0860B310[5]; +extern const u8 *const gUnknown_0860B324[5]; +extern const u8 *const gUnknown_0860B338[5]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; @@ -823,3 +824,44 @@ void sub_818E794(u8 *dest1, u8 *dest2) StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]); StringCopy10(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]); } + +void sub_818E7E0(u8 *dest1, u8 *dest2) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + *dest1 = gUnknown_0203CD6C->category; + StringCopy(dest2, gUnknown_0860B310[gUnknown_0203CD6C->category]); +} + +void sub_818E81C(u8 *dest) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + StringCopy(dest, gUnknown_0203CD6C->playerName); +} + +void sub_818E848(u8 *dest) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + *dest = gUnknown_0203CD6C->language; +} + +void sub_818E868(u8 *dest, u8 category) +{ + StringCopy(dest, gUnknown_0860B338[category]); +} + +u8 sub_818E880(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + if (gUnknown_0203CD6C->fave_pkblk >= 5) + { + return 1; + } + else if (gUnknown_0203CD6C->fave_pkblk == 0) + { + return 2; + } + else + { + return 0; + } +} From d263750f1903a89fc61b2496453ff1c5b4b9a58b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 20:48:32 -0400 Subject: [PATCH 59/62] remaining lilycove lady functions --- asm/lilycove_lady.s | 116 -------------------------------------------- include/rom4.h | 1 + include/rom6.h | 6 +++ src/lilycove_lady.c | 54 +++++++++++++++++++++ 4 files changed, 61 insertions(+), 116 deletions(-) create mode 100644 include/rom6.h diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s index 835d2959c..1fb697d08 100644 --- a/asm/lilycove_lady.s +++ b/asm/lilycove_lady.s @@ -5,121 +5,5 @@ .text - thumb_func_start sub_818E8B4 -sub_818E8B4: @ 818E8B4 - push {lr} - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - beq _0818E8D8 - movs r0, 0 - b _0818E8DA - .pool -_0818E8D8: - movs r0, 0x1 -_0818E8DA: - pop {r1} - bx r1 - thumb_func_end sub_818E8B4 - - thumb_func_start sub_818E8E0 -sub_818E8E0: @ 818E8E0 - push {r4,lr} - movs r3, 0 - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r4, =0x00003b58 - adds r2, r0, r4 - str r2, [r1] - ldrb r0, [r2, 0x2] - cmp r0, 0x4 - bhi _0818E8FC - ldrb r0, [r2, 0x3] - cmp r0, 0x4 - bls _0818E8FE -_0818E8FC: - movs r3, 0x1 -_0818E8FE: - adds r0, r3, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_818E8E0 - - thumb_func_start sub_818E914 -sub_818E914: @ 818E914 - push {lr} - ldr r0, =gStringVar2 - ldr r1, =gStringVar1 - bl sub_818E794 - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E914 - - thumb_func_start sub_818E92C -sub_818E92C: @ 818E92C - push {lr} - ldr r1, =c2_exit_to_overworld_2_switch - movs r0, 0x3 - bl sub_81357FC - pop {r0} - bx r0 - .pool - thumb_func_end sub_818E92C - - thumb_func_start sub_818E940 -sub_818E940: @ 818E940 - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - movs r1, 0x1 - strb r1, [r0, 0x1] - bx lr - .pool - thumb_func_end sub_818E940 - - thumb_func_start sub_818E960 -sub_818E960: @ 818E960 - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldr r2, =gSpecialVar_0x8005 - ldr r1, =gUnknown_0860B34C - ldrb r0, [r0, 0xD] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_818E960 - - thumb_func_start sub_818E990 -sub_818E990: @ 818E990 - ldr r1, =gUnknown_0203CD6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x00003b58 - adds r0, r2 - str r0, [r1] - ldrb r0, [r0, 0xD] - bx lr - .pool - thumb_func_end sub_818E990 - .align 2, 0 @ Don't pad with nop. diff --git a/include/rom4.h b/include/rom4.h index a1c4281e9..e19d277a6 100644 --- a/include/rom4.h +++ b/include/rom4.h @@ -28,5 +28,6 @@ void strange_npc_table_clear(void); const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); +void c2_exit_to_overworld_2_switch(void); #endif //GUARD_ROM4_H diff --git a/include/rom6.h b/include/rom6.h new file mode 100644 index 000000000..15070616d --- /dev/null +++ b/include/rom6.h @@ -0,0 +1,6 @@ +#ifndef GUARD_ROM6_H +#define GUARD_ROM6_H + +void sub_81357FC(u8, void(void)); + +#endif //GUARD_ROM6_H diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index d142323c4..41112e40b 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -4,6 +4,8 @@ #include "global.h" #include "main.h" +#include "rom4.h" +#include "rom6.h" #include "event_data.h" #include "script.h" #include "rng.h" @@ -38,6 +40,7 @@ extern const u16 gUnknown_0860B304[6]; extern const u8 *const gUnknown_0860B310[5]; extern const u8 *const gUnknown_0860B324[5]; extern const u8 *const gUnknown_0860B338[5]; +extern const u16 gUnknown_0860B34C[5]; EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; @@ -865,3 +868,54 @@ u8 sub_818E880(void) return 0; } } + +bool8 sub_818E8B4(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + if (gUnknown_0203CD6C->phase == 1) + { + return TRUE; + } + return FALSE; +} + +bool8 sub_818E8E0(void) +{ + bool8 response; + + response = FALSE; + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + if (gUnknown_0203CD6C->fave_pkblk >= 5 || gUnknown_0203CD6C->other_pkblk >= 5) + { + response = TRUE; + } + return response; +} + +void sub_818E914(void) +{ + sub_818E794(gStringVar2, gStringVar1); +} + +void sub_818E92C(void) +{ + sub_81357FC(3, c2_exit_to_overworld_2_switch); +} + +void sub_818E940(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + gUnknown_0203CD6C->phase = 1; +} + +void sub_818E960(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category]; +} + +u8 sub_818E990(void) +{ + gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; + return gUnknown_0203CD6C->category; +} From 942fbe87d42ed1208217deac3cfa4f21908d446a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 21:03:57 -0400 Subject: [PATCH 60/62] Populate header, label as static whatever won't break things --- asm/lilycove_lady.s | 9 ------ include/easy_chat.h | 1 + include/lilycove_lady.h | 11 +++++++ src/lilycove_lady.c | 67 ++++++++++++++++++++--------------------- sym_ewram.txt | 9 +----- 5 files changed, 46 insertions(+), 51 deletions(-) delete mode 100644 asm/lilycove_lady.s diff --git a/asm/lilycove_lady.s b/asm/lilycove_lady.s deleted file mode 100644 index 1fb697d08..000000000 --- a/asm/lilycove_lady.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - -.align 2, 0 @ Don't pad with nop. diff --git a/include/easy_chat.h b/include/easy_chat.h index d7dc72410..fc44b6a8a 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -31,5 +31,6 @@ enum void InitEasyChatPhrases(void); void easy_chat_input_maybe(void); void CopyEasyChatWord(u8 *, u16); +bool32 sub_811F8D8(u16); #endif // GUARD_EASYCHAT_H diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h index 81825d8ac..c7776131b 100644 --- a/include/lilycove_lady.h +++ b/include/lilycove_lady.h @@ -1,6 +1,17 @@ #ifndef GUARD_LILYCOVE_LADY_H #define GUARD_LILYCOVE_LADY_H +u8 GetLilycoveLadyId(void); void SetLilycoveLady(void); +void sub_818DA78(void); +void sub_818DEF4(void); +void sub_818E564(void); +void sub_818E570(const struct LilycoveLadyQuiz *quiz); +bool8 sub_818E704(struct Pokeblock *pokeblock); +void sub_818E7E0(u8 *dest1, u8 *dest2); +void sub_818E81C(u8 *dest); +void sub_818E848(u8 *dest); +void sub_818E868(u8 *dest, u8 category); +u8 sub_818E880(void); #endif //GUARD_LILYCOVE_LADY_H diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 41112e40b..4839571ae 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -17,16 +17,15 @@ #include "easy_chat.h" #include "lilycove_lady.h" -void SetLilycoveQuizLady(void); -void SetLilycoveFavourLady(void); -void SetLilycoveContestLady(void); -void sub_818E004(void); -void sub_818DBC4(void); -void sub_818E674(void); -bool32 sub_811F8D8(u16); -u8 sub_818E13C(void); -bool8 sub_818E1F4(void); -u8 sub_818E258(const u8 *); +static void SetLilycoveQuizLady(void); +static void SetLilycoveFavourLady(void); +static void SetLilycoveContestLady(void); +static void sub_818E004(void); +static void sub_818DBC4(void); +static void sub_818E674(void); +static u8 sub_818E13C(void); +static bool8 sub_818E1F4(void); +static u8 sub_818E258(const u8 *); extern const u8 gUnknown_085EEB7E[8]; extern const u16 gUnknown_0860B074[5]; @@ -42,9 +41,9 @@ extern const u8 *const gUnknown_0860B324[5]; extern const u8 *const gUnknown_0860B338[5]; extern const u16 gUnknown_0860B34C[5]; -EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; -EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; -EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL; +static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; +static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL; +static EWRAM_DATA struct LilycoveLadyContest *gUnknown_0203CD6C = NULL; extern EWRAM_DATA u16 gScriptItemId; @@ -131,7 +130,7 @@ void sub_818DAEC(void) gScriptResult = GetLilycoveLadyId(); } -u8 sub_818DB04(const u16 *data) +static u8 sub_818DB04(const u16 *data) { u8 len; @@ -139,7 +138,7 @@ u8 sub_818DB04(const u16 *data) return len; } -void sub_818DB20(void) +static void sub_818DB20(void) { u8 size; u8 idx; @@ -150,7 +149,7 @@ void sub_818DB20(void) gUnknown_0203CD64->unk_010 = gUnknown_0860B2EC[gUnknown_0203CD64->unk_00c][idx]; } -void SetLilycoveFavourLady(void) +static void SetLilycoveFavourLady(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; @@ -163,7 +162,7 @@ void SetLilycoveFavourLady(void) sub_818DB20(); } -void sub_818DBC4(void) +static void sub_818DBC4(void) { gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; gUnknown_0203CD64->id = LILYCOVE_LADY_FAVOUR; @@ -187,7 +186,7 @@ u8 sub_818DBE8(void) } } -const u8 *sub_818DC1C(u8 idx) +static const u8 *sub_818DC1C(u8 idx) { return gUnknown_0860B224[idx]; } @@ -210,7 +209,7 @@ bool8 sub_818DC60(void) return FALSE; } -void sub_818DCAC(u8 *dest, u16 itemId) +static void sub_818DCAC(u8 *dest, u16 itemId) { StringCopy(dest, ItemId_GetItem(itemId)->name); } @@ -221,7 +220,7 @@ void sub_818DCC8(void) sub_818DCAC(gStringVar2, gUnknown_0203CD64->itemId); } -void sub_818DCF4(const u8 *src, u8 *dest) +static void sub_818DCF4(const u8 *src, u8 *dest) { memset(dest, 0xFF, 8); StringCopy7(dest, src); @@ -245,7 +244,7 @@ void sub_818DD78(void) sub_81AAC50(); } -bool8 sub_818DD84(u16 itemId) +static bool8 sub_818DD84(u16 itemId) { u8 len; u8 i; @@ -291,7 +290,7 @@ bool8 sub_818DE5C(void) return checkval < 5 ? FALSE : TRUE; } -void sub_818DE88(u16 itemId) +static void sub_818DE88(u16 itemId) { sub_818DCAC(gStringVar2, itemId); } @@ -318,7 +317,7 @@ void sub_818DEF4(void) EnableBothScriptContexts(); } -void sub_818DF00(void) +static void sub_818DF00(void) { u8 v0; u8 i; @@ -334,7 +333,7 @@ void sub_818DF00(void) gUnknown_0203CD68->playerName[0] = EOS; } -void SetLilycoveQuizLady(void) +static void SetLilycoveQuizLady(void) { u8 i; @@ -358,7 +357,7 @@ void SetLilycoveQuizLady(void) sub_818DF00(); } -void sub_818E004(void) +static void sub_818E004(void) { gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz; gUnknown_0203CD68->id = LILYCOVE_LADY_QUIZ; @@ -427,7 +426,7 @@ u8 sub_818E06C(void) } #ifdef NONMATCHING -u8 sub_818E13C(void) +static u8 sub_818E13C(void) { u8 retval; u8 len; @@ -461,7 +460,7 @@ u8 sub_818E13C(void) return retval; } #else -__attribute__((naked)) u8 sub_818E13C(void) +__attribute__((naked)) static u8 sub_818E13C(void) { asm_unified("\tpush {r4-r7,lr}\n" "\tmovs r7, 0x1\n" @@ -540,7 +539,7 @@ __attribute__((naked)) u8 sub_818E13C(void) } #endif -u8 sub_818E1F4(void) +static u8 sub_818E1F4(void) { bool8 response; u8 i; @@ -558,7 +557,7 @@ u8 sub_818E1F4(void) return response; } -u8 sub_818E258(const u8 *str) +static u8 sub_818E258(const u8 *str) { u8 len; const u8 *ptr; @@ -722,7 +721,7 @@ void sub_818E570(const struct LilycoveLadyQuiz *quiz) } } -void sub_818E604(void) +static void sub_818E604(void) { gUnknown_0203CD6C->playerName[0] = EOS; gUnknown_0203CD6C->fave_pkblk = 0; @@ -731,7 +730,7 @@ void sub_818E604(void) gUnknown_0203CD6C->category = Random() % 5; } -void SetLilycoveContestLady(void) +static void SetLilycoveContestLady(void) { gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; @@ -740,7 +739,7 @@ void SetLilycoveContestLady(void) gUnknown_0203CD6C->language = gGameLanguage; } -void sub_818E674(void) +static void sub_818E674(void) { gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; gUnknown_0203CD6C->id = LILYCOVE_LADY_CONTEST; @@ -751,7 +750,7 @@ void sub_818E674(void) } } -void sub_818E6B0(u8 sheen) +static void sub_818E6B0(u8 sheen) { gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; if (gUnknown_0203CD6C->max_sheen <= sheen) @@ -821,7 +820,7 @@ bool8 sub_818E704(struct Pokeblock *pokeblock) return response; } -void sub_818E794(u8 *dest1, u8 *dest2) +static void sub_818E794(u8 *dest1, u8 *dest2) { gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; StringCopy(dest1, gUnknown_0860B324[gUnknown_0203CD6C->category]); diff --git a/sym_ewram.txt b/sym_ewram.txt index 1995bf7bf..a4e61fd05 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1768,14 +1768,7 @@ gUnknown_0203CCEC: @ 203CCEC gUnknown_0203CD04: @ 203CD04 .space 0x60 -gUnknown_0203CD64: @ 203CD64 - .space 0x4 - -gUnknown_0203CD68: @ 203CD68 - .space 0x4 - -gUnknown_0203CD6C: @ 203CD6C - .space 0x4 + .include "src/lilycove_lady.o" gUnknown_0203CD70: @ 203CD70 .space 0x4 From 63a25a34a77a9e42901ccd13ae691b30130f9925 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 21:42:14 -0400 Subject: [PATCH 61/62] Disassemble lilycove lady data --- data/data_emerald.s | 42 ++--------- data/lilycove_lady.s | 163 +++++++++++++++++++++++++++++++++++++++++++ data/strings.s | 42 +++++++++++ ld_script.txt | 2 + src/lilycove_lady.c | 3 +- 5 files changed, 215 insertions(+), 37 deletions(-) create mode 100644 data/lilycove_lady.s diff --git a/data/data_emerald.s b/data/data_emerald.s index 54bda4a0e..38c50a6c8 100644 --- a/data/data_emerald.s +++ b/data/data_emerald.s @@ -1,7 +1,11 @@ .include "asm/macros.inc" .include "constants/constants.inc" - .section .rodata + @ This section was decompiled in battle_dome_cards. + @ On its merge, this section should be deleted. + @ This section contains three objects and accounts for 28 bytes. + + .section .rodata.deleteme gUnknown_0860B058:: @ 860B058 .incbin "baserom.gba", 0x60b058, 0xc @@ -12,41 +16,7 @@ gUnknown_0860B064:: @ 860B064 gUnknown_0860B06C:: @ 860B06C .incbin "baserom.gba", 0x60b06c, 0x8 -gUnknown_0860B074:: @ 860B074 - .incbin "baserom.gba", 0x60b074, 0xa - -gUnknown_0860B07E:: @ 860B07E - .incbin "baserom.gba", 0x60b07e, 0x126 - -gUnknown_0860B1A4:: @ 860B1A4 - .incbin "baserom.gba", 0x60b1a4, 0x40 - -gUnknown_0860B1E4:: @ 860B1E4 - .incbin "baserom.gba", 0x60b1e4, 0x20 - -gUnknown_0860B204:: @ 860B204 - .incbin "baserom.gba", 0x60b204, 0x20 - -gUnknown_0860B224:: @ 860B224 - .incbin "baserom.gba", 0x60b224, 0xc8 - -gUnknown_0860B2EC:: @ 860B2EC - .incbin "baserom.gba", 0x60b2ec, 0x18 - -gUnknown_0860B304:: @ 860B304 - .incbin "baserom.gba", 0x60b304, 0xc - -gUnknown_0860B310:: @ 860B310 - .incbin "baserom.gba", 0x60b310, 0x14 - -gUnknown_0860B324:: @ 860B324 - .incbin "baserom.gba", 0x60b324, 0x14 - -gUnknown_0860B338:: @ 860B338 - .incbin "baserom.gba", 0x60b338, 0x14 - -gUnknown_0860B34C:: @ 860B34C - .incbin "baserom.gba", 0x60b34c, 0xc + .section .rodata gUnknown_0860B358:: @ 860B358 .incbin "baserom.gba", 0x60b358, 0x1630 diff --git a/data/lilycove_lady.s b/data/lilycove_lady.s new file mode 100644 index 000000000..9d076213c --- /dev/null +++ b/data/lilycove_lady.s @@ -0,0 +1,163 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_0860B074:: @ 860B074 +@ replacing .incbin "baserom.gba", 0x0060b074, 0xa + .2byte 0x0062, 0x00cb, 0x00dc, 0x00cc, 0x00d1 + +gUnknown_0860B07E:: @ 860B07E +@ replacing .incbin "baserom.gba", 0x0060b07e, 0x6 + .2byte 0x001a, 0x0014, 0x000a + +Unknown_0860B084:: + .2byte 0x101b, 0x1623, 0x1812, 0x102c, 0x020e, 0x0c03, 0x1a0b, 0x0210, 0x020d + +Unknown_0860B096:: + .2byte 0x101b, 0x1013, 0x1020, 0x1a0f, 0x020c, 0x0c03, 0x0211, 0x0203, 0x0400 + +Unknown_0860B0A8:: + .2byte 0x0e0f, 0x1018, 0x020e, 0x0204, 0x0c03, 0xffff, 0x0212, 0x0451, 0x0463 + +Unknown_0860B0BA:: + .2byte 0x101b, 0x100b, 0x0e0d, 0x141a, 0x181d, 0x0c03, 0x141e, 0x1a26, 0x1823 + +Unknown_0860B0CC:: + .2byte 0x101b, 0x181d, 0x1018, 0x0a02, 0x2014, 0x0c03, 0x0208, 0x1824, 0x181c + +Unknown_0860B0DE:: + .2byte 0x101b, 0x1000, 0x1c19, 0x265d, 0x0c03, 0xffff, 0x0447, 0x045d, 0x042c + +Unknown_0860B0F0:: + .2byte 0x101b, 0x1034, 0x1e11, 0x100b, 0x1a08, 0x0c03, 0x044b, 0x0446, 0x040a + +Unknown_0860B102:: + .2byte 0x101b, 0x1000, 0x274f, 0x0626, 0x0c03, 0xffff, 0x0442, 0x0411, 0x0450 + +Unknown_0860B114:: + .2byte 0x101b, 0x1000, 0x1c19, 0x043c, 0x0c03, 0xffff, 0x0421, 0x0464, 0x0435 + +Unknown_0860B126:: + .2byte 0x101b, 0x1203, 0x1030, 0x0207, 0x0c03, 0xffff, 0x0210, 0x020e, 0x020d + +Unknown_0860B138:: + .2byte 0x101b, 0x1623, 0x0a05, 0x020e, 0x0c03, 0xffff, 0x1a25, 0x181a, 0x181b + +Unknown_0860B14A:: + .2byte 0x101b, 0x1823, 0x1603, 0x0a02, 0x1812, 0x0c03, 0x1a15, 0x1a23, 0x181b + +Unknown_0860B15C:: + .2byte 0x1020, 0x020e, 0x1010, 0x1043, 0x1e0f, 0x0c03, 0x181c, 0x1a24, 0x1816 + +Unknown_0860B16E:: + .2byte 0x0446, 0x100b, 0x0620, 0x061c, 0x101b, 0x0c03, 0x0420, 0x0426, 0xffff + +Unknown_0860B180:: + .2byte 0x0400, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x040e, 0x0410, 0xffff + +Unknown_0860B192:: + .2byte 0x041f, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x0445, 0x0400, 0xffff + +gUnknown_0860B1A4:: @ 860B1A4 +@ replacing .incbin "baserom.gba", 0x0060b1a4, 0x40 + .4byte Unknown_0860B084 + .4byte Unknown_0860B096 + .4byte Unknown_0860B0A8 + .4byte Unknown_0860B0BA + .4byte Unknown_0860B0CC + .4byte Unknown_0860B0DE + .4byte Unknown_0860B0F0 + .4byte Unknown_0860B102 + .4byte Unknown_0860B114 + .4byte Unknown_0860B126 + .4byte Unknown_0860B138 + .4byte Unknown_0860B14A + .4byte Unknown_0860B15C + .4byte Unknown_0860B16E + .4byte Unknown_0860B180 + .4byte Unknown_0860B192 + +gUnknown_0860B1E4:: @ 860B1E4 +@ replacing .incbin "baserom.gba", 0x0060b1e4, 0x20 + .2byte 0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400 + +gUnknown_0860B204:: @ 860B204 +@ replacing .incbin "baserom.gba", 0x0060b204, 0x20 + .2byte 0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c + +gUnknown_0860B224:: @ 860B224 +@ replacing .incbin "baserom.gba", 0x0060b224, 0xc8 + .4byte gUnknown_085EEB83 + .4byte gUnknown_085EEB8C + .4byte gUnknown_085EEB95 + .4byte gUnknown_085EEB9E + .4byte gUnknown_085EEBA4 + .4byte gUnknown_085EEBAB + +Unknown_0860B23C:: +@ replacing .incbin "baserom.gba", 0x0060b23c, 0x1a +.2byte 0x0056, 0x0053, 0x0054, 0x000e, 0x0012, 0x000f, 0x00a7, 0x0011, 0x0010, 0x0018, 0x0019, 0x001e, 0x0000 + +Unknown_0860B256:: +@ replacing .incbin "baserom.gba", 0x0060b256, 0x22 +.2byte 0x0051, 0x006a, 0x006b, 0x00cc, 0x00c2, 0x002f, 0x0067, 0x0068, 0x0087, 0x0089, 0x008b, 0x009d, 0x00a0, 0x00a5, 0x0004, 0x0002 +.2byte 0x0000 + +Unknown_0860B278:: +@ replacing .incbin "baserom.gba", 0x0060b278, 0x1e +.2byte 0x0021, 0x000d, 0x001a, 0x001b, 0x001c, 0x00cc, 0x00ca, 0x0026, 0x0086, 0x0096, 0x0097, 0x009a, 0x00a2, 0x00a6, 0x0000 + +Unknown_0860B296:: +@ replacing .incbin "baserom.gba", 0x0060b296, 0x2a +.2byte 0x0020, 0x004d, 0x004b, 0x004c, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x006e, 0x005d, 0x006c, 0x006d, 0x006a, 0x006b, 0x00d6 +.2byte 0x00bc, 0x00b3, 0x000b, 0x000c, 0x0000 + +Unknown_0860B2C0:: +@ replacing .incbin "baserom.gba", 0x0060b2c0, 0x16 +.2byte 0x001f, 0x0013, 0x0014, 0x004a, 0x004e, 0x0049, 0x00a5, 0x00c8, 0x0067, 0x006f, 0x0000 + +Unknown_0860B2D6:: +@ replacing .incbin "baserom.gba", 0x0060b2d6, 0x16 +.2byte 0x00b7, 0x00d3, 0x00d2, 0x00d8, 0x009e, 0x00a6, 0x00ab, 0x00aa, 0x006c, 0x006d, 0x0000 + +gUnknown_0860B2EC:: @ 860B2EC +@ replacing .incbin "baserom.gba", 0x0060b2ec, 0x18 + .4byte Unknown_0860B23C + .4byte Unknown_0860B256 + .4byte Unknown_0860B278 + .4byte Unknown_0860B296 + .4byte Unknown_0860B2C0 + .4byte Unknown_0860B2D6 + +gUnknown_0860B304:: @ 860B304 +@ replacing .incbin "baserom.gba", 0x0060b304, 0xc +.2byte 0x000b, 0x006e, 0x0040, 0x006f, 0x0044, 0x0047 + +gUnknown_0860B310:: @ 860B310 +@ replacing .incbin "baserom.gba", 0x0060b310, 0x14 + .4byte gUnknown_085EEB2B + .4byte gUnknown_085EEB34 + .4byte gUnknown_085EEB3A + .4byte gUnknown_085EEB41 + .4byte gUnknown_085EEB4A + +gUnknown_0860B324:: @ 860B324 +@ replacing .incbin "baserom.gba", 0x0060b324, 0x14 + .4byte gUnknown_085EEB51 + .4byte gUnknown_085EEB5A + .4byte gUnknown_085EEB61 + .4byte gUnknown_085EEB6A + .4byte gUnknown_085EEB74 + +gUnknown_0860B338:: @ 860B338 +@ replacing .incbin "baserom.gba", 0x0060b338, 0x14 + .4byte gUnknown_085EADA4 + .4byte gUnknown_085EADB5 + .4byte gUnknown_085EADC4 + .4byte gUnknown_085EADD5 + .4byte gUnknown_085EADE7 + +gUnknown_0860B34C:: @ 860B34C +@ replacing .incbin "baserom.gba", 0x0060b34c, 0xc + .2byte 0x0120, 0x013b, 0x011e, 0x013d, 0x0019 diff --git a/data/strings.s b/data/strings.s index c8a1b7683..afdda0b29 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1246,10 +1246,20 @@ gUnknown_085EAD30:: @ 85EAD30 .string "Types of CONTESTS$" .string "Ranks$" .string "Judging$" + +gUnknown_085EADA4:: .string "COOLNESS CONTEST$" + +gUnknown_085EADB5:: .string "BEAUTY CONTEST$" + +gUnknown_085EADC4:: .string "CUTENESS CONTEST$" + +gUnknown_085EADD5:: .string "SMARTNESS CONTEST$" + +gUnknown_085EADE7:: .string "TOUGHNESS CONTEST$" .string "DECORATION$" .string "PACK UP$" @@ -2967,24 +2977,56 @@ gUnknown_085EEAF6:: @ 85EEAF6 gUnknown_085EEB0B:: @ 85EEB0B .string "A call can’t be made from here.$" + +gUnknown_085EEB2B:: .string "HANDSOME$" + +gUnknown_085EEB34:: .string "VINNY$" + +gUnknown_085EEB3A:: .string "MOREME$" + +gUnknown_085EEB41:: .string "IRONHARD$" + +gUnknown_085EEB4A:: .string "MUSCLE$" + +gUnknown_085EEB51:: .string "coolness$" + +gUnknown_085EEB5A:: .string "beauty$" + +gUnknown_085EEB61:: .string "cuteness$" + +gUnknown_085EEB6A:: .string "smartness$" + +gUnknown_085EEB74:: .string "toughness$" gUnknown_085EEB7E:: @ 85EEB7E .string "Lady$" + +gUnknown_085EEB83:: .string "slippery$" + +gUnknown_085EEB8C:: .string "roundish$" + +gUnknown_085EEB95:: .string "wham-ish$" + +gUnknown_085EEB9E:: .string "shiny$" + +gUnknown_085EEBA4:: .string "sticky$" + +gUnknown_085EEBAB:: .string "pointy$" gUnknown_085EEBB2:: @ 85EEBB2 diff --git a/ld_script.txt b/ld_script.txt index e8e44b718..51b7364cb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -379,6 +379,8 @@ SECTIONS { data/data_860A4AC.o(.rodata); data/battle_controller_recorded_opponent.o(.rodata); data/battle_controller_recorded_player.o(.rodata); + data/data_emerald.o(.rodata.deleteme); + data/lilycove_lady.o(.rodata); data/data_emerald.o(.rodata); data/battle_controller_player_partner.o(.rodata); data/data_emerald2.o(.rodata); diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 4839571ae..6a0e0c2b9 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -27,7 +27,8 @@ static u8 sub_818E13C(void); static bool8 sub_818E1F4(void); static u8 sub_818E258(const u8 *); -extern const u8 gUnknown_085EEB7E[8]; +extern const u8 gUnknown_085EEB7E[]; // Lady$ + extern const u16 gUnknown_0860B074[5]; extern const u16 gUnknown_0860B07E[3]; extern const u16 *const gUnknown_0860B1A4[16]; From 6f481cceb1b56c5d63ba045f7ca7f1ac7151332b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 20 Sep 2017 22:01:28 -0400 Subject: [PATCH 62/62] Decompile lilycove lady data --- data/lilycove_lady.s | 163 ---------------------------------- ld_script.txt | 2 +- src/lilycove_lady.c | 204 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 193 insertions(+), 176 deletions(-) delete mode 100644 data/lilycove_lady.s diff --git a/data/lilycove_lady.s b/data/lilycove_lady.s deleted file mode 100644 index 9d076213c..000000000 --- a/data/lilycove_lady.s +++ /dev/null @@ -1,163 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0860B074:: @ 860B074 -@ replacing .incbin "baserom.gba", 0x0060b074, 0xa - .2byte 0x0062, 0x00cb, 0x00dc, 0x00cc, 0x00d1 - -gUnknown_0860B07E:: @ 860B07E -@ replacing .incbin "baserom.gba", 0x0060b07e, 0x6 - .2byte 0x001a, 0x0014, 0x000a - -Unknown_0860B084:: - .2byte 0x101b, 0x1623, 0x1812, 0x102c, 0x020e, 0x0c03, 0x1a0b, 0x0210, 0x020d - -Unknown_0860B096:: - .2byte 0x101b, 0x1013, 0x1020, 0x1a0f, 0x020c, 0x0c03, 0x0211, 0x0203, 0x0400 - -Unknown_0860B0A8:: - .2byte 0x0e0f, 0x1018, 0x020e, 0x0204, 0x0c03, 0xffff, 0x0212, 0x0451, 0x0463 - -Unknown_0860B0BA:: - .2byte 0x101b, 0x100b, 0x0e0d, 0x141a, 0x181d, 0x0c03, 0x141e, 0x1a26, 0x1823 - -Unknown_0860B0CC:: - .2byte 0x101b, 0x181d, 0x1018, 0x0a02, 0x2014, 0x0c03, 0x0208, 0x1824, 0x181c - -Unknown_0860B0DE:: - .2byte 0x101b, 0x1000, 0x1c19, 0x265d, 0x0c03, 0xffff, 0x0447, 0x045d, 0x042c - -Unknown_0860B0F0:: - .2byte 0x101b, 0x1034, 0x1e11, 0x100b, 0x1a08, 0x0c03, 0x044b, 0x0446, 0x040a - -Unknown_0860B102:: - .2byte 0x101b, 0x1000, 0x274f, 0x0626, 0x0c03, 0xffff, 0x0442, 0x0411, 0x0450 - -Unknown_0860B114:: - .2byte 0x101b, 0x1000, 0x1c19, 0x043c, 0x0c03, 0xffff, 0x0421, 0x0464, 0x0435 - -Unknown_0860B126:: - .2byte 0x101b, 0x1203, 0x1030, 0x0207, 0x0c03, 0xffff, 0x0210, 0x020e, 0x020d - -Unknown_0860B138:: - .2byte 0x101b, 0x1623, 0x0a05, 0x020e, 0x0c03, 0xffff, 0x1a25, 0x181a, 0x181b - -Unknown_0860B14A:: - .2byte 0x101b, 0x1823, 0x1603, 0x0a02, 0x1812, 0x0c03, 0x1a15, 0x1a23, 0x181b - -Unknown_0860B15C:: - .2byte 0x1020, 0x020e, 0x1010, 0x1043, 0x1e0f, 0x0c03, 0x181c, 0x1a24, 0x1816 - -Unknown_0860B16E:: - .2byte 0x0446, 0x100b, 0x0620, 0x061c, 0x101b, 0x0c03, 0x0420, 0x0426, 0xffff - -Unknown_0860B180:: - .2byte 0x0400, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x040e, 0x0410, 0xffff - -Unknown_0860B192:: - .2byte 0x041f, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x0445, 0x0400, 0xffff - -gUnknown_0860B1A4:: @ 860B1A4 -@ replacing .incbin "baserom.gba", 0x0060b1a4, 0x40 - .4byte Unknown_0860B084 - .4byte Unknown_0860B096 - .4byte Unknown_0860B0A8 - .4byte Unknown_0860B0BA - .4byte Unknown_0860B0CC - .4byte Unknown_0860B0DE - .4byte Unknown_0860B0F0 - .4byte Unknown_0860B102 - .4byte Unknown_0860B114 - .4byte Unknown_0860B126 - .4byte Unknown_0860B138 - .4byte Unknown_0860B14A - .4byte Unknown_0860B15C - .4byte Unknown_0860B16E - .4byte Unknown_0860B180 - .4byte Unknown_0860B192 - -gUnknown_0860B1E4:: @ 860B1E4 -@ replacing .incbin "baserom.gba", 0x0060b1e4, 0x20 - .2byte 0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400 - -gUnknown_0860B204:: @ 860B204 -@ replacing .incbin "baserom.gba", 0x0060b204, 0x20 - .2byte 0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c - -gUnknown_0860B224:: @ 860B224 -@ replacing .incbin "baserom.gba", 0x0060b224, 0xc8 - .4byte gUnknown_085EEB83 - .4byte gUnknown_085EEB8C - .4byte gUnknown_085EEB95 - .4byte gUnknown_085EEB9E - .4byte gUnknown_085EEBA4 - .4byte gUnknown_085EEBAB - -Unknown_0860B23C:: -@ replacing .incbin "baserom.gba", 0x0060b23c, 0x1a -.2byte 0x0056, 0x0053, 0x0054, 0x000e, 0x0012, 0x000f, 0x00a7, 0x0011, 0x0010, 0x0018, 0x0019, 0x001e, 0x0000 - -Unknown_0860B256:: -@ replacing .incbin "baserom.gba", 0x0060b256, 0x22 -.2byte 0x0051, 0x006a, 0x006b, 0x00cc, 0x00c2, 0x002f, 0x0067, 0x0068, 0x0087, 0x0089, 0x008b, 0x009d, 0x00a0, 0x00a5, 0x0004, 0x0002 -.2byte 0x0000 - -Unknown_0860B278:: -@ replacing .incbin "baserom.gba", 0x0060b278, 0x1e -.2byte 0x0021, 0x000d, 0x001a, 0x001b, 0x001c, 0x00cc, 0x00ca, 0x0026, 0x0086, 0x0096, 0x0097, 0x009a, 0x00a2, 0x00a6, 0x0000 - -Unknown_0860B296:: -@ replacing .incbin "baserom.gba", 0x0060b296, 0x2a -.2byte 0x0020, 0x004d, 0x004b, 0x004c, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x006e, 0x005d, 0x006c, 0x006d, 0x006a, 0x006b, 0x00d6 -.2byte 0x00bc, 0x00b3, 0x000b, 0x000c, 0x0000 - -Unknown_0860B2C0:: -@ replacing .incbin "baserom.gba", 0x0060b2c0, 0x16 -.2byte 0x001f, 0x0013, 0x0014, 0x004a, 0x004e, 0x0049, 0x00a5, 0x00c8, 0x0067, 0x006f, 0x0000 - -Unknown_0860B2D6:: -@ replacing .incbin "baserom.gba", 0x0060b2d6, 0x16 -.2byte 0x00b7, 0x00d3, 0x00d2, 0x00d8, 0x009e, 0x00a6, 0x00ab, 0x00aa, 0x006c, 0x006d, 0x0000 - -gUnknown_0860B2EC:: @ 860B2EC -@ replacing .incbin "baserom.gba", 0x0060b2ec, 0x18 - .4byte Unknown_0860B23C - .4byte Unknown_0860B256 - .4byte Unknown_0860B278 - .4byte Unknown_0860B296 - .4byte Unknown_0860B2C0 - .4byte Unknown_0860B2D6 - -gUnknown_0860B304:: @ 860B304 -@ replacing .incbin "baserom.gba", 0x0060b304, 0xc -.2byte 0x000b, 0x006e, 0x0040, 0x006f, 0x0044, 0x0047 - -gUnknown_0860B310:: @ 860B310 -@ replacing .incbin "baserom.gba", 0x0060b310, 0x14 - .4byte gUnknown_085EEB2B - .4byte gUnknown_085EEB34 - .4byte gUnknown_085EEB3A - .4byte gUnknown_085EEB41 - .4byte gUnknown_085EEB4A - -gUnknown_0860B324:: @ 860B324 -@ replacing .incbin "baserom.gba", 0x0060b324, 0x14 - .4byte gUnknown_085EEB51 - .4byte gUnknown_085EEB5A - .4byte gUnknown_085EEB61 - .4byte gUnknown_085EEB6A - .4byte gUnknown_085EEB74 - -gUnknown_0860B338:: @ 860B338 -@ replacing .incbin "baserom.gba", 0x0060b338, 0x14 - .4byte gUnknown_085EADA4 - .4byte gUnknown_085EADB5 - .4byte gUnknown_085EADC4 - .4byte gUnknown_085EADD5 - .4byte gUnknown_085EADE7 - -gUnknown_0860B34C:: @ 860B34C -@ replacing .incbin "baserom.gba", 0x0060b34c, 0xc - .2byte 0x0120, 0x013b, 0x011e, 0x013d, 0x0019 diff --git a/ld_script.txt b/ld_script.txt index 51b7364cb..4a07cf85e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -380,7 +380,7 @@ SECTIONS { data/battle_controller_recorded_opponent.o(.rodata); data/battle_controller_recorded_player.o(.rodata); data/data_emerald.o(.rodata.deleteme); - data/lilycove_lady.o(.rodata); + src/lilycove_lady.o(.rodata); data/data_emerald.o(.rodata); data/battle_controller_player_partner.o(.rodata); data/data_emerald2.o(.rodata); diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 6a0e0c2b9..b476c6b2b 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -29,18 +29,198 @@ static u8 sub_818E258(const u8 *); extern const u8 gUnknown_085EEB7E[]; // Lady$ -extern const u16 gUnknown_0860B074[5]; -extern const u16 gUnknown_0860B07E[3]; -extern const u16 *const gUnknown_0860B1A4[16]; -extern const u16 gUnknown_0860B1E4[16]; -extern const u16 gUnknown_0860B204[16]; -extern const u8 *const gUnknown_0860B224[]; -extern const u16 *const gUnknown_0860B2EC[6]; -extern const u16 gUnknown_0860B304[6]; -extern const u8 *const gUnknown_0860B310[5]; -extern const u8 *const gUnknown_0860B324[5]; -extern const u8 *const gUnknown_0860B338[5]; -extern const u16 gUnknown_0860B34C[5]; +static const u16 gUnknown_0860B074[] = { + 0x62, 0xcb, 0xdc, 0xcc, 0xd1 +}; +static const u16 gUnknown_0860B07E[] = { + 0x1a, 0x14, 0x0a +}; + +static const u16 Unknown_0860B084[] = { + 0x101b, 0x1623, 0x1812, 0x102c, 0x020e, 0x0c03, 0x1a0b, 0x0210, 0x020d +}; + +static const u16 Unknown_0860B096[] = { + 0x101b, 0x1013, 0x1020, 0x1a0f, 0x020c, 0x0c03, 0x0211, 0x0203, 0x0400 +}; + +static const u16 Unknown_0860B0A8[] = { + 0x0e0f, 0x1018, 0x020e, 0x0204, 0x0c03, 0xffff, 0x0212, 0x0451, 0x0463 +}; + +static const u16 Unknown_0860B0BA[] = { + 0x101b, 0x100b, 0x0e0d, 0x141a, 0x181d, 0x0c03, 0x141e, 0x1a26, 0x1823 +}; + +static const u16 Unknown_0860B0CC[] = { + 0x101b, 0x181d, 0x1018, 0x0a02, 0x2014, 0x0c03, 0x0208, 0x1824, 0x181c +}; + +static const u16 Unknown_0860B0DE[] = { + 0x101b, 0x1000, 0x1c19, 0x265d, 0x0c03, 0xffff, 0x0447, 0x045d, 0x042c +}; + +static const u16 Unknown_0860B0F0[] = { + 0x101b, 0x1034, 0x1e11, 0x100b, 0x1a08, 0x0c03, 0x044b, 0x0446, 0x040a +}; + +static const u16 Unknown_0860B102[] = { + 0x101b, 0x1000, 0x274f, 0x0626, 0x0c03, 0xffff, 0x0442, 0x0411, 0x0450 +}; + +static const u16 Unknown_0860B114[] = { + 0x101b, 0x1000, 0x1c19, 0x043c, 0x0c03, 0xffff, 0x0421, 0x0464, 0x0435 +}; + +static const u16 Unknown_0860B126[] = { + 0x101b, 0x1203, 0x1030, 0x0207, 0x0c03, 0xffff, 0x0210, 0x020e, 0x020d +}; + +static const u16 Unknown_0860B138[] = { + 0x101b, 0x1623, 0x0a05, 0x020e, 0x0c03, 0xffff, 0x1a25, 0x181a, 0x181b +}; + +static const u16 Unknown_0860B14A[] = { + 0x101b, 0x1823, 0x1603, 0x0a02, 0x1812, 0x0c03, 0x1a15, 0x1a23, 0x181b +}; + +static const u16 Unknown_0860B15C[] = { + 0x1020, 0x020e, 0x1010, 0x1043, 0x1e0f, 0x0c03, 0x181c, 0x1a24, 0x1816 +}; + +static const u16 Unknown_0860B16E[] = { + 0x0446, 0x100b, 0x0620, 0x061c, 0x101b, 0x0c03, 0x0420, 0x0426, 0xffff +}; + +static const u16 Unknown_0860B180[] = { + 0x0400, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x040e, 0x0410, 0xffff +}; + +static const u16 Unknown_0860B192[] = { + 0x041f, 0x100b, 0x0639, 0x061c, 0x101b, 0x0c03, 0x0445, 0x0400, 0xffff +}; + +static const u16 *const gUnknown_0860B1A4[] = { + Unknown_0860B084, + Unknown_0860B096, + Unknown_0860B0A8, + Unknown_0860B0BA, + Unknown_0860B0CC, + Unknown_0860B0DE, + Unknown_0860B0F0, + Unknown_0860B102, + Unknown_0860B114, + Unknown_0860B126, + Unknown_0860B138, + Unknown_0860B14A, + Unknown_0860B15C, + Unknown_0860B16E, + Unknown_0860B180, + Unknown_0860B192 +}; + +static const u16 gUnknown_0860B1E4[] = { + 0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400 +}; + +static const u16 gUnknown_0860B204[] = { + 0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c +}; + +extern const u8 gUnknown_085EEB83[]; +extern const u8 gUnknown_085EEB8C[]; +extern const u8 gUnknown_085EEB95[]; +extern const u8 gUnknown_085EEB9E[]; +extern const u8 gUnknown_085EEBA4[]; +extern const u8 gUnknown_085EEBAB[]; + +static const u8 *const gUnknown_0860B224[] = { + gUnknown_085EEB83, + gUnknown_085EEB8C, + gUnknown_085EEB95, + gUnknown_085EEB9E, + gUnknown_085EEBA4, + gUnknown_085EEBAB +}; + +static const u16 Unknown_0860B23C[] = { + 0x0056, 0x0053, 0x0054, 0x000e, 0x0012, 0x000f, 0x00a7, 0x0011, 0x0010, 0x0018, 0x0019, 0x001e, 0x0000 +}; + +static const u16 Unknown_0860B256[] = { + 0x0051, 0x006a, 0x006b, 0x00cc, 0x00c2, 0x002f, 0x0067, 0x0068, 0x0087, 0x0089, 0x008b, 0x009d, 0x00a0, 0x00a5, 0x0004, 0x0002, 0x0000 +}; + +static const u16 Unknown_0860B278[] = { + 0x0021, 0x000d, 0x001a, 0x001b, 0x001c, 0x00cc, 0x00ca, 0x0026, 0x0086, 0x0096, 0x0097, 0x009a, 0x00a2, 0x00a6, 0x0000 +}; + +static const u16 Unknown_0860B296[] = { + 0x0020, 0x004d, 0x004b, 0x004c, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x006e, 0x005d, 0x006c, 0x006d, 0x006a, 0x006b, 0x00d6, 0x00bc, 0x00b3, 0x000b, 0x000c, 0x0000 +}; + +static const u16 Unknown_0860B2C0[] = { + 0x001f, 0x0013, 0x0014, 0x004a, 0x004e, 0x0049, 0x00a5, 0x00c8, 0x0067, 0x006f, 0x0000 +}; + +static const u16 Unknown_0860B2D6[] = { + 0x00b7, 0x00d3, 0x00d2, 0x00d8, 0x009e, 0x00a6, 0x00ab, 0x00aa, 0x006c, 0x006d, 0x0000 +}; + +static const u16 *const gUnknown_0860B2EC[] = { + Unknown_0860B23C, + Unknown_0860B256, + Unknown_0860B278, + Unknown_0860B296, + Unknown_0860B2C0, + Unknown_0860B2D6 +}; + +static const u16 gUnknown_0860B304[] = { + 0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47 +}; + +extern const u8 gUnknown_085EEB2B[]; +extern const u8 gUnknown_085EEB34[]; +extern const u8 gUnknown_085EEB3A[]; +extern const u8 gUnknown_085EEB41[]; +extern const u8 gUnknown_085EEB4A[]; +extern const u8 gUnknown_085EEB51[]; +extern const u8 gUnknown_085EEB5A[]; +extern const u8 gUnknown_085EEB61[]; +extern const u8 gUnknown_085EEB6A[]; +extern const u8 gUnknown_085EEB74[]; +extern const u8 gUnknown_085EADA4[]; +extern const u8 gUnknown_085EADB5[]; +extern const u8 gUnknown_085EADC4[]; +extern const u8 gUnknown_085EADD5[]; +extern const u8 gUnknown_085EADE7[]; + +static const u8 *const gUnknown_0860B310[] = { + gUnknown_085EEB2B, + gUnknown_085EEB34, + gUnknown_085EEB3A, + gUnknown_085EEB41, + gUnknown_085EEB4A +}; +static const u8 *const gUnknown_0860B324[] = { + gUnknown_085EEB51, + gUnknown_085EEB5A, + gUnknown_085EEB61, + gUnknown_085EEB6A, + gUnknown_085EEB74 +}; +static const u8 *const gUnknown_0860B338[] = { + gUnknown_085EADA4, + gUnknown_085EADB5, + gUnknown_085EADC4, + gUnknown_085EADD5, + gUnknown_085EADE7 +}; + +static const u16 gUnknown_0860B34C[] = { + 0x0120, 0x013b, 0x011e, 0x013d, 0x0019 +}; static EWRAM_DATA struct LilycoveLadyFavour *gUnknown_0203CD64 = NULL; static EWRAM_DATA struct LilycoveLadyQuiz *gUnknown_0203CD68 = NULL;