pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up leftover code from main.asm

Browse Source
This commit is contained in:
xCrystal 2018-01-02 16:25:40 +01:00
parent 6f0b81504d
commit 7c0e903c48
6 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/unknown_table.asm Executable file
View File

@ -0,0 +1,13 @@
Unreferenced_53d84:
db $1a, $15
db $33, $16
db $4b, $17
db $62, $18
db $79, $19
db $90, $1a
db $a8, $1b
db $c4, $1c
db $e0, $1d
db $f6, $1e
db $ff, $1f
db $ff, $20

7
engine/card_flip.asm
View File

@ -2,6 +2,13 @@ CARDFLIP_LIGHT_OFF EQU $ef
CARDFLIP_LIGHT_ON EQU $f5
CARDFLIP_DECK_SIZE EQU 4 * 6
; two labels below called from inside ./dummy_game.asm
Unknown_e00ed: ; e00ed (38:40ed)
; Graphics for an unused Game Corner
; game were meant to be here.
Ret_e00ed: ; e00ed (38:40ed)
ret
_CardFlip: ; e00ee (38:40ee)
ld hl, Options
set 4, [hl]

4
engine/dummy_game.asm
View File

@ -77,7 +77,7 @@ _DummyGame: ; e1e5b (38:5e5b)
ret
.ResetBoard:
call ret_e00ed
call Ret_e00ed
jr nc, .proceed
ld hl, wJumptableIndex
set 7, [hl]
@ -232,7 +232,7 @@ endr
ld hl, wJumptableIndex
inc [hl]
.AskPlayAgain:
call ret_e00ed
call Ret_e00ed
jr nc, .restart
ld hl, wJumptableIndex
set 7, [hl]

2
engine/sprite_anims.asm
View File

@ -404,7 +404,7 @@ DoAnimFrame: ; 8d24b
ret
.ForUnusedCursor ; 8d46e (23:546e)
callfar ret_e00ed
callfar Ret_e00ed
ret
.PokegearArrow ; 8d475 (23:5475)

32
main.asm
View File

@ -209,14 +209,6 @@ SECTION "bank13", ROMX
INCLUDE "engine/map_palettes.asm"
INCLUDE "tilesets/palette_maps.asm"
; unused
; 0x4ce05
rept 26
db $06
endr
; 0x4ce1f
INCLUDE "data/collision_permissions.asm"
INCLUDE "engine/routines/emptyallsrambanks.asm"
INCLUDE "engine/routines/savemenu_copytilemapatonce.asm"
@ -272,20 +264,7 @@ INCLUDE "gfx/load_pics.asm"
INCLUDE "engine/move_mon_wo_mail.asm"
INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/names.asm"
Unreferenced_53d84:
db $1a, $15
db $33, $16
db $4b, $17
db $62, $18
db $79, $19
db $90, $1a
db $a8, $1b
db $c4, $1c
db $e0, $1d
db $f6, $1e
db $ff, $1f
db $ff, $20
INCLUDE "data/unknown_table.asm"
UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels.
@ -450,15 +429,6 @@ INCLUDE "gfx/pokemon/unown_frames.asm"
SECTION "bank38", ROMX
INCLUDE "engine/events/print_unown_2.asm"
Unknown_e00ed:
; Graphics for an unused Game Corner
; game were meant to be here.
ret_e00ed: ; e00ed (38:40ed)
; How many coins?
ret
INCLUDE "engine/card_flip.asm"
INCLUDE "engine/unown_puzzle.asm"
INCLUDE "engine/dummy_game.asm"

7
tilesets/palette_maps.asm
View File

@ -128,3 +128,10 @@ INCLUDE "tilesets/battle_tower_palette_map.asm"
TilesetBattleTowerOutsidePalMap: ; 0x4cd95
INCLUDE "tilesets/battle_tower_outside_palette_map.asm"
; 0x4ce05
; unused
; 0x4ce05
rept 26
db $06
endr
; 0x4ce1f