dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_80FFF80

Browse Source
This commit is contained in:
PikalaxALT
2020-03-06 17:07:36 -05:00
parent 85ca62e823
commit ecf7cf9835
10 changed files with 1444 additions and 2929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/easy_chat_2.s
+17 -2852
View File
File diff suppressed because it is too large Load Diff
data/easy_chat_2.s
-74
View File
@@ -7,80 +7,6 @@
.section .rodata
.align 2
gUnknown_843F29C:: @ 843F29C
.2byte 0x143a, 0x1817, 0x100b, 0x200f
gUnknown_843F2A4:: @ 843F2A4
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_843F2AC:: @ 843F2AC
.byte 0, 2, 2, 0
.4byte gUnknown_8418A2B
.4byte gUnknown_84186D1
.4byte gUnknown_84186EF
.4byte gUnknown_841880E
.4byte gUnknown_8418902
.byte 1, 2, 3, 1
.4byte gUnknown_8418A33
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841881B
.4byte gUnknown_8418902
.byte 2, 2, 3, 1
.4byte gUnknown_8418A4A
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841883E
.4byte gUnknown_8418902
.byte 3, 2, 3, 1
.4byte gUnknown_8418A61
.4byte gUnknown_8418706
.4byte gUnknown_8418725
.4byte gUnknown_841885F
.4byte gUnknown_8418902
.byte 4, 2, 5, 2
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte gUnknown_841888C
.4byte gUnknown_8418902
.byte 5, 2, 2, 0
.4byte NULL
.4byte gUnknown_8418780
.4byte gUnknown_841879E
.4byte NULL
.4byte NULL
.byte 6, 2, 3, 1
.4byte gUnknown_8418A77
.4byte gUnknown_84187B2
.4byte gUnknown_84187D1
.4byte gUnknown_84188AC
.4byte gUnknown_8418902
.byte 7, 2, 3, 1
.4byte gUnknown_8418AA1
.4byte gUnknown_8418745
.4byte gUnknown_8418763
.4byte gUnknown_8418881
.4byte gUnknown_8418902
.byte 9, 2, 1, 3
.4byte gUnknown_8418A87
.4byte gUnknown_84188B9
.4byte gUnknown_84188D6
.4byte gUnknown_84188F0
.4byte gUnknown_8418902
.byte 14, 2, 2, 0
.4byte gUnknown_8418AB2
.4byte gUnknown_84186D1
.4byte gUnknown_84187EE
.4byte gUnknown_8418881
.4byte gUnknown_8418902
gUnknown_843F39C:: @ 843F39C data8 4x7
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00
.byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00
.byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
.byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_843F3B8:: @ 843F3B8 gbapal
.incbin "graphics/link_rfu/unk_843F3F8.gbapal"
include/constants/easy_chat.h
+4
View File
@@ -6,6 +6,10 @@
#define EASY_CHAT_TYPE_BATTLE_WON 2
#define EASY_CHAT_TYPE_BATTLE_LOST 3
#define EASY_CHAT_TYPE_MAIL 4
#define EASY_CHAT_TYPE_MAIL_NO_CONFIRM 5
#define EASY_CHAT_TYPE_BARD_SONG 6
#define EASY_CHAT_TYPE_INTERVIEW 7
#define EASY_CHAT_TYPE_TRENDY_PHRASE 9
#define EASY_CHAT_TYPE_QUESTIONNAIRE 14
#define EC_GROUP_POKEMON_2 0x0
include/easy_chat.h
+1
View File
@@ -46,5 +46,6 @@ u16 GetNumDisplayedWords(void);
const u8 *GetEasyChatWordGroupName(u8);
u8 *CopyEasyChatWordPadded(u8 *, u16, u16);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback);
u8 GetNumDisplayableGroups(void);
#endif // GUARD_EASY_CHAT_H
include/overworld.h
+1
View File
@@ -191,6 +191,7 @@ void sub_8057F70(void);
void sub_8057F48(void);
void SetMainCallback1(MainCallback cb);
void CB1_Overworld(void);
void sub_80568C4(void);
extern u16 gHeldKeyCodeToSend;
include/strings.h
+36
View File
@@ -1313,4 +1313,40 @@ extern const u8 gText_QuestLog_CeruleanCave[];
extern const u8 gUnknown_841B69E[];
extern const u8 gUnknown_841B6B9[];
// easy_chat_2
extern const u8 gUnknown_84186D1[];
extern const u8 gUnknown_84186EF[];
extern const u8 gUnknown_8418706[];
extern const u8 gUnknown_8418725[];
extern const u8 gUnknown_8418745[];
extern const u8 gUnknown_8418763[];
extern const u8 gUnknown_8418780[];
extern const u8 gUnknown_841879E[];
extern const u8 gUnknown_84187B2[];
extern const u8 gUnknown_84187D1[];
extern const u8 gUnknown_84187EE[];
extern const u8 gUnknown_841880E[];
extern const u8 gUnknown_841881B[];
extern const u8 gUnknown_841883E[];
extern const u8 gUnknown_841885F[];
extern const u8 gUnknown_8418881[];
extern const u8 gUnknown_841888C[];
extern const u8 gUnknown_84188AC[];
extern const u8 gUnknown_84188B9[];
extern const u8 gUnknown_84188D6[];
extern const u8 gUnknown_84188F0[];
extern const u8 gUnknown_8418902[];
extern const u8 gUnknown_8418937[];
extern const u8 gUnknown_8418956[];
extern const u8 gUnknown_84189E0[];
extern const u8 gUnknown_84189EE[];
extern const u8 gUnknown_8418A2B[];
extern const u8 gUnknown_8418A33[];
extern const u8 gUnknown_8418A4A[];
extern const u8 gUnknown_8418A61[];
extern const u8 gUnknown_8418A77[];
extern const u8 gUnknown_8418A87[];
extern const u8 gUnknown_8418AA1[];
extern const u8 gUnknown_8418AB2[];
#endif //GUARD_STRINGS_H
ld_script.txt
+2
View File
@@ -226,6 +226,7 @@ SECTIONS {
src/link_rfu_2.o(.text);
src/link_rfu_3.o(.text);
src/AgbRfu_LinkManager.o(.text);
src/easy_chat_2.o(.text);
asm/easy_chat_2.o(.text);
src/pokedex_screen.o(.text);
asm/pokedex_screen.o(.text);
@@ -517,6 +518,7 @@ SECTIONS {
src/map_preview_screen.o(.rodata);
src/link_rfu_2.o(.rodata);
src/link_rfu_3.o(.rodata);
src/easy_chat_2.o(.rodata);
data/easy_chat_2.o(.rodata);
src/pokedex_screen.o(.rodata);
data/pokedex_screen.o(.rodata);
src/clear_save_data_screen.c
+2 -2
View File
@@ -131,7 +131,7 @@ static void Task_HandleYesNoMenu(u8 taskId)
{
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
case -1:
case MENU_B_PRESSED:
case 1:
PlaySE(SE_SELECT);
break;
@@ -142,7 +142,7 @@ static void Task_HandleYesNoMenu(u8 taskId)
CopyWindowToVram(1, 3);
ClearSaveData();
break;
case -2:
case MENU_NOTHING_CHOSEN:
default:
return;
}
src/easy_chat_2.c
+1380
View File
File diff suppressed because it is too large Load Diff
sym_ewram.txt
+1 -1
View File
@@ -316,7 +316,7 @@ gUnknown_203998C: @ 203998C
.align 2
@ .include "src/easy_chat_2.o"
gUnknown_203ACE8: @ 203ACE8
sEasyChatScreen: @ 203ACE8
.space 0x4
gUnknown_203ACEC: @ 203ACEC