diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/crt0.s | 43 | ||||
| -rw-r--r-- | asm/librfu.s | 8 | ||||
| -rw-r--r-- | asm/macros.inc | 9 | ||||
| -rw-r--r-- | asm/pokedex_screen.s | 8 |
4 files changed, 47 insertions, 21 deletions
diff --git a/asm/crt0.s b/asm/crt0.s index f2e28c9e1..609845337 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -46,20 +46,29 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF + .ifdef FIRERED .4byte 4 .4byte 2 .ascii "pokemon red version" .space 13 - .4byte 0x82350AC @ gMonFrontPicTable - .4byte 0x823654C @ gMonBackPicTable - .4byte 0x823730C @ gMonPaletteTable - .4byte 0x82380CC @ gMonShinyPaletteTable - .4byte 0x83D37A0 @ gMonIconTable - .4byte 0x83D3E80 @ gMonIconPaletteIndices - .4byte 0x83D4038 @ gMonIconPaletteTable - .4byte 0x8245EE0 @ gSpeciesNames - .4byte 0x8247094 @ gMoveNames - .4byte 0x84556F8 @ gDecorations + .else + .ifdef LEAFGREEN + .4byte 5 + .4byte 2 + .ascii "pokemon green version" + .space 11 + .endif + .endif + .4byte gMonFrontPicTable + .4byte gMonBackPicTable + .4byte gMonPaletteTable + .4byte gMonShinyPaletteTable + .4byte gMonIconTable + .4byte gMonIconPaletteIndices + .4byte gMonIconPaletteTable + .4byte gSpeciesNames + .4byte gMoveNames + .4byte gDecorations .4byte 0xEE0 @ offsetof(struct SaveBlock1, flags) .4byte 0x1000 @ offsetof(struct SaveBlock1, vars) .4byte 0x18 @ offsetof(struct SaveBlock2, pokedex) @@ -88,13 +97,13 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0x30BB .4byte 0x30A7 .4byte 0 - .4byte 0x8254784 @ gBaseStats - .4byte 0x824FC40 @ gAbilityNames - .4byte 0x824FB08 @ gAbilityDescriptionPointers - .4byte 0x83DB028 @ gItems - .4byte 0x8250C04 @ gBattleMoves - .4byte 0x826056C @ gBallSpriteSheets - .4byte 0x82605CC @ gBallSpritePalettes + .4byte gBaseStats + .4byte gAbilityNames + .4byte gAbilityDescriptionPointers + .4byte gItems + .4byte gBattleMoves + .4byte gBallSpriteSheets + .4byte gBallSpritePalettes .4byte 0xA8 .4byte 0x82C .4byte 0x83B diff --git a/asm/librfu.s b/asm/librfu.s index bdf816bd8..a291fcad3 100644 --- a/asm/librfu.s +++ b/asm/librfu.s @@ -2363,7 +2363,7 @@ _081E0668: lsrs r5, r0, 16 cmp r5, 0x3 bls _081E0668 - ldr r1, _081E06E0 @ =0x081E1B25 + ldr r1, _081E06E0 @ =sub_81E1B24 movs r5, 0x2 negs r5, r5 ands r5, r1 @@ -2371,7 +2371,7 @@ _081E0668: ldr r0, [r2] adds r4, r0, 0 adds r4, 0x8 - ldr r0, _081E06E4 @ =0x081E1B55 + ldr r0, _081E06E4 @ =rfu_REQ_changeMasterSlave subs r0, r1 lsls r0, 15 lsrs r3, r0, 16 @@ -2408,8 +2408,8 @@ _081E06D0: .4byte gUnknown_3007464 _081E06D4: .4byte gUnknown_3007468 _081E06D8: .4byte gUnknown_3007450 _081E06DC: .4byte gUnknown_3007440 -_081E06E0: .4byte 0x081E1B25 -_081E06E4: .4byte 0x081E1B55 +_081E06E0: .4byte sub_81E1B24 +_081E06E4: .4byte rfu_REQ_changeMasterSlave _081E06E8: .4byte 0x0000ffff thumb_func_end sub_81E05B0 diff --git a/asm/macros.inc b/asm/macros.inc index 3cc26c6f7..ffbe3db29 100644 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -158,3 +158,12 @@ .byte \bg, \top, \left, \height, \width, \palno .2byte \baseBlock .endm + + .macro abspath relative + .if REVISION == 0 + .ascii "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/" + .else + .ascii "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/" + .endif + .asciz "\relative" + .endm diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 4bd153c77..94107279e 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -337,7 +337,11 @@ sub_8105800: @ 8105800 cmp r0, 0 beq _08105864 ldrb r0, [r5] + .if REVISION == 0 cmp r0, 0 + .else + cmp r0, 0xFF + .endif beq _08105878 _08105840: mov r1, sp @@ -351,7 +355,11 @@ _08105840: lsrs r4, r0, 24 adds r0, r5, r4 ldrb r0, [r0] + .if REVISION == 0 cmp r0, 0 + .else + cmp r0, 0xFF + .endif beq _08105878 cmp r4, 0xA bls _08105840 |