diff options
| -rw-r--r-- | asm/contest_painting_effects.s (renamed from asm/cute_sketch.s) | 0 | ||||
| -rw-r--r-- | asm/decompress.s (renamed from asm/battle_1.s) | 0 | ||||
| -rw-r--r-- | data/contest_painting_effects.s (renamed from data/cute_sketch.s) | 0 | ||||
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/contest_painting_effects.h (renamed from include/cute_sketch.h) | 0 | ||||
| -rw-r--r-- | ld_script.txt | 8 | ||||
| -rw-r--r-- | src/contest_painting.c | 2 | ||||
| -rw-r--r-- | src/contest_painting_effects.c (renamed from src/cute_sketch.c) | 2 | ||||
| -rw-r--r-- | sym_common.txt | 2 |
9 files changed, 8 insertions, 8 deletions
diff --git a/asm/cute_sketch.s b/asm/contest_painting_effects.s index bc72a6ef5..bc72a6ef5 100644 --- a/asm/cute_sketch.s +++ b/asm/contest_painting_effects.s diff --git a/asm/battle_1.s b/asm/decompress.s index 99e449d8f..99e449d8f 100644 --- a/asm/battle_1.s +++ b/asm/decompress.s diff --git a/data/cute_sketch.s b/data/contest_painting_effects.s index e3e75753d..e3e75753d 100644 --- a/data/cute_sketch.s +++ b/data/contest_painting_effects.s diff --git a/include/battle.h b/include/battle.h index 11bb9e387..6a5a97e90 100644 --- a/include/battle.h +++ b/include/battle.h @@ -708,7 +708,7 @@ void MarkBufferBankForExecution(u8 bank); extern u8 gBattleTextBuff1[]; -// asm/battle_1.o +// src/battle_bg.o void sub_800D6D4(); void ApplyPlayerChosenFrameToBattleMenu(); void DrawMainBattleBackground(void); diff --git a/include/cute_sketch.h b/include/contest_painting_effects.h index 1fa3c90fb..1fa3c90fb 100644 --- a/include/cute_sketch.h +++ b/include/contest_painting_effects.h diff --git a/ld_script.txt b/ld_script.txt index b42df50db..2442d8da0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -47,7 +47,7 @@ SECTIONS { src/main_menu.o(.text); src/rom3.o(.text); src/decompress.o(.text); - asm/battle_1.o(.text); + asm/decompress.o(.text); src/battle/battle_bg.o(.text); src/battle/battle_2.o(.text); src/battle/battle_util.o(.text); @@ -326,8 +326,8 @@ SECTIONS { src/dewford_trend.o(.text); src/heal_location.o(.text); src/region_map.o(.text); - src/cute_sketch.o(.text); - asm/cute_sketch.o(.text); + src/contest_painting_effects.o(.text); + asm/contest_painting_effects.o(.text); src/decoration.o(.text); src/slot_machine.o(.text); src/contest_painting.o(.text); @@ -624,7 +624,7 @@ SECTIONS { src/menu_helpers.o(.rodata); src/heal_location.o(.rodata); src/region_map.o(.rodata); - data/cute_sketch.o(.rodata); + data/contest_painting_effects.o(.rodata); src/decoration.o(.rodata); src/slot_machine.o(.rodata); src/contest_painting.o(.rodata); diff --git a/src/contest_painting.c b/src/contest_painting.c index 7d8f53299..e90391469 100644 --- a/src/contest_painting.c +++ b/src/contest_painting.c @@ -1,6 +1,6 @@ #include "global.h" #include "contest_painting.h" -#include "cute_sketch.h" +#include "contest_painting_effects.h" #include "data2.h" #include "decompress.h" #include "main.h" diff --git a/src/cute_sketch.c b/src/contest_painting_effects.c index 5317bc334..b07319048 100644 --- a/src/cute_sketch.c +++ b/src/contest_painting_effects.c @@ -1,5 +1,5 @@ #include "global.h" -#include "cute_sketch.h" +#include "contest_painting_effects.h" #include "contest_painting.h" extern u16 (*gUnknown_03005DEC)[][32]; diff --git a/sym_common.txt b/sym_common.txt index aec64ebf0..07ab0629f 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -292,7 +292,7 @@ SYMBOL(gUnknown_03005D38, 4) // mauville_man.c SYMBOL(gUnknown_03005DA0, 0x48) -// cute_sketch.c +// contest_painting_effects.c SYMBOL(gUnknown_03005DE8, 4) SYMBOL(gUnknown_03005DEC, 4) SYMBOL(gUnknown_03005DF0, 4) |