diff options
| -rw-r--r-- | asm/help_system.s | 8 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/help_system.c | 26 | ||||
| -rw-r--r-- | sym_ewram.txt | 29 |
4 files changed, 34 insertions, 30 deletions
diff --git a/asm/help_system.s b/asm/help_system.s index cb44523e6..783bc19b8 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -381,14 +381,14 @@ _0813BBC4: .4byte gUnknown_203B174 thumb_func_start sub_813BBC8 sub_813BBC8: @ 813BBC8 push {lr} - ldr r0, _0813BBD8 @ =gUnknown_203F18A + ldr r0, _0813BBD8 @ =gUnknown_203F178 + 0x12 adds r1, r0, 0x1 adds r2, r0, 0x2 bl SaveTextColors pop {r0} bx r0 .align 2, 0 -_0813BBD8: .4byte gUnknown_203F18A +_0813BBD8: .4byte gUnknown_203F178 + 0x12 thumb_func_end sub_813BBC8 thumb_func_start sub_813BBDC @@ -450,14 +450,14 @@ _0813BC44: .4byte 0x0600c000 thumb_func_start sub_813BC48 sub_813BC48: @ 813BC48 push {lr} - ldr r0, _0813BC58 @ =gUnknown_203F18A + ldr r0, _0813BC58 @ =gUnknown_203F178 + 0x12 adds r1, r0, 0x1 adds r2, r0, 0x2 bl RestoreTextColors pop {r0} bx r0 .align 2, 0 -_0813BC58: .4byte gUnknown_203F18A +_0813BC58: .4byte gUnknown_203F178 + 0x12 thumb_func_end sub_813BC48 thumb_func_start sub_813BC5C diff --git a/ld_script.txt b/ld_script.txt index 5abc25e98..599d3711a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -248,6 +248,7 @@ SECTIONS { asm/menu_indicators.o(.text); asm/pokedex_area_markers.o(.text); asm/pokemon_summary_screen.o(.text); + src/help_system.o(.text); asm/help_system.o(.text); asm/wild_pokemon_area.o(.text); asm/unk_text_util.o(.text); diff --git a/src/help_system.c b/src/help_system.c new file mode 100644 index 000000000..522890780 --- /dev/null +++ b/src/help_system.c @@ -0,0 +1,26 @@ +#include "global.h" +#include "main.h" +#include "help_system.h" +#include "list_menu.h" + +struct HelpSystemVideoState +{ + /*0x00*/ MainCallback savedVblankCb; + /*0x04*/ MainCallback savedHblankCb; + /*0x08*/ u16 savedDispCnt; + /*0x0a*/ u16 savedBg0Cnt; + /*0x0c*/ u16 savedBg0Hofs; + /*0x0e*/ u16 savedBg0Vofs; + /*0x10*/ u16 savedBldCnt; + /*0x12*/ u8 savedTextColor[3]; + /*0x15*/ u8 state; +}; + +EWRAM_DATA u8 gUnknown_203B174[0x4000] = {0}; +EWRAM_DATA u8 gUnknown_203F174 = 0; +EWRAM_DATA u8 gUnknown_203F175 = 0; +EWRAM_DATA u8 gUnknown_203F176 = 0; +EWRAM_DATA u8 gUnknown_203F177 = 0; +EWRAM_DATA struct HelpSystemVideoState gUnknown_203F178 = {0}; +EWRAM_DATA struct HelpSystemStruct_203F190 gUnknown_203F190 = {0}; +EWRAM_DATA struct ListMenuItem gUnknown_203F1AC[52] = {0}; diff --git a/sym_ewram.txt b/sym_ewram.txt index 9ad13f3ef..a260f5772 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -1509,33 +1509,10 @@ gUnknown_203B16E: @ 203B16E gUnknown_203B170: @ 203B170 .space 0x4 -gUnknown_203B174: @ 203B174 - .space 0x4000 - -gUnknown_203F174: @ 203F174 - .space 0x1 - -gUnknown_203F175: @ 203F175 - .space 0x1 - -gUnknown_203F176: @ 203F176 - .space 0x1 - -gUnknown_203F177: @ 203F177 - .space 0x1 - -gUnknown_203F178: @ 203F178 - .space 0x12 - -gUnknown_203F18A: @ 203F18A - .space 0x6 - -gUnknown_203F190: @ 203F190 - .space 0x1C - -gUnknown_203F1AC: @ 203F1AC - .space 0x1A0 + .align 2 + .include "src/help_system.o" + @ src/unk_text_util.o gUnknown_203F34C: @ 203F34C .space 0x20 |