pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

pokegear asm cleanup

Browse Source
This commit is contained in:
yenatch 2013-12-13 05:08:48 -05:00
parent 5708d855e5
commit ef6b8b5490
2 changed files with 78 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
gfx/misc/fast_ship.2bpp Normal file
View File

Binary file not shown.

120
main.asm
View File

@ -77625,52 +77625,62 @@ Function90bea: ; 90bea (24:4bea)
Function90c4e: ; 90c4e Function90c4e: ; 90c4e
call Functiond79 call Functiond79
ld hl, $4ba0 ld hl, TownMapGFX
ld de, VTiles2 ld de, VTiles2
ld a, $3e ld a, BANK(TownMapGFX)
call FarDecompress call FarDecompress
ld hl, $62e4
ld hl, PokegearGFX
ld de, $9300 ld de, $9300
ld a, $77 ld a, BANK(PokegearGFX)
call FarDecompress call FarDecompress
ld hl, PokegearSpritesGFX ld hl, PokegearSpritesGFX
ld de, VTiles0 ld de, VTiles0
ld a, $24 ld a, BANK(PokegearSpritesGFX)
call Decompress call Decompress
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp $5f cp FAST_SHIP
jr z, .asm_90ca5 jr z, .ssaqua
callba GetPlayerIcon callba GetPlayerIcon
push de push de
ld h, d ld h, d
ld l, e ld l, e
ld a, b ld a, b
push af push af
ld de, $8100 ld de, $8100
ld bc, $0040 ld bc, $40
call FarCopyBytes call FarCopyBytes
pop af pop af
pop hl pop hl
ld de, $00c0
ld de, $c0
add hl, de add hl, de
ld de, $8140 ld de, $8140
ld bc, $0040 ld bc, $40
call FarCopyBytes call FarCopyBytes
ret ret
.asm_90ca5 .ssaqua
ld hl, $4cb2 ld hl, FastShipGFX
ld de, $8100 ld de, $8100
ld bc, $0080 ld bc, $80
call CopyBytes call CopyBytes
ret ret
; 90cb2 ; 90cb2
INCBIN "baserom.gbc",$90cb2,$90d32 - $90cb2 FastShipGFX: ; 90cb2
INCBIN "gfx/misc/fast_ship.2bpp"
; 90d32
; known jump sources: 90c08 (24:4c08) ; known jump sources: 90c08 (24:4c08)
Function90d32: ; 90d32 (24:4d32) Function90d32: ; 90d32 (24:4d32)
@ -77704,7 +77714,7 @@ Function90d56: ; 90d56
ld a, [MapNumber] ld a, [MapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp $0 cp SPECIAL_MAP
ret nz ret nz
ld a, [BackupMapGroup] ld a, [BackupMapGroup]
ld b, a ld b, a
@ -77722,23 +77732,28 @@ Function90d70: ; 90d70 (24:4d70)
ld a, [MapNumber] ; $dcb6 ld a, [MapNumber] ; $dcb6
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
cp $5f
cp FAST_SHIP
jr z, .asm_90d95 jr z, .asm_90d95
cp $0
cp SPECIAL_MAP
jr nz, .asm_90d8e jr nz, .asm_90d8e
ld a, [BackupMapGroup] ; $dcad ld a, [BackupMapGroup] ; $dcad
ld b, a ld b, a
ld a, [BackupMapNumber] ; $dcae ld a, [BackupMapNumber] ; $dcae
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
.asm_90d8e .asm_90d8e
ld [EnemySDefLevel], a ; $c6d8 ld [$c6d8], a
ld [EnemySAtkLevel], a ; $c6d7 ld [$c6d7], a
ret ret
.asm_90d95 .asm_90d95
ld [EnemySDefLevel], a ; $c6d8 ld [$c6d8], a
ld a, $1 ld a, 1
ld [EnemySAtkLevel], a ; $c6d7 ld [$c6d7], a
ret ret
; known jump sources: 90c36 (24:4c36) ; known jump sources: 90c36 (24:4c36)
@ -77753,23 +77768,25 @@ Function90d9e: ; 90d9e (24:4d9e)
Function90da8: ; 90da8 (24:4da8) Function90da8: ; 90da8 (24:4da8)
xor a xor a
ld [hBGMapMode], a ; $ff00+$d4 ld [hBGMapMode], a ; $ff00+$d4
ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld hl, TileMap
ld bc, $168 ld bc, TileMapEnd - TileMap
ld a, $4f ld a, $4f
call ByteFill call ByteFill
ld a, [$cf64] ld a, [$cf64]
and $3 and $3
add a add a
ld e, a ld e, a
ld d, $0 ld d, 0
ld hl, $4e12 ld hl, $4e12
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld de, $4dcb ld de, .asm_90dcb
push de push de
jp [hl] jp [hl]
.asm_90dcb
call Function90eb0 call Function90eb0
callba TownMapPals callba TownMapPals
ld a, [$cf65] ld a, [$cf65]
@ -77792,8 +77809,8 @@ Function90da8: ; 90da8 (24:4da8)
.asm_90df3 .asm_90df3
ld [hWY], a ; $ff00+$d2 ld [hWY], a ; $ff00+$d2
ld a, [$cf65] ld a, [$cf65]
and $1 and 1
xor $1 xor 1
ld [$cf65], a ld [$cf65], a
ret ret
@ -77811,30 +77828,42 @@ Function90e00: ; 90e00 (24:4e00)
ret ret
; 90e12 (24:4e12) ; 90e12 (24:4e12)
INCBIN "baserom.gbc",$90e12,$90e1a - $90e12 JumpTable90e12: ; 90e12
dw Function90e1a
dw Function90e3f
dw Function90e82
dw Function90e72
; 90e1a
Function90e1a: ; 90e1a
ld de, $55db ld de, $55db
call Function914bb call Function914bb
ld hl, $c4c0 ld hl, $c4c0
ld de, $4e36 ld de, .switch
call PlaceString call PlaceString
ld hl, $c590 ld hl, $c590
ld bc, $412 lb bc, 4, 18
call TextBox call TextBox
call Function90f86 call Function90f86
ret ret
; 90e36 (24:4e36) ; 90e36 (24:4e36)
INCBIN "baserom.gbc",$90e36,$90e3f - $90e36 .switch
ld a, [EnemySDefLevel] ; $c6d8 db " SWITCH▶@"
cp $5f ; 90e3f
jr z, .asm_90e4a
cp $2f Function90e3f: ; 90e3f
jr nc, .asm_90e4e
.asm_90e4a ld a, [$c6d8]
ld e, $0 cp FAST_SHIP
jr z, .johto
cp KANTO_LANDMARK
jr nc, .kanto
.johto
ld e, 0
jr .asm_90e50 jr .asm_90e50
.asm_90e4e .kanto
ld e, $1 ld e, 1
.asm_90e50 .asm_90e50
callba Function91ae1 callba Function91ae1
ld a, $7 ld a, $7
@ -77845,15 +77874,21 @@ INCBIN "baserom.gbc",$90e36,$90e3f - $90e36
ld [hl], $6 ld [hl], $6
ld hl, $c4db ld hl, $c4db
ld [hl], $17 ld [hl], $17
ld a, [EnemySAtkLevel] ; $c6d7 ld a, [$c6d7]
call Function910b4 call Function910b4
ret ret
; 90e72
Function90e72: ; 90e72
ld de, $550d ld de, $550d
call Function914bb call Function914bb
ld hl, $c590 ld hl, $c590
ld bc, $412 ld bc, $412
call TextBox call TextBox
ret ret
; 90e82
Function90e82: ; 90e82
ld de, $558a ld de, $558a
call Function914bb call Function914bb
ld hl, $c590 ld hl, $c590
@ -77862,6 +77897,7 @@ INCBIN "baserom.gbc",$90e36,$90e3f - $90e36
call Function90e98 call Function90e98
call Function912d8 call Function912d8
ret ret
; 90e98
; known jump sources: 90e91 (24:4e91) ; known jump sources: 90e91 (24:4e91)
Function90e98: ; 90e98 (24:4e98) Function90e98: ; 90e98 (24:4e98)