pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #449 from xCrystal/master

Browse Source 
Misc labeling and cleaning up
This commit is contained in:
yenatch
2017-12-30 21:12:53 -05:00
committed by GitHub
parent 9f017cbab8 2a7ba6685a
commit 93916b5536
55 changed files with 319 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
audio/engine.asm
View File

@ -829,7 +829,7 @@ LoadNote: ; e83d1
ld hl, Channel1PitchWheelAmountFraction - Channel1 ld hl, Channel1PitchWheelAmountFraction - Channel1
add hl, bc add hl, bc
ld [hl], a ; remainder ld [hl], a ; remainder
ld hl, Channel1Field0x25 - Channel1 ld hl, Channel1Field25 - Channel1
add hl, bc add hl, bc
xor a xor a
ld [hl], a ld [hl], a
@ -981,12 +981,12 @@ ApplyPitchWheel: ; e84f9
add hl, de add hl, de
ld d, h ld d, h
ld e, l ld e, l
; [Channel*Field0x25] += [Channel*PitchWheelAmountFraction] ; [Channel*Field25] += [Channel*PitchWheelAmountFraction]
; if rollover: Frequency += 1 ; if rollover: Frequency += 1
ld hl, Channel1PitchWheelAmountFraction - Channel1 ld hl, Channel1PitchWheelAmountFraction - Channel1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld hl, Channel1Field0x25 - Channel1 ld hl, Channel1Field25 - Channel1
add hl, bc add hl, bc
add [hl] add [hl]
ld [hl], a ld [hl], a
@ -1023,7 +1023,7 @@ ApplyPitchWheel: ; e84f9
ld a, d ld a, d
sbc 0 sbc 0
ld d, a ld d, a
; [Channel*Field0x25] *= 2 ; [Channel*Field25] *= 2
; if rollover: Frequency -= 1 ; if rollover: Frequency -= 1
ld hl, Channel1PitchWheelAmountFraction - Channel1 ld hl, Channel1PitchWheelAmountFraction - Channel1
add hl, bc add hl, bc
@ -1726,7 +1726,7 @@ MusicE2: ; e8873
; seems to have been dummied out ; seems to have been dummied out
; params: 1 ; params: 1
call GetMusicByte call GetMusicByte
ld hl, Channel1Field0x2c - Channel1 ld hl, Channel1Field2c - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, Channel1Flags2 - Channel1 ld hl, Channel1Flags2 - Channel1
@ -1849,7 +1849,7 @@ MusicE7: ; e88f7
add hl, bc add hl, bc
set SOUND_UNKN_0E, [hl] set SOUND_UNKN_0E, [hl]
call GetMusicByte call GetMusicByte
ld hl, Channel1Field0x29 - Channel1 ld hl, Channel1Field29 - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ret ret
@ -1885,7 +1885,7 @@ MusicE8: ; e891e
add hl, bc add hl, bc
set SOUND_UNKN_0D, [hl] set SOUND_UNKN_0D, [hl]
call GetMusicByte call GetMusicByte
ld hl, Channel1Field0x2a - Channel1 ld hl, Channel1Field2a - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ret ret
@ -2307,7 +2307,7 @@ SetNoteDuration: ; e8a8d
inc hl inc hl
ld d, [hl] ld d, [hl]
; add ???? to the next result ; add ???? to the next result
ld hl, Channel1Field0x16 - Channel1 ld hl, Channel1Field16 - Channel1
add hl, bc add hl, bc
ld l, [hl] ld l, [hl]
; multiply Tempo by last result (NoteLength * LOW(delay)) ; multiply Tempo by last result (NoteLength * LOW(delay))
@ -2316,7 +2316,7 @@ SetNoteDuration: ; e8a8d
ld e, l ld e, l
ld d, h ld d, h
; store result in ???? ; store result in ????
ld hl, Channel1Field0x16 - Channel1 ld hl, Channel1Field16 - Channel1
add hl, bc add hl, bc
ld [hl], e ld [hl], e
; store result in NoteDuration ; store result in NoteDuration
@ -2392,7 +2392,7 @@ Tempo: ; e8b03
ld [hl], d ld [hl], d
; clear ???? ; clear ????
xor a xor a
ld hl, Channel1Field0x16 - Channel1 ld hl, Channel1Field16 - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ret ret
@ -2749,7 +2749,7 @@ PlayStereoSFX:: ; e8ca6
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, Channel1Field0x30 - Channel1 ; $c131 - Channel1 ld hl, Channel1Field30 - Channel1 ; $c131 - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
@ -2760,11 +2760,11 @@ PlayStereoSFX:: ; e8ca6
; ch3-4 ; ch3-4
ld a, [wSFXDuration] ld a, [wSFXDuration]
ld hl, Channel1Field0x2e - Channel1 ; $c12f - Channel1 ld hl, Channel1Field2e - Channel1 ; $c12f - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, Channel1Field0x2f - Channel1 ; $c130 - Channel1 ld hl, Channel1Field2f - Channel1 ; $c130 - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a

