diff options
| -rw-r--r-- | asm/rom3.s | 23 | ||||
| -rw-r--r-- | asm/rom5.s | 11 | ||||
| -rw-r--r-- | asm/rom_8074BAC.s | 19 | ||||
| -rw-r--r-- | data/data2.s | 15 |
4 files changed, 39 insertions, 29 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 091637bec..6f12aeb9a 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -1,4 +1,5 @@ .include "constants/gba_constants.s" + .include "constants/species_constants.s" .include "asm/macros.s" .syntax unified @@ -7832,7 +7833,7 @@ sub_800D378: @ 800D378 ldr r0, [sp, 0x20] lsls r0, 24 lsrs r7, r0, 24 - cmp r6, 0xC9 + cmp r6, SPECIES_UNOWN bne _0800D3EC movs r0, 0xC0 lsls r0, 18 @@ -7857,7 +7858,7 @@ sub_800D378: @ 800D378 lsrs r1, r0, 16 cmp r1, 0 bne _0800D3C0 - movs r1, 0xC9 + movs r1, SPECIES_UNOWN b _0800D3CA _0800D3C0: movs r2, 0xCE @@ -13755,7 +13756,7 @@ _080103AC: adds r0, r7 movs r1, 0 bl PokemonGetField - cmp r4, 0xC9 + cmp r4, SPECIES_UNOWN bne _08010430 ldrh r0, [r5] mov r1, r8 @@ -13788,7 +13789,7 @@ _080103AC: lsrs r0, 16 cmp r0, 0 bne _0801041C - movs r0, 0xC9 + movs r0, SPECIES_UNOWN b _08010426 .align 2, 0 _08010414: .4byte 0x02024a6a @@ -13807,7 +13808,7 @@ _08010426: _0801042C: .4byte gMonFrontPicCoords _08010430: ldr r0, _08010448 - cmp r4, r0 + cmp r4, r0 @ Check is pokemon species is Castform bne _08010454 ldr r0, _0801044C ldr r1, _08010450 @@ -13818,8 +13819,8 @@ _08010430: ldrb r0, [r1, 0x1] b _0801046C .align 2, 0 -_08010448: .4byte 0x00000181 -_0801044C: .4byte gUnknown_0837F598 +_08010448: .4byte SPECIES_CASTFORM +_0801044C: .4byte gUnknownCastformCoords_0837F598 _08010450: .4byte 0x02024e84 _08010454: movs r0, 0xCE @@ -29236,7 +29237,7 @@ _0801820A: b _08018314 .align 2, 0 _08018228: .4byte 0x02024a80 -_0801822C: .4byte 0x00000181 +_0801822C: .4byte SPECIES_CASTFORM _08018230: movs r0, 0 str r0, [sp] @@ -79378,7 +79379,7 @@ _080318CE: bx r0 .align 2, 0 _080318E0: .4byte 0x02000000 -_080318E4: .4byte 0x00000181 +_080318E4: .4byte SPECIES_CASTFORM _080318E8: .4byte 0x02024e84 _080318EC: .4byte 0x00007fff _080318F0: .4byte 0x0202eec8 @@ -79542,7 +79543,7 @@ _08031A36: bx r0 .align 2, 0 _08031A48: .4byte 0x02000000 -_08031A4C: .4byte 0x00000181 +_08031A4C: .4byte SPECIES_CASTFORM _08031A50: .4byte 0x02024e84 _08031A54: .4byte 0x00007fff _08031A58: .4byte 0x0202eec8 @@ -80638,7 +80639,7 @@ _08032328: .4byte 0x06010000 _0803232C: .4byte 0x040000d4 _08032330: .4byte 0x84000200 _08032334: .4byte 0x02000000 -_08032338: .4byte 0x00000181 +_08032338: .4byte SPECIES_CASTFORM _0803233C: .4byte 0x02024e84 _08032340: .4byte 0x00007fff _08032344: .4byte 0x0202eec8 diff --git a/asm/rom5.s b/asm/rom5.s index 8466afe23..fdbaa63bf 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -1,4 +1,5 @@ .include "constants/gba_constants.s" + .include "constants/species_constants.s" .include "asm/macros.s" .syntax unified @@ -46442,7 +46443,7 @@ sub_80918EC: @ 80918EC adds r0, r7, 0 bl NationalPokedexNumToSpecies adds r7, r0, 0 - cmp r7, 0xC9 + cmp r7, SPECIES_UNOWN beq _0809199C movs r0, 0x9A lsls r0, 1 @@ -70242,7 +70243,7 @@ mon_icon_convert_unown_species_id: @ 809D434 push {lr} lsls r0, 16 lsrs r2, r0, 16 - cmp r2, 0xC9 + cmp r2, SPECIES_UNOWN bne _0809D45E adds r0, r1, 0 bl sub_809D474 @@ -70250,7 +70251,7 @@ mon_icon_convert_unown_species_id: @ 809D434 lsrs r0, 16 cmp r0, 0 bne _0809D450 - movs r0, 0xC9 + movs r0, SPECIES_UNOWN b _0809D45A _0809D450: movs r1, 0xCE @@ -70315,14 +70316,14 @@ sub_809D4A8: @ 809D4A8 bl sub_80A2D64 lsls r0, 16 lsrs r0, 16 - cmp r0, 0xC9 + cmp r0, SPECIES_UNOWN bne _0809D4DE mov r0, sp ldrh r0, [r0] cmp r0, 0 bne _0809D4CE mov r1, sp - adds r0, 0xC9 + adds r0, SPECIES_UNOWN b _0809D4D6 _0809D4CE: mov r1, sp diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index bddc517c0..c1bba49ea 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -1,4 +1,5 @@ .include "constants/gba_constants.s" + .include "constants/species_constants.s" .include "asm/macros.s" .syntax unified @@ -6392,7 +6393,7 @@ _08077CCC: ldrb r0, [r1] b _08077DCC .align 2, 0 -_08077CE0: .4byte 0x00000181 +_08077CE0: .4byte SPECIES_CASTFORM _08077CE4: .4byte gUnknown_0837F5AC _08077CE8: .4byte 0x02024e84 _08077CEC: @@ -6491,8 +6492,8 @@ _08077D90: ldrb r0, [r1, 0x1] b _08077DCC .align 2, 0 -_08077DA8: .4byte 0x00000181 -_08077DAC: .4byte gUnknown_0837F598 +_08077DA8: .4byte SPECIES_CASTFORM +_08077DAC: .4byte gUnknownCastformCoords_0837F598 _08077DB0: .4byte 0x02024e84 _08077DB4: movs r0, 0xCE @@ -6539,7 +6540,7 @@ sub_8077DD8: @ 8077DD8 cmp r0, 0 bne _08077E36 ldr r0, _08077E14 - cmp r4, r0 + cmp r4, r0 @ check if the given pokemon species is Castform bne _08077E20 ldr r0, _08077E18 ldr r1, _08077E1C @@ -6549,8 +6550,8 @@ sub_8077DD8: @ 8077DD8 ldrb r5, [r1] b _08077E36 .align 2, 0 -_08077E14: .4byte 0x00000181 -_08077E18: .4byte gUnknown_0837F5A8 +_08077E14: .4byte SPECIES_CASTFORM +_08077E18: .4byte gUnknownCastformData_0837F5A8 _08077E1C: .4byte 0x02024e84 _08077E20: movs r0, 0xCE @@ -11370,7 +11371,7 @@ _0807A18C: ldr r0, _0807A1A0 b _0807A33C .align 2, 0 -_0807A19C: .4byte 0x00000181 +_0807A19C: .4byte SPECIES_CASTFORM _0807A1A0: .4byte gMonBackPicCoords _0807A1A4: mov r0, r8 @@ -11561,9 +11562,9 @@ _0807A30C: adds r4, r0, r1 b _0807A33E .align 2, 0 -_0807A31C: .4byte 0x00000181 +_0807A31C: .4byte SPECIES_CASTFORM _0807A320: .4byte 0x02024e84 -_0807A324: .4byte gUnknown_0837F598 +_0807A324: .4byte gUnknownCastformCoords_0837F598 _0807A328: movs r0, 0xCE lsls r0, 1 diff --git a/data/data2.s b/data/data2.s index 15f735584..8c01d69dc 100644 --- a/data/data2.s +++ b/data/data2.s @@ -9038,10 +9038,17 @@ gUnknown_0837F4B8:: @ 837F4B8 gUnknown_0837F578:: @ 837F578 .incbin "baserom.gba", 0x0037f578, 0x20 -gUnknown_0837F598:: @ 837F598 - .incbin "baserom.gba", 0x0037f598, 0x10 - -gUnknown_0837F5A8:: @ 837F5A8 +@ One entry for each of the four Castform forms. +@ Coords are probably front pic coords or back pic coords, but this data does not seem to be +@ used during battle, party summary, or pokedex screens. +gUnknownCastformCoords_0837F598:: @ 837F598 + .byte 68, 17, 0, 0 + .byte 102, 9, 0, 0 + .byte 70, 9, 0, 0 + .byte 134, 8, 0, 0 + +@ One entry for each of the four Castform forms. Probably a palette index. +gUnknownCastformData_0837F5A8:: @ 837F5A8 .byte 0xD, 0xE, 0xD, 0xD gUnknown_0837F5AC:: @ 837F5AC |