diff options
| -rw-r--r-- | include/mauville_man.h (renamed from include/mauville_old_man.h) | 0 | ||||
| -rw-r--r-- | ld_script.txt | 4 | ||||
| -rw-r--r-- | src/mauville_man.c (renamed from src/mauville_old_man.c) | 4 | ||||
| -rw-r--r-- | src/new_game.c | 2 | ||||
| -rw-r--r-- | src/record_mixing.c | 2 | ||||
| -rw-r--r-- | src/strings.c | 4 | ||||
| -rw-r--r-- | src/trader.c | 2 | ||||
| -rw-r--r-- | sym_bss.txt | 6 | ||||
| -rw-r--r-- | sym_ewram.txt | 2 |
9 files changed, 11 insertions, 15 deletions
diff --git a/include/mauville_old_man.h b/include/mauville_man.h index 2b8f139f2..2b8f139f2 100644 --- a/include/mauville_old_man.h +++ b/include/mauville_man.h diff --git a/ld_script.txt b/ld_script.txt index 5e604b480..fad2bcc03 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -189,7 +189,7 @@ SECTIONS { src/pokenav.o(.text); asm/pokenav.o(.text_80F708C); src/mon_markings.o(.text); - src/mauville_old_man.o(.text); + src/mauville_man.o(.text); src/mail.o(.text); src/menu_helpers.o(.text); src/script_pokemon_util_80F99CC.o(.text); @@ -420,7 +420,7 @@ SECTIONS { data/easy_chat.o(.rodata); data/pokenav.o(.rodata); data/mon_markings.o(.rodata); - src/mauville_old_man.o(.rodata); + src/mauville_man.o(.rodata); data/mail.o(.rodata); src/menu_helpers.o(.rodata); src/heal_location.o(.rodata); diff --git a/src/mauville_old_man.c b/src/mauville_man.c index d54e017f7..4a77717f1 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_man.c @@ -1,6 +1,6 @@ #include "global.h" #include "bard_music.h" -#include "mauville_old_man.h" +#include "mauville_man.h" #include "easy_chat.h" #include "event_data.h" #include "field_message_box.h" @@ -1230,7 +1230,7 @@ static void PrintStoryList(void) MenuPrint(gPCText_Cancel, 1, 2 + i * 2); } -extern u8 gUnknown_03000748; +static u8 gUnknown_03000748; static void Task_StoryListMenu(u8 taskId) { diff --git a/src/new_game.c b/src/new_game.c index 1ef19bd00..46df14acd 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -11,7 +11,7 @@ #include "item_menu.h" #include "lottery_corner.h" #include "mail_data.h" -#include "mauville_old_man.h" +#include "mauville_man.h" #include "play_time.h" #include "player_pc.h" #include "pokeblock.h" diff --git a/src/record_mixing.c b/src/record_mixing.c index e5f892d20..30bcb29d1 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -10,7 +10,7 @@ #include "items.h" #include "load_save.h" #include "link.h" -#include "mauville_old_man.h" +#include "mauville_man.h" #include "menu.h" #include "mystery_event_script.h" #include "rng.h" diff --git a/src/strings.c b/src/strings.c index 219c5bec1..6c8dce9d6 100644 --- a/src/strings.c +++ b/src/strings.c @@ -861,7 +861,7 @@ const u8 gOtherText_AtBattleStart[] = _("At the battle’s start."); const u8 gOtherText_UponWinningBattle[] = _("Upon winning a battle."); const u8 gOtherText_UponLosingBattle[] = _("Upon losing a battle."); -// mauville_old_man? +// mauville_man? const u8 gOtherText_TheBardsSong[] = _("The BARD’s Song"); const u8 gOtherText_WhatsHipHappening[] = _("What’s hip and happening?"); const u8 gOtherText_Interview[] = _("Interview"); @@ -1781,7 +1781,7 @@ const u8 gOtherText_AtBattleStart[] = _("Zum Kampfbeginn"); const u8 gOtherText_UponWinningBattle[] = _("Über den Sieg"); const u8 gOtherText_UponLosingBattle[] = _("Über die Niederlage"); -// mauville_old_man? +// mauville_man? const u8 gOtherText_TheBardsSong[] = _("Das BARDEN-Lied"); const u8 gOtherText_WhatsHipHappening[] = _("Was ist hip? Was ist top?"); const u8 gOtherText_Interview[] = _("Interview"); diff --git a/src/trader.c b/src/trader.c index 4274d38de..61f48fad8 100644 --- a/src/trader.c +++ b/src/trader.c @@ -3,7 +3,7 @@ #include "decoration_inventory.h" #include "event_data.h" #include "main.h" -#include "mauville_old_man.h" +#include "mauville_man.h" #include "menu.h" #include "menu_helpers.h" #include "script.h" diff --git a/sym_bss.txt b/sym_bss.txt index a6eaeefe1..fc3837739 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -109,11 +109,7 @@ gUnknown_03000740: @ 3000740 gUnknown_03000744: @ 3000744 .space 0x4 -@ mauville_old_man - -gUnknown_03000748: @ 3000748 - .space 0x4 - + .include "src/mauville_man.o" .include "src/menu_helpers.o" .include "src/contest_painting.o" .include "src/pokeblock.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index 24be56da3..06c554ac7 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -589,7 +589,7 @@ gUnknown_020388B4: @ 20388B4 .space 0x4 .include "src/mon_markings.o" - .include "src/mauville_old_man.o" + .include "src/mauville_man.o" .include "src/menu_helpers.o" .include "src/region_map.o" .include "src/decoration.o" |