4
constants/battle_anim_constants.asm
View File

@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMOAMSET_D7 const BATTLEANIMOAMSET_D7
; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) ; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
const_value SET 1 const_value set 1
const ANIM_BG_FLASH_INVERTED const ANIM_BG_FLASH_INVERTED
const ANIM_BG_FLASH_WHITE const ANIM_BG_FLASH_WHITE
const ANIM_BG_WHITE_HUES const ANIM_BG_WHITE_HUES
@ -764,7 +764,7 @@ const_value SET 1
const ANIM_BG_35 const ANIM_BG_35
; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) ; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
const_value SET 1 const_value set 1
const ANIM_GFX_HIT const ANIM_GFX_HIT
const ANIM_GFX_CUT const ANIM_GFX_CUT
const ANIM_GFX_FIRE const ANIM_GFX_FIRE

6
constants/battle_constants.asm
View File

@ -45,7 +45,7 @@ MOVE_LENGTH EQU const_value
; indexes for: ; indexes for:
; - PlayerStats and EnemyStats (see wram.asm) ; - PlayerStats and EnemyStats (see wram.asm)
; - party_struct and battle_struct members (see macros/wram.asm) ; - party_struct and battle_struct members (see macros/wram.asm)
const_value SET 1 const_value set 1
const STAT_HP const STAT_HP
const STAT_ATK const STAT_ATK
const STAT_DEF const STAT_DEF
@ -65,7 +65,7 @@ ATKDEFDV_SHINY EQU $EA
SPDSPCDV_SHINY EQU $AA SPDSPCDV_SHINY EQU $AA
; battle classes (wBattleMode values) ; battle classes (wBattleMode values)
const_value SET 1 const_value set 1
const WILD_BATTLE const WILD_BATTLE
const TRAINER_BATTLE const TRAINER_BATTLE
@ -140,7 +140,7 @@ const_value SET 1
; status condition bit flags ; status condition bit flags
SLP EQU %111 ; 0-7 turns SLP EQU %111 ; 0-7 turns
const_value SET 3 const_value set 3
const PSN const PSN
const BRN const BRN
const FRZ const FRZ

2
constants/credits_constants.asm
View File

@ -105,7 +105,7 @@
const PAAD_TESTING const PAAD_TESTING
; CreditsScript indexes (see data/credits_script.asm) ; CreditsScript indexes (see data/credits_script.asm)
const_value SET -7 const_value set -7
const CREDITS_THEEND const CREDITS_THEEND
const CREDITS_WAIT2 const CREDITS_WAIT2
const CREDITS_MUSIC const CREDITS_MUSIC

9
constants/hardware_constants.asm
View File

