help_system: EWRAM_DATA

This commit is contained in:
PikalaxALT
2019-06-12 21:34:35 -04:00
parent b26196e1f8
commit 9a1408797c
4 changed files with 34 additions and 30 deletions
+4 -4
View File
@@ -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
+1
View File
@@ -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);
+26
View File
@@ -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};
+3 -26
View File
@@ -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