From c3abe2863feb8ebb21921c40d3c685a27a4135c4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Dec 2017 15:12:55 +0100 Subject: [PATCH] rename --- asm/{pokeblock.s => rom_81370FC.s} | 0 ld_script.txt | 2 +- src/pokeblock.c | 9 +-------- 3 files changed, 2 insertions(+), 9 deletions(-) rename asm/{pokeblock.s => rom_81370FC.s} (100%) diff --git a/asm/pokeblock.s b/asm/rom_81370FC.s similarity index 100% rename from asm/pokeblock.s rename to asm/rom_81370FC.s diff --git a/ld_script.txt b/ld_script.txt index 7cf793391..765c2e2a8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -179,7 +179,7 @@ SECTIONS { asm/wallclock.o(.text); asm/rom6.o(.text); src/pokeblock.o(.text); - asm/pokeblock.o(.text); + asm/rom_81370FC.o(.text); asm/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); diff --git a/src/pokeblock.c b/src/pokeblock.c index ba292ee75..945b3680d 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -50,14 +50,7 @@ struct PokeblockMenuStruct u8 unkTaskId; bool8 isSwapping; s16 gfxState; - u8 field_E80; - u8 field_E81; - u8 field_E82; - u8 field_E83; - u8 field_E84; - u8 field_E85; - u8 field_E86; - u8 field_E87; + u8 unused[8]; }; struct PokeblockSavedData