@ -50,6 +50,7 @@ OAM_X_FLIP EQU 5
OAM_Y_FLIP EQU 6 OAM_Y_FLIP EQU 6
OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
; BP Map attribute flags
PALETTE_MASK EQU %111 PALETTE_MASK EQU %111
VRAM_BANK_1 EQU 1 << OAM_TILE_BANK ; $08 VRAM_BANK_1 EQU 1 << OAM_TILE_BANK ; $08
OBP_NUM EQU 1 << OAM_OBP_NUM ; $10 OBP_NUM EQU 1 << OAM_OBP_NUM ; $10
@ -57,6 +58,10 @@ X_FLIP EQU 1 << OAM_X_FLIP ; $20
Y_FLIP EQU 1 << OAM_Y_FLIP ; $40 Y_FLIP EQU 1 << OAM_Y_FLIP ; $40
BEHIND_BG EQU 1 << OAM_PRIORITY ; $80 BEHIND_BG EQU 1 << OAM_PRIORITY ; $80
; Other useful constants
LCDC_DEFAULT EQU %11100011
LY_VBLANK EQU 144
; Hardware registers ; Hardware registers
rJOYP EQU $ff00 ; Joypad (R/W) rJOYP EQU $ff00 ; Joypad (R/W)
rSB EQU $ff01 ; Serial transfer data (R/W) rSB EQU $ff01 ; Serial transfer data (R/W)
@ -114,6 +119,10 @@ rWave_d EQU $ff3d
rWave_e EQU $ff3e rWave_e EQU $ff3e
rWave_f EQU $ff3f rWave_f EQU $ff3f
rLCDC EQU $ff40 ; LCD Control (R/W) rLCDC EQU $ff40 ; LCD Control (R/W)
rLCDC_SPRITES_ENABLE EQU 1 ; 0=Off, 1=On
rLCDC_SPRITE_SIZE EQU 2 ; 0=8x8, 1=8x16
rLCDC_WINDOW_TILEMAP EQU 6 ; 0=9800-9BFF, 1=9C00-9FFF
rLCDC_ENABLE EQU 7 ; 0=Off, 1=On
rSTAT EQU $ff41 ; LCDC Status (R/W) rSTAT EQU $ff41 ; LCDC Status (R/W)
rSCY EQU $ff42 ; Scroll Y (R/W) rSCY EQU $ff42 ; Scroll Y (R/W)
rSCX EQU $ff43 ; Scroll X (R/W) rSCX EQU $ff43 ; Scroll X (R/W)

12
constants/item_data_constants.asm
View File

@ -52,7 +52,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
const HELD_7 const HELD_7
const HELD_CLEANSE_TAG const HELD_CLEANSE_TAG
const_value SET 10 const_value set 10
const HELD_HEAL_POISON const HELD_HEAL_POISON
const HELD_HEAL_FREEZE const HELD_HEAL_FREEZE
const HELD_HEAL_BURN const HELD_HEAL_BURN
@ -61,7 +61,7 @@ const_value SET 10
const HELD_HEAL_STATUS const HELD_HEAL_STATUS
const HELD_HEAL_CONFUSION const HELD_HEAL_CONFUSION
const_value SET 20 const_value set 20
const HELD_PREVENT_POISON const HELD_PREVENT_POISON
const HELD_PREVENT_BURN const HELD_PREVENT_BURN
const HELD_PREVENT_FREEZE const HELD_PREVENT_FREEZE
@ -69,7 +69,7 @@ const_value SET 20
const HELD_PREVENT_PARALYZE const HELD_PREVENT_PARALYZE
const HELD_PREVENT_CONFUSE const HELD_PREVENT_CONFUSE
const_value SET 30 const_value set 30
const HELD_30 const HELD_30
const HELD_ATTACK_UP const HELD_ATTACK_UP
const HELD_DEFENSE_UP const HELD_DEFENSE_UP
@ -80,12 +80,12 @@ const_value SET 30
const HELD_EVASION_UP const HELD_EVASION_UP
const HELD_38 const HELD_38
const_value SET 40 const_value set 40
const HELD_40 const HELD_40
const HELD_41 const HELD_41
const HELD_METAL_POWDER const HELD_METAL_POWDER
const_value SET 50 const_value set 50
const HELD_NORMAL_BOOST const HELD_NORMAL_BOOST
const HELD_FIGHTING_BOOST const HELD_FIGHTING_BOOST
const HELD_FLYING_BOOST const HELD_FLYING_BOOST
@ -104,7 +104,7 @@ const_value SET 50
const HELD_DARK_BOOST const HELD_DARK_BOOST
const HELD_STEEL_BOOST const HELD_STEEL_BOOST
const_value SET 70 const_value set 70
const HELD_CATCH_CHANCE const HELD_CATCH_CHANCE
const HELD_71 const HELD_71
const HELD_ESCAPE const HELD_ESCAPE

