diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-06 12:02:37 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-09-06 12:02:37 +0100 |
| commit | 9ad7dc9fd7c0fc6e3fe117ac6f393f8af4b9f53f (patch) | |
| tree | 3159f2198ff952719a513a995f5dfddfed47f2c5 | |
| parent | 26c91f1502436c2268b574720a2837a1db3e1114 (diff) | |
Move remaining field_player_avatar data across
| -rw-r--r-- | data/field_player_avatar.s | 21 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 6 |
3 files changed, 3 insertions, 25 deletions
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s deleted file mode 100644 index fa36390df..000000000 --- a/data/field_player_avatar.s +++ /dev/null @@ -1,21 +0,0 @@ -@ the third big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_084975A8:: @ 84975A8 - .string "·$" - -gUnknown_084975AA:: @ 84975AA - .2byte 36, 33, 30 - -gUnknown_084975B0:: @ 84975B0 - .2byte 0, 0 - .2byte 0x28, 10 - .2byte 0x46, 30 - -gUnknown_084975BC:: @ 84975BC - .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 diff --git a/ld_script.txt b/ld_script.txt index f3573fd21..071d2594e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -409,7 +409,6 @@ SECTIONS { src/metatile_behavior.o(.rodata); src/field_door.o(.rodata); src/field_player_avatar.o(.rodata); - data/field_player_avatar.o(.rodata); src/event_object_movement.o(.rodata); src/text_window.o(.rodata); src/scrcmd.o(.rodata); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index d32aabb81..38845beb8 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -266,8 +266,8 @@ u8 (*const gUnknown_0849755C[])(struct Task *) = const u16 gUnknown_0849759C[] = {1, 1, 1}; const u16 gUnknown_084975A2[] = {1, 3, 6}; -/* -const u8 gUnknown_084975A8[] = _("·$"); + +const u8 gUnknown_084975A8[] = _("·"); const u16 gUnknown_084975AA[] = {36, 33, 30}; @@ -279,7 +279,7 @@ const u16 gUnknown_084975B0[] = }; const u8 gUnknown_084975BC[] = {0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00}; -*/ + // .text void MovementType_Player(struct Sprite *sprite) { |