diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/trade.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/trade.c b/src/trade.c index 796a01b5b..50c69bc6d 100644 --- a/src/trade.c +++ b/src/trade.c @@ -207,7 +207,7 @@ static void sub_804E1DC(void); static void sub_804BBCC(void); static void sub_804D8E4(void); static void sub_804C164(void); -static void sub_804C1A8(void); +static void SetTradeSceneStrings(void); #ifdef NONMATCHING static #endif @@ -4096,7 +4096,7 @@ static void sub_804B41C(void) case 11: sub_804BBE8(5); sub_804BBE8(0); - sub_804C1A8(); + SetTradeSceneStrings(); BeginNormalPaletteFade(-1, 0, 16, 0, 0); gMain.state ++; break; @@ -4451,7 +4451,7 @@ static NAKED void sub_804B41C(void) "\tbl sub_804BBE8\n" "\tmovs r0, 0\n" "\tbl sub_804BBE8\n" - "\tbl sub_804C1A8\n" + "\tbl SetTradeSceneStrings\n" "\tmovs r0, 0x1\n" "\tnegs r0, r0\n" "\tmovs r1, 0\n" @@ -4563,7 +4563,7 @@ void sub_804B790(void) case 11: sub_804BBE8(5); sub_804BBE8(0); - sub_804C1A8(); + SetTradeSceneStrings(); BeginNormalPaletteFade(-1, 0, 16, 0, 0); gMain.state ++; break; @@ -4772,8 +4772,12 @@ static void sub_804C164(void) LoadSpritePalette(&gUnknown_082159B4); } -static void sub_804C1A8(void) +static void SetTradeSceneStrings(void) { + /*Sets the variable strings printed on the + *actual trading screen. For use in strings + *like "[Pokemon] will be sent to [Trainer]." + */ u8 mpId; u8 string[20]; const struct InGameTrade *ingameTrade; |