12
constants/map_data_constants.asm
View File

@ -17,7 +17,7 @@ MAP_NONE EQU 0
NUM_MAPHEADER_ATTRIBUTES EQU const_value NUM_MAPHEADER_ATTRIBUTES EQU const_value
; map environments (wEnvironment) ; map environments (wEnvironment)
const_value SET 1 const_value set 1
const TOWN const TOWN
const ROUTE const ROUTE
const INDOOR const INDOOR
@ -97,10 +97,10 @@ const_value SET 1
const OBJECT_SPRITE_X_OFFSET ; 19 const OBJECT_SPRITE_X_OFFSET ; 19
const OBJECT_SPRITE_Y_OFFSET ; 1a const OBJECT_SPRITE_Y_OFFSET ; 1a
const OBJECT_MOVEMENT_BYTE_INDEX ; 1b const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
const OBJECT_28 ; 1c const OBJECT_1C ; 1c
const OBJECT_29 ; 1d const OBJECT_1D ; 1d
const OBJECT_30 ; 1e const OBJECT_1E ; 1e
const OBJECT_31 ; 1f const OBJECT_1F ; 1f
const OBJECT_RANGE ; 20 const OBJECT_RANGE ; 20
; 33-39 are not used ; 33-39 are not used
@ -217,7 +217,7 @@ NUM_SPAWNS EQU const_value
EMOTE_MEM EQU -1 EMOTE_MEM EQU -1
; FruitTreeItems indexes (see data/items/fruit_trees.asm) ; FruitTreeItems indexes (see data/items/fruit_trees.asm)
const_value SET 1 const_value set 1
const FRUITTREE_ROUTE_29 ; 01 const FRUITTREE_ROUTE_29 ; 01
const FRUITTREE_ROUTE_30_1 ; 02 const FRUITTREE_ROUTE_30_1 ; 02
const FRUITTREE_ROUTE_38 ; 03 const FRUITTREE_ROUTE_38 ; 03

4
constants/map_setup_constants.asm
View File

@ -1,6 +1,6 @@
; hMapEntryMethod values ; hMapEntryMethod values
; MapSetupScripts indexes (see data/maps/setup_scripts.asm) ; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
const_value SET $f1 const_value set $f1
const MAPSETUP_WARP ; f1 const MAPSETUP_WARP ; f1
const MAPSETUP_CONTINUE ; f2 const MAPSETUP_CONTINUE ; f2
const MAPSETUP_RELOADMAP ; f3 const MAPSETUP_RELOADMAP ; f3
@ -67,7 +67,7 @@ const_value SET $f1
map_end EQU -1 map_end EQU -1
; callback types ; callback types
const_value SET 1 const_value set 1
const MAPCALLBACK_TILES const MAPCALLBACK_TILES
const MAPCALLBACK_OBJECTS const MAPCALLBACK_OBJECTS
const MAPCALLBACK_CMDQUEUE const MAPCALLBACK_CMDQUEUE

10
constants/pokemon_data_constants.asm
View File

