diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-22 15:58:47 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2021-07-23 09:32:38 -0500 |
| commit | 810224959f75c1703ac47684b36e3a46cc9ad9d4 (patch) | |
| tree | 354b21a21bda76a56882bed9d6fe4ee0b04f1232 | |
| parent | 096a979f784945a1c453f2b821205bf46f5a02cb (diff) | |
Fixup
| -rwxr-xr-x | asm/bonus_field_select.s | 5 | ||||
| -rwxr-xr-x | ld_script.txt | 1 | ||||
| -rwxr-xr-x | src/bonus_field_select.c | 35 |
3 files changed, 18 insertions, 23 deletions
diff --git a/asm/bonus_field_select.s b/asm/bonus_field_select.s deleted file mode 100755 index e4aaa6c..0000000 --- a/asm/bonus_field_select.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - - .syntax unified - - .text diff --git a/ld_script.txt b/ld_script.txt index 21ac6d9..5651e63 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -35,7 +35,6 @@ SECTIONS src/gbplayer.o(.text); asm/rom_9BC.o(.text); src/bonus_field_select.o(.text); - asm/bonus_field_select.o(.text); asm/ereader.o(.text); asm/pokedex.o(.text); src/field_select.o(.text); diff --git a/src/bonus_field_select.c b/src/bonus_field_select.c index bb690aa..1485f28 100755 --- a/src/bonus_field_select.c +++ b/src/bonus_field_select.c @@ -4,12 +4,28 @@ #include "functions.h" #include "titlescreen.h" +EWRAM_DATA s8 gUnknown_0201A4B0 = 0; +EWRAM_DATA u8 gUnknown_0201A4C0 = 0; +EWRAM_DATA s16 gUnknown_0201A4F4 = 0; +EWRAM_DATA s8 gUnknown_0201A4F8 = 0; +EWRAM_DATA s16 gUnknown_0202A560 = 0; +EWRAM_DATA s16 gUnknown_0202BE1C = 0; +EWRAM_DATA s8 gUnknown_0202BED0 = 0; +EWRAM_DATA s8 gUnknown_0202BEE4 = 0; +EWRAM_DATA u8 gUnknown_0202BEE8 = 0; + extern void (*const gUnknown_0805C750[])(void); -extern const u16 gUnknown_0807C2E0[]; -extern const u8 gUnknown_0807C4E0[]; + +extern const struct SpriteSet *const gUnknown_086A4C80[16]; +extern const struct Coord16 gUnknown_086A4CC0[]; +extern const struct Coord16 gUnknown_086A4CD8[]; +extern const u8 gUnknown_086A4CF0[]; + extern const u8 gUnknown_0807AAE0[]; extern const u8 gUnknown_0807B2E0[]; extern const u8 gUnknown_0807BAE0[]; +extern const u16 gUnknown_0807C2E0[]; +extern const u8 gUnknown_0807C4E0[]; void sub_2710(void); void sub_29C8(void); @@ -50,21 +66,6 @@ void sub_25C4(void) gMain.subState++; } -EWRAM_DATA s16 gUnknown_0201A4F4 = 0; -EWRAM_DATA s8 gUnknown_0201A4F8 = 0; -EWRAM_DATA s8 gUnknown_0201A4B0 = 0; -EWRAM_DATA u8 gUnknown_0201A4C0 = 0; -EWRAM_DATA s16 gUnknown_0202A560 = 0; -EWRAM_DATA s16 gUnknown_0202BE1C = 0; -EWRAM_DATA s8 gUnknown_0202BED0 = 0; -EWRAM_DATA s8 gUnknown_0202BEE4 = 0; -EWRAM_DATA u8 gUnknown_0202BEE8 = 0; - -extern const struct SpriteSet *const gUnknown_086A4C80[16]; -extern const struct Coord16 gUnknown_086A4CC0[]; -extern const struct Coord16 gUnknown_086A4CD8[]; -extern const u8 gUnknown_086A4CF0[]; - void sub_2710(void) { gUnknown_0201A4F8 = 0; |