diff options
| -rw-r--r-- | asm/rom3.s | 8 | ||||
| -rw-r--r-- | constants/misc_constants.s | 3 | ||||
| -rw-r--r-- | data/data2.s | 4 | ||||
| -rw-r--r-- | data/ingame_trades.s | 82 |
4 files changed, 91 insertions, 6 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index a703f976e..7e453c4ac 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -133013,7 +133013,7 @@ _0804C278: bx r0 .align 2, 0 _0804C280: .4byte 0x0202e8cc -_0804C284: .4byte gUnknown_08215AC4 +_0804C284: .4byte gIngameTrades _0804C288: .4byte 0x020231cc _0804C28C: .4byte 0x020233cc _0804C290: .4byte 0x0202e8ce @@ -135570,7 +135570,7 @@ sub_804D89C: @ 804D89C bx r1 .align 2, 0 _0804D8D0: .4byte 0x0202e8cc -_0804D8D4: .4byte gUnknown_08215AC4 +_0804D8D4: .4byte gIngameTrades _0804D8D8: .4byte 0x020231cc _0804D8DC: .4byte gSpeciesNames _0804D8E0: .4byte 0x020232cc @@ -135612,7 +135612,7 @@ sub_804D8E4: @ 804D8E4 bx r0 .align 2, 0 _0804D92C: .4byte 0x0202e8cc -_0804D930: .4byte gUnknown_08215AC4 +_0804D930: .4byte gIngameTrades _0804D934: .4byte 0x0202e8ce _0804D938: .4byte 0x03004360 _0804D93C: .4byte 0x020231cc @@ -135773,7 +135773,7 @@ sub_804D948: @ 804D948 bl pokemon_setattr b _0804DAC0 .align 2, 0 -_0804DAA4: .4byte gUnknown_08215AC4 +_0804DAA4: .4byte gIngameTrades _0804DAA8: .4byte 0x03004360 _0804DAAC: .4byte 0x030045c0 _0804DAB0: .4byte 0x02029700 diff --git a/constants/misc_constants.s b/constants/misc_constants.s index 2ff67345c..64f671e8f 100644 --- a/constants/misc_constants.s +++ b/constants/misc_constants.s @@ -28,3 +28,6 @@ .equiv DIR_NORTH, 2 .equiv DIR_WEST, 3 .equiv DIR_EAST, 4 + + .equiv MALE, 0 + .equiv FEMALE, 1 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 |