@ -45,7 +45,7 @@ GENDERLESS EQU 255
const SLOW const SLOW
; BaseEggGroups values ; BaseEggGroups values
const_value SET 1 const_value set 1
const MONSTER ; 1 const MONSTER ; 1
const AMPHIBIAN ; 2 const AMPHIBIAN ; 2
const INSECT ; 3 const INSECT ; 3
@ -103,7 +103,7 @@ PARTY_LENGTH EQU 6
; evolution types (used in data/pokemon/evos_attacks.asm) ; evolution types (used in data/pokemon/evos_attacks.asm)
const_value SET 1 const_value set 1
const EVOLVE_LEVEL const EVOLVE_LEVEL
const EVOLVE_ITEM const EVOLVE_ITEM
const EVOLVE_TRADE const EVOLVE_TRADE
@ -111,13 +111,13 @@ const_value SET 1
const EVOLVE_STAT const EVOLVE_STAT
; EVOLVE_HAPPINESS triggers ; EVOLVE_HAPPINESS triggers
const_value SET 1 const_value set 1
const TR_ANYTIME const TR_ANYTIME
const TR_MORNDAY const TR_MORNDAY
const TR_NITE const TR_NITE
; EVOLVE_STAT triggers ; EVOLVE_STAT triggers
const_value SET 1 const_value set 1
const ATK_GT_DEF const ATK_GT_DEF
const ATK_LT_DEF const ATK_LT_DEF
const ATK_EQ_DEF const ATK_EQ_DEF
@ -162,7 +162,7 @@ FISHSWARM_REMORAID EQU 2
const ANIM_MON_EGG2 const ANIM_MON_EGG2
; MonMenuOptions indexes (see engine/mon_menu.asm) ; MonMenuOptions indexes (see engine/mon_menu.asm)
const_value SET 1 const_value set 1
; moves ; moves
const MONMENU_CUT ; 1 const MONMENU_CUT ; 1
const MONMENU_FLY ; 2 const MONMENU_FLY ; 2

2
constants/printer_constants.asm
View File

@ -1,5 +1,5 @@
; wPrinterStatus ; wPrinterStatus
const_value SET 1 const_value set 1
const PRINTER_STATUS_CHECKING const PRINTER_STATUS_CHECKING
const PRINTER_STATUS_TRANSMITTING const PRINTER_STATUS_TRANSMITTING
const PRINTER_STATUS_PRINTING const PRINTER_STATUS_PRINTING

2
constants/script_constants.asm
View File

@ -39,7 +39,7 @@ RETVAR_ADDR_DE EQU (1 << 6)
RETVAR_EXECUTE EQU (2 << 6) RETVAR_EXECUTE EQU (2 << 6)
; PlayerEventScriptPointers indexes (see engine/events.asm) ; PlayerEventScriptPointers indexes (see engine/events.asm)
const_value SET -1 const_value set -1
const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_MAPSCRIPT
const PLAYEREVENT_NONE const PLAYEREVENT_NONE
const PLAYEREVENT_SEENBYTRAINER const PLAYEREVENT_SEENBYTRAINER

6
constants/sprite_constants.asm
View File

@ -106,7 +106,7 @@
const SPRITE_STANDING_YOUNGSTER ; 66 const SPRITE_STANDING_YOUNGSTER ; 66
; SpriteMons indexes (see data/sprite_mons.asm) ; SpriteMons indexes (see data/sprite_mons.asm)
const_value SET $80 const_value set $80
SPRITE_POKEMON EQU const_value SPRITE_POKEMON EQU const_value
const SPRITE_UNOWN ; 80 const SPRITE_UNOWN ; 80
const SPRITE_GEODUDE ; 81 const SPRITE_GEODUDE ; 81
@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value
const SPRITE_HO_OH ; a2 const SPRITE_HO_OH ; a2
; special GetMonSprite values (see engine/overworld.asm) ; special GetMonSprite values (see engine/overworld.asm)
const_value SET $e0 const_value set $e0
const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_1 ; e0
const SPRITE_DAY_CARE_MON_2 ; e1 const SPRITE_DAY_CARE_MON_2 ; e1
; VariableSprites indexes (see wram.asm) ; VariableSprites indexes (see wram.asm)
const_value SET $f0 const_value set $f0
SPRITE_VARS EQU const_value SPRITE_VARS EQU const_value
const SPRITE_CONSOLE ; f0 const SPRITE_CONSOLE ; f0
const SPRITE_DOLL_1 ; f1 const SPRITE_DOLL_1 ; f1

2
constants/sprite_data_constants.asm
View File

@ -9,7 +9,7 @@
NUM_SPRITEDATA_FIELDS EQU const_value NUM_SPRITEDATA_FIELDS EQU const_value
; sprite types ; sprite types
const_value SET 1 const_value set 1
const WALKING_SPRITE ; 1 const WALKING_SPRITE ; 1
const STANDING_SPRITE ; 2 const STANDING_SPRITE ; 2
const STILL_SPRITE ; 3 const STILL_SPRITE ; 3

