diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 4 | ||||
| -rw-r--r-- | data/ingame_trades.s | 82 |
2 files changed, 84 insertions, 2 deletions
diff --git a/data/data2.s b/data/data2.s index 0680b8f94..627159c27 100644 --- a/data/data2.s +++ b/data/data2.s @@ -2630,8 +2630,8 @@ Unknown_08215AB0: gUnknown_08215AC0:: @ 8215AC0 .4byte Unknown_08215AB0 -gUnknown_08215AC4:: @ 8215AC4 - .incbin "baserom.gba", 0x00215ac4, 0xb4 +@ 8215AC4 + .include "data/ingame_trades.s" gUnknown_08215B78:: @ 8215B78 .incbin "baserom.gba", 0x00215b78, 0x28 diff --git a/data/ingame_trades.s b/data/ingame_trades.s new file mode 100644 index 000000000..8b91aaeff --- /dev/null +++ b/data/ingame_trades.s @@ -0,0 +1,82 @@ + .align 2 +gIngameTrades:: @ 8215AC4 + .string "MAKIT$", 11 @ nickname + .space 1 + .2byte SPECIES_MAKUHITA @ NPC mon species + .byte 5 @ HP IV + .byte 5 @ attack IV + .byte 4 @ defense IV + .byte 4 @ speed IV + .byte 4 @ sp. attack IV + .byte 4 @ sp. defense IV + .byte TRUE @ second ability + .space 3 + .4byte 49562 @ OT ID + .byte 5 @ cool + .byte 5 @ beauty + .byte 5 @ cute + .byte 5 @ smart + .byte 30 @ tough + .space 3 + .4byte 0x9C40 @ personality value + .2byte ITEM_X_ATTACK @ held item + .byte -1 @ mail num + .string "ELYSSA$", 11 @ OT name + .byte MALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_SLAKOTH @ player mon species + .space 2 + + .string "SKITIT$", 11 @ nickname + .space 1 + .2byte SPECIES_SKITTY @ NPC mon species + .byte 5 @ HP IV + .byte 4 @ attack IV + .byte 4 @ defense IV + .byte 5 @ speed IV + .byte 4 @ sp. attack IV + .byte 4 @ sp. defense IV + .byte FALSE @ second ability + .space 3 + .4byte 2259 @ OT ID + .byte 5 @ cool + .byte 5 @ beauty + .byte 30 @ cute + .byte 5 @ smart + .byte 5 @ tough + .space 3 + .4byte 0x498A2E17 @ personality value + .2byte ITEM_GLITTER_MAIL @ held item + .byte 0 @ mail num + .string "DARRELL$", 11 @ OT name + .byte FEMALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_PIKACHU @ player mon species + .space 2 + + .string "COROSO$", 11 @ nickname + .space 1 + .2byte SPECIES_CORSOLA @ NPC mon species + .byte 4 @ HP IV + .byte 4 @ attack IV + .byte 5 @ defense IV + .byte 4 @ speed IV + .byte 4 @ sp. attack IV + .byte 5 @ sp. defense IV + .byte TRUE @ second ability + .space 3 + .4byte 50183 @ OT ID + .byte 5 @ cool + .byte 30 @ beauty + .byte 5 @ cute + .byte 5 @ smart + .byte 5 @ tough + .space 3 + .4byte 0x4C970B7F @ personality value + .2byte ITEM_TROPIC_MAIL @ held item + .byte 1 @ mail num + .string "LANE$", 11 @ OT name + .byte FEMALE @ OT gender + .byte 10 @ sheen + .2byte SPECIES_BELLOSSOM @ player mon species + .space 2 |