diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-11 10:58:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-01-11 10:58:30 -0500 |
| commit | 9d2f1af103fb52ec5d06e185a4ddf25d91554549 (patch) | |
| tree | 2f96b6d0c0a3a4c6811d0513d3bae05420c1041a /data | |
| parent | 3310aadb548f11b356a6fb10a049aff6704dc82b (diff) | |
through PrintSafariMonInfo
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_interface.s | 44 | ||||
| -rw-r--r-- | data/pokemon_summary_screen.s | 2 |
2 files changed, 1 insertions, 45 deletions
diff --git a/data/battle_interface.s b/data/battle_interface.s deleted file mode 100644 index 4dc0c1b99..000000000 --- a/data/battle_interface.s +++ /dev/null @@ -1,44 +0,0 @@ -#include "constants/region_map.h" -#include "constants/trainer_classes.h" -#include "constants/songs.h" -#include "constants/flags.h" -#include "constants/region_map.h" -#include "constants/maps.h" -#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_826052C:: @ 826052C - .string "{COLOR 01}{HIGHLIGHT 02}", 20 - -gUnknown_8260540:: @ 8260540 - .string "/$" - -gUnknown_8260542:: @ 8260542 - .string "{COLOR 01}{HIGHLIGHT 00}", 20 - -gUnknown_8260556:: @ 8260556 - .string "{HIGHLIGHT 02}$" - -gUnknown_826055A:: @ 826055A - .2byte RGB(24, 12, 24) - .2byte RGB(23, 23, 3) - .2byte RGB(20, 20, 17) - .2byte RGB(17, 22, 28) - .2byte RGB(28, 14, 10) - -gUnknown_8260564:: @ 8260564 - .byte 0, 0, 0, 8, 2, 0 - .2byte 0x0000 - @ { - @ .bg = 0, - @ .tilemapLeft = 0, - @ .tilemapTop = 0, - @ .width = 8, - @ .height = 2, - @ .paletteNum = 0, - @ .baseBlock = 0x0000 - @ } diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index ff732f5ae..3400c9ae0 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -266,7 +266,7 @@ gUnknown_8463E57:: @ 8463E57 .string "QUIRKY$" .align 2 -gNatureNames:: @ 8463E60 dataptr +gNatureNamePointers:: @ 8463E60 dataptr .4byte gUnknown_8463DBC .4byte gUnknown_8463DC2 .4byte gUnknown_8463DC9 |