2
constants/tileset_constants.asm
View File

@ -1,5 +1,5 @@
; Tilesets indexes (see tilesets/tilesets.asm) ; Tilesets indexes (see tilesets/tilesets.asm)
const_value SET 1 const_value set 1
const TILESET_JOHTO_1 ; 01 const TILESET_JOHTO_1 ; 01
const TILESET_JOHTO_2 ; 02 const TILESET_JOHTO_2 ; 02
const TILESET_KANTO ; 03 const TILESET_KANTO ; 03

4
constants/wram_constants.asm
View File

@ -7,7 +7,7 @@
const WILDMON ; 4 const WILDMON ; 4
; Options: (bits) ; cfcc ; Options: (bits) ; cfcc
const_value SET 4 const_value set 4
const NO_TEXT_SCROLL ; 4 const NO_TEXT_SCROLL ; 4
const STEREO ; 5 const STEREO ; 5
const BATTLE_SHIFT ; 6 const BATTLE_SHIFT ; 6
@ -41,7 +41,7 @@ GBPRINTER_DARKER EQU $60
GBPRINTER_DARKEST EQU $7f GBPRINTER_DARKEST EQU $7f
; WalkingDirection: ; d043 ; WalkingDirection: ; d043
const_value SET -1 const_value set -1
const STANDING ; -1 const STANDING ; -1
const DOWN ; 0 const DOWN ; 0
const UP ; 1 const UP ; 1

4
engine/battle/core.asm
View File

@ -8395,11 +8395,11 @@ BattleIntro: ; 3f4dd
ld b, SCGB_BATTLE_GRAYSCALE ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout call GetSGBLayout
ld hl, rLCDC ld hl, rLCDC
res 6, [hl] res rLCDC_WINDOW_TILEMAP, [hl] ; select 9800-9BFF
call InitBattleDisplay call InitBattleDisplay
call BattleStartMessage call BattleStartMessage
ld hl, rLCDC ld hl, rLCDC
set 6, [hl] set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call EmptyBattleTextBox call EmptyBattleTextBox

3
engine/battle_anims/bg_effects.asm
View File

@ -2066,6 +2066,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
dw .cgb_zero dw .cgb_zero
dw .cgb_one dw .cgb_one
dw .cgb_two dw .cgb_two
.cgb_zero .cgb_zero
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
@ -2313,7 +2314,7 @@ BattleBGEffect_2e: ; c8ce1 (32:4ce1)
ld [hSCY], a ld [hSCY], a
xor $ff xor $ff
inc a inc a
ld [AnimObject01_YOffset], a ld [AnimObject01YOffset], a
ret ret
BattleBGEffect_1f: ; c8cf9 (32:4cf9) BattleBGEffect_1f: ; c8cf9 (32:4cf9)

7
engine/billspc.asm
View File

