diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/pokemon_data.s | 4 | ||||
| -rw-r--r-- | asm/rom5.s | 46 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 36 |
3 files changed, 43 insertions, 43 deletions
diff --git a/asm/macros/pokemon_data.s b/asm/macros/pokemon_data.s index f18462d34..b0a5f22e3 100644 --- a/asm/macros/pokemon_data.s +++ b/asm/macros/pokemon_data.s @@ -1,6 +1,6 @@ - .macro pokedex_entry pokemon_name, height, width, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset + .macro pokedex_entry pokemon_name, height, weight, pokemon_scale, pokemon_offset, trainer_scale, trainer_offset .2byte \height @ in decimeters - .2byte \width @ in hectograms + .2byte \weight @ in hectograms .4byte DexDescription_\pokemon_name\()_1 .4byte DexDescription_\pokemon_name\()_2 .2byte 0 @ unused diff --git a/asm/rom5.s b/asm/rom5.s index 56b7f4ee4..816db74af 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -70082,10 +70082,10 @@ unref_sub_809D26C: @ 809D26C pop {r1} bx r1 .align 2, 0 -_0809D2E0: .4byte gUnknown_083BC5E8 +_0809D2E0: .4byte gOamData_83BC5E8 _0809D2E4: .4byte gMonIconTable -_0809D2E8: .4byte gUnknown_083BC62C -_0809D2EC: .4byte gUnknown_083BC660 +_0809D2E8: .4byte gSpriteAnimTable_83BC62C +_0809D2EC: .4byte gSpriteAffineAnimTable_83BC660 _0809D2F0: .4byte gMonIconPaletteIndices _0809D2F4: .4byte 0x0000dac0 _0809D2F8: .4byte 0x02020004 @@ -70163,9 +70163,9 @@ _0809D35A: pop {r1} bx r1 .align 2, 0 -_0809D38C: .4byte gUnknown_083BC5E8 -_0809D390: .4byte gUnknown_083BC62C -_0809D394: .4byte gUnknown_083BC660 +_0809D38C: .4byte gOamData_83BC5E8 +_0809D390: .4byte gSpriteAnimTable_83BC62C +_0809D394: .4byte gSpriteAffineAnimTable_83BC660 _0809D398: .4byte gMonIconPaletteIndices _0809D39C: .4byte 0x0000dac0 _0809D3A0: .4byte 0x02020004 @@ -70229,10 +70229,10 @@ sub_809D3A4: @ 809D3A4 pop {r1} bx r1 .align 2, 0 -_0809D418: .4byte gUnknown_083BC5E8 +_0809D418: .4byte gOamData_83BC5E8 _0809D41C: .4byte gMonIconTable -_0809D420: .4byte gUnknown_083BC62C -_0809D424: .4byte gUnknown_083BC660 +_0809D420: .4byte gSpriteAnimTable_83BC62C +_0809D424: .4byte gSpriteAffineAnimTable_83BC660 _0809D428: .4byte gMonIconPaletteIndices _0809D42C: .4byte 0x0000dac0 _0809D430: .4byte 0x02020004 @@ -70623,7 +70623,7 @@ _0809D686: ldrb r7, [r5] b _0809D700 .align 2, 0 -_0809D6E4: .4byte gUnknown_083BC668 +_0809D6E4: .4byte gSpriteImageSizes _0809D6E8: .4byte 0x06010000 _0809D6EC: lsls r0, r2, 26 @@ -70746,7 +70746,7 @@ sub_809D710: @ 809D710 pop {r1} bx r1 .align 2, 0 -_0809D7D8: .4byte gUnknown_083BC668 +_0809D7D8: .4byte gSpriteImageSizes _0809D7DC: .4byte 0xffff0000 _0809D7E0: .4byte 0x0000ffff _0809D7E4: .4byte 0x02020004 @@ -70780,7 +70780,7 @@ sub_809D7E8: @ 809D7E8 pop {r0} bx r0 .align 2, 0 -_0809D81C: .4byte gUnknown_083BC668 +_0809D81C: .4byte gSpriteImageSizes _0809D820: .4byte 0xffff0000 thumb_func_end sub_809D7E8 @@ -245189,8 +245189,8 @@ sub_80F2598: @ 80F2598 _080F25F0: .4byte gUnknown_083DFEC4 _080F25F4: .4byte 0x00006d9c _080F25F8: .4byte 0x02025734 -_080F25FC: .4byte gUnknown_083E446C -_080F2600: .4byte gUnknown_083E4474 +_080F25FC: .4byte gSpriteSheet_PokenavBlueLight +_080F2600: .4byte gSpritePalette_PokenavBlueLight _080F2604: .4byte gSpriteTemplate_83E4484 _080F2608: .4byte 0x02020004 _080F260C: @@ -294887,9 +294887,9 @@ _0810A09C: .4byte 0x8100c000 _0810A0A0: .4byte 0x85000100 _0810A0A4: .4byte 0x81000200 _0810A0A8: .4byte gUnknown_083F66F0 -_0810A0AC: .4byte gUnknown_083F636C +_0810A0AC: .4byte gBirchBagTilemap _0810A0B0: .4byte 0x06003000 -_0810A0B4: .4byte gUnknown_083F64F8 +_0810A0B4: .4byte gBirchGrassTilemap _0810A0B8: .4byte 0x06003800 _0810A0BC: .4byte gUnknown_083F62EC _0810A0C0: .4byte gUnknown_083F7794 @@ -347345,10 +347345,10 @@ _081241BE: bl sub_807C9B4 b _0812431E .align 2, 0 -_0812422C: .4byte gUnknown_08401D88 -_08124230: .4byte gUnknown_08401D8A -_08124234: .4byte gUnknown_08401D8E -_08124238: .4byte gUnknown_08401D96 +_0812422C: .4byte gCableCarPlayerGraphicsIDs +_08124230: .4byte gMtChimneyHikerGraphicsIDs +_08124234: .4byte gMtChimneyHikerCoords +_08124238: .4byte gMtChimneyHikerMovementDelayTable _0812423C: .4byte gUnknown_08401D9C _08124240: .4byte 0x0202e8cc _08124244: .4byte gSaveBlock2 @@ -412623,7 +412623,7 @@ _08143DC8: .4byte 0x03001770 _08143DCC: .4byte 0x0000043c _08143DD0: .4byte 0x030028f8 _08143DD4: .4byte gUnknown_083F66F0 -_08143DD8: .4byte gUnknown_083F64F8 +_08143DD8: .4byte gBirchGrassTilemap _08143DDC: .4byte 0x06003800 _08143DE0: .4byte gUnknown_083F62EC + 0x2 _08143DE4: .4byte 0x0201e000 @@ -418816,9 +418816,9 @@ _08146FC4: .4byte 0x8100c000 _08146FC8: .4byte 0x85000100 _08146FCC: .4byte 0x81000200 _08146FD0: .4byte gUnknown_083F66F0 -_08146FD4: .4byte gUnknown_083F636C +_08146FD4: .4byte gBirchBagTilemap _08146FD8: .4byte 0x06003000 -_08146FDC: .4byte gUnknown_083F64F8 +_08146FDC: .4byte gBirchGrassTilemap _08146FE0: .4byte 0x06003800 _08146FE4: .4byte gUnknown_08411980 _08146FE8: .4byte 0x06010020 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 43a72f84f..756c90d7f 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -14321,10 +14321,10 @@ _08047DEE: bx r0 .align 2, 0 _08047E30: .4byte gSaveBlock2 -_08047E34: .4byte gUnknown_0820C2E6 +_08047E34: .4byte gTradeUnknownSpriteCoords _08047E38: .4byte gSpriteTemplate_820C0EC _08047E3C: .4byte 0x03002978 -_08047E40: .4byte gUnknown_0820C2E9 +_08047E40: .4byte gTradeUnknownSpriteCoords + 0x3 thumb_func_end sub_8047D58 thumb_func_start sub_8047E44 @@ -14828,7 +14828,7 @@ _0804828A: _08048294: .4byte 0x03004824 _08048298: .4byte 0x03004350 _0804829C: .4byte 0x030045b8 -_080482A0: .4byte gUnknown_0820C29C +_080482A0: .4byte gTradeMonSpriteCoords _080482A4: .4byte 0x03004360 _080482A8: .4byte 0xfff40000 _080482AC: .4byte sub_809D62C @@ -14944,7 +14944,7 @@ _08048360: b _080484C6 .align 2, 0 _080483A4: .4byte gSpriteTemplate_820C134 -_080483A8: .4byte gUnknown_0820C29C +_080483A8: .4byte gTradeMonSpriteCoords _080483AC: .4byte 0x03004824 _080483B0: .4byte 0x03001770 _080483B4: .4byte 0x0000043c @@ -15403,7 +15403,7 @@ _080487B0: _080487C0: .4byte 0x03004824 _080487C4: .4byte 0x03004350 _080487C8: .4byte 0x030045b8 -_080487CC: .4byte gUnknown_0820C29C +_080487CC: .4byte gTradeMonSpriteCoords _080487D0: .4byte 0x03004360 _080487D4: .4byte 0xfff40000 _080487D8: .4byte sub_809D62C @@ -15542,7 +15542,7 @@ _080488B8: b _080489CA .align 2, 0 _08048900: .4byte gSpriteTemplate_820C134 -_08048904: .4byte gUnknown_0820C29C +_08048904: .4byte gTradeMonSpriteCoords _08048908: .4byte 0x03004824 _0804890C: .4byte 0x03001770 _08048910: .4byte 0x0000043c @@ -17069,7 +17069,7 @@ _0804953A: b _08049558 .align 2, 0 _08049548: .4byte 0x03004824 -_0804954C: .4byte gUnknown_0820C164 +_0804954C: .4byte gTradeNextSelectedMonTable _08049550: adds r2, 0x1 adds r5, 0x1 @@ -17175,7 +17175,7 @@ _0804960C: .align 2, 0 _08049614: .4byte 0x03004824 _08049618: .4byte 0x02020004 -_0804961C: .4byte gUnknown_0820C29C +_0804961C: .4byte gTradeMonSpriteCoords thumb_func_end sub_8049560 thumb_func_start sub_8049620 @@ -18503,7 +18503,7 @@ _0804A08C: b _0804A294 .align 2, 0 _0804A094: .4byte 0x02020004 -_0804A098: .4byte gUnknown_0820C29C +_0804A098: .4byte gTradeMonSpriteCoords _0804A09C: .4byte 0x03004824 _0804A0A0: .4byte sub_809D62C _0804A0A4: .4byte gUnknown_0820C330 @@ -18697,7 +18697,7 @@ _0804A0E4: _0804A228: .4byte gTradeMovesBoxTilemap _0804A22C: .4byte 0x03004824 _0804A230: .4byte 0x02020004 -_0804A234: .4byte gUnknown_0820C29C +_0804A234: .4byte gTradeMonSpriteCoords _0804A238: .4byte gUnknown_0820C334 _0804A23C: .4byte gUnknown_0820C334 + 0x1 _0804A240: .4byte gUnknown_0842C7CA @@ -18977,7 +18977,7 @@ _0804A462: b _0804A484 .align 2, 0 _0804A470: .4byte 0x03004824 -_0804A474: .4byte gUnknown_0820C29C +_0804A474: .4byte gTradeMonSpriteCoords _0804A478: .4byte 0x03004360 _0804A47C: movs r0, 0x64 @@ -19122,7 +19122,7 @@ sub_804A51C: @ 804A51C b _0804A5D4 .align 2, 0 _0804A59C: .4byte 0x03004824 -_0804A5A0: .4byte gUnknown_08EA1DC8 +_0804A5A0: .4byte gTradeMonBoxTilemap _0804A5A4: .4byte 0x03004360 _0804A5A8: movs r0, 0x64 @@ -19326,8 +19326,8 @@ _0804A72C: bx r0 .align 2, 0 _0804A734: .4byte 0x03004824 -_0804A738: .4byte gUnknown_0820C2B6 -_0804A73C: .4byte gUnknown_0820C2CE +_0804A738: .4byte gTradeLevelDisplayCoords +_0804A73C: .4byte gTradeMonBoxCoords thumb_func_end sub_804A6DC thumb_func_start sub_804A740 @@ -19433,7 +19433,7 @@ _0804A7F2: .align 2, 0 _0804A800: .4byte 0x03004824 _0804A804: .4byte 0x02020004 -_0804A808: .4byte gUnknown_0820C29C +_0804A808: .4byte gTradeMonSpriteCoords thumb_func_end sub_804A740 thumb_func_start sub_804A80C @@ -25071,7 +25071,7 @@ _0804D796: pop {r0} bx r0 .align 2, 0 -_0804D7A0: .4byte gUnknown_08215BA0 +_0804D7A0: .4byte gTradeBallVerticalVelocityTable _0804D7A4: .4byte sub_804D7AC _0804D7A8: .4byte 0x0000ffff thumb_func_end sub_804D738 @@ -25123,7 +25123,7 @@ _0804D7FE: pop {r0} bx r0 .align 2, 0 -_0804D804: .4byte gUnknown_08215BA0 +_0804D804: .4byte gTradeBallVerticalVelocityTable _0804D808: .4byte 0x03004828 thumb_func_end sub_804D7AC @@ -25198,7 +25198,7 @@ _0804D88C: pop {r0} bx r0 .align 2, 0 -_0804D894: .4byte gUnknown_08215BA0 +_0804D894: .4byte gTradeBallVerticalVelocityTable _0804D898: .4byte SpriteCallbackDummy thumb_func_end sub_804D80C |