diff options
| -rw-r--r-- | data/data_80B9BB8.s | 4 | ||||
| -rw-r--r-- | data/text/type_names.inc | 75 | ||||
| -rw-r--r-- | src/event_flag.c | 6 |
3 files changed, 82 insertions, 3 deletions
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index 8cd8635..66fc54d 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -10114,9 +10114,7 @@ gUnknown_810ACC0: @ 810ACC0 gUnknown_810AD0C: @ 810AD0C .incbin "baserom.gba", 0x10AD0C, 0x40 - .global gUnknown_810AD4C -gUnknown_810AD4C: @ 810AD4C - .incbin "baserom.gba", 0x10AD4C, 0xD8 + .include "data/text/type_names.inc" .global gUnknown_810AE24 gUnknown_810AE24: @ 810AE24 diff --git a/data/text/type_names.inc b/data/text/type_names.inc new file mode 100644 index 0000000..a8758e8 --- /dev/null +++ b/data/text/type_names.inc @@ -0,0 +1,75 @@ +gUnknown_810AD4C:: @ 810AD4C +.byte 0x1c, 0xae, 0x10, 0x08, 0x14, 0xae, 0x10, 0x08, 0x0c, 0xae, 0x10, 0x08, 0x04, 0xae, 0x10, 0x08, 0xfc, 0xad, 0x10, 0x08, 0xf0, 0xad, 0x10, 0x08, 0xec, 0xad, 0x10, 0x08, 0xe0, 0xad, 0x10, 0x08 +.byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08 +.byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08, 0x53, 0x74, 0x65, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x44, 0x61, 0x72, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x00, 0x00 + +.string "Ghost" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Rock" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Bug" +.byte 0 +.align 2,0 +.string "Psychic" +.byte 0 +.align 2,0 +.string "Flying" +.byte 0 +.byte 0 +.align 2,0 +.string "Ground" +.byte 0 +.byte 0 +.align 2,0 +.string "Poison" +.byte 0 +.byte 0 +.string "Fighting" +.align 2,0 +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Ice" +.byte 0 +.align 2,0 +.string "Electric" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Grass" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Water" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Fire" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Normal" +.byte 0 +.byte 0 +.align 2,0 +.string "None" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 diff --git a/src/event_flag.c b/src/event_flag.c new file mode 100644 index 0000000..85c320f --- /dev/null +++ b/src/event_flag.c @@ -0,0 +1,6 @@ +#include "global.h" + +void nullsub_140(void) +{ + +} |