@ -42,14 +42,12 @@ _DepositPKMN: ; e2391 (38:6391)
jp hl jp hl
.Jumptable: ; e23df (38:63df) .Jumptable: ; e23df (38:63df)
dw .Init dw .Init
dw .HandleJoypad dw .HandleJoypad
dw .WhatsUp dw .WhatsUp
dw .Submenu dw .Submenu
dw BillsPC_EndJumptableLoop dw BillsPC_EndJumptableLoop
.Init: ; e23e9 (38:63e9) .Init: ; e23e9 (38:63e9)
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
@ -150,7 +148,6 @@ _DepositPKMN: ; e2391 (38:6391)
jp hl jp hl
BillsPCDepositJumptable: ; e24a1 (38:64a1) BillsPCDepositJumptable: ; e24a1 (38:64a1)
dw BillsPCDepositFuncDeposit ; Deposit Pokemon dw BillsPCDepositFuncDeposit ; Deposit Pokemon
dw BillsPCDepositFuncStats ; Pokemon Stats dw BillsPCDepositFuncStats ; Pokemon Stats
dw BillsPCDepositFuncRelease ; Release Pokemon dw BillsPCDepositFuncRelease ; Release Pokemon
@ -309,14 +306,12 @@ _WithdrawPKMN: ; e2583 (38:6583)
jp hl jp hl
.Jumptable: ; e25d2 (38:65d2) .Jumptable: ; e25d2 (38:65d2)
dw .Init dw .Init
dw .Joypad dw .Joypad
dw .PrepSubmenu dw .PrepSubmenu
dw BillsPC_Withdraw dw BillsPC_Withdraw
dw BillsPC_EndJumptableLoop dw BillsPC_EndJumptableLoop
.Init: ; e25dc (38:65dc) .Init: ; e25dc (38:65dc)
ld a, NUM_BOXES + 1 ld a, NUM_BOXES + 1
ld [wBillsPC_LoadedBox], a ld [wBillsPC_LoadedBox], a
@ -560,7 +555,6 @@ _MovePKMNWithoutMail: ; e2759
; e27ac ; e27ac
.Jumptable: ; e27ac .Jumptable: ; e27ac
dw .Init dw .Init
dw .Joypad dw .Joypad
dw .PrepSubmenu dw .PrepSubmenu
@ -2029,7 +2023,6 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
; e3245 ; e3245
.Jumptable: ; e3245 .Jumptable: ; e3245
dw .BoxToBox dw .BoxToBox
dw .PartyToBox dw .PartyToBox
dw .BoxToParty dw .BoxToParty

3
engine/card_flip.asm
View File

@ -80,7 +80,6 @@ _CardFlip: ; e00ee (38:40ee)
; e01a0 (38:41a0) ; e01a0 (38:41a0)
.Jumptable: ; e01a0 .Jumptable: ; e01a0
dw .AskPlayWithThree dw .AskPlayWithThree
dw .DeductCoins dw .DeductCoins
dw .ChooseACard dw .ChooseACard
@ -656,7 +655,6 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
; e0553 ; e0553
.Jumptable: ; e0553 .Jumptable: ; e0553
dw .Level1 dw .Level1
dw .Level2 dw .Level2
dw .Level3 dw .Level3
@ -833,7 +831,6 @@ CardFlip_CheckWinCondition: ; e0637
; e0643 ; e0643
.Jumptable: ; e0643 .Jumptable: ; e0643
dw .Impossible dw .Impossible
dw .Impossible dw .Impossible
dw .PikaJiggly dw .PikaJiggly

8
engine/color.asm
View File

@ -617,7 +617,7 @@ ApplyPals:
ApplyAttrMap: ApplyAttrMap:
ld a, [rLCDC] ld a, [rLCDC]
bit 7, a bit rLCDC_ENABLE, a
jr z, .UpdateVBank1 jr z, .UpdateVBank1
ld a, [hBGMapMode] ld a, [hBGMapMode]
push af push af
@ -1073,7 +1073,7 @@ SGBBorder_PushBGPals:
ld bc, $100 tiles ld bc, $100 tiles
call CopyData call CopyData
call DrawDefaultTiles call DrawDefaultTiles
ld a, $e3 ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, PalPacket_9d06 ld hl, PalPacket_9d06
call PushSGBPals call PushSGBPals
@ -1107,7 +1107,7 @@ SGBBorder_MorePalPushing:
ld bc, 16 palettes ld bc, 16 palettes
call CopyData call CopyData
call DrawDefaultTiles call DrawDefaultTiles
ld a, $e3 ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, PalPacket_9d46 ld hl, PalPacket_9d46
call PushSGBPals call PushSGBPals
@ -1131,7 +1131,7 @@ SGBBorder_YetMorePalPushing:
dec b dec b
jr nz, .loop jr nz, .loop
call DrawDefaultTiles call DrawDefaultTiles
ld a, $e3 ld a, LCDC_DEFAULT
ld [rLCDC], a ld [rLCDC], a
ld hl, PalPacket_9d36 ld hl, PalPacket_9d36
call PushSGBPals call PushSGBPals

Some files were not shown because too many files have changed in this diff Show More