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

jumptable macro repurposed

Browse Source
This commit is contained in:
PikalaxALT
2015-12-26 21:59:03 -05:00
parent 2bd45ca574
commit f030315b1f
66 changed files with 1241 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/anim_objects.asm
View File

@@ -3,7 +3,7 @@
INCLUDE "battle/objects/engine.asm"
INCLUDE "battle/objects/data.asm"
INCLUDE "battle/objects/functions.asm"
INCLUDE "battle/objects/library.asm"
INCLUDE "battle/objects/helpers.asm"
INCLUDE "battle/objects/framesets.asm"
INCLUDE "battle/objects/oam.asm"
INCLUDE "battle/objects/gfx_headers.asm"

434
battle/bg_effects.asm
View File

File diff suppressed because it is too large Load Diff

57
battle/core.asm
View File

@@ -1849,9 +1849,8 @@ HandleWeather: ; 3cb9e
dec a
ld c, a
ld b, 0
rept 2
add hl, bc
endr
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2575,9 +2574,8 @@ Function3d02b: ; 3d02b
dec a
ld c, a
ld b, 0
rept 2
add hl, bc
endr
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2615,9 +2613,8 @@ endr
rl [hl]
ret nc
ld a, $ff
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
ret
; 3d0ab
@@ -4747,18 +4744,16 @@ HandleStatBoostingHeldItems: ; 3de97
ld a, [hli]
cp $ff
jr z, .finish
rept 2
inc hl
endr
inc hl
cp b
jr nz, .loop
pop bc
ld a, [bc]
ld [wd265], a
push bc
rept 2
dec hl
endr
dec hl
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5822,9 +5817,8 @@ MoveSelectionScreen: ; 3e4bc
ld a, [wMenuCursorY]
ld b, a
ld a, [wNumMoves]
rept 2
inc a
endr
inc a
cp b
jp nz, .menu_loop
ld a, $1
@@ -6008,9 +6002,8 @@ MoveInfoBox: ; 3e6c8
lb bc, 1, 2
call PrintNum
pop hl
rept 2
inc hl
endr
inc hl
ld [hl], "/"
inc hl
ld de, wNamedObjectIndexBuffer
@@ -6818,9 +6811,8 @@ CheckUnownLetter: ; 3eb75
.next
; Make sure we haven't gone past the end of the table
rept 2
inc e
endr
inc e
ld a, e
cp a, .Set1 - .LetterSets
jr c, .loop
@@ -7176,9 +7168,8 @@ BadgeStatBoosts: ; 3ed45
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
and (1 << PLAINBADGE)
rept 2
add a
endr
add a
ld b, a
ld a, d
and (1 << MINERALBADGE)
@@ -7197,9 +7188,8 @@ endr
ld a, b
srl b
call c, BoostStat
rept 2
inc hl
endr
inc hl
; Check every other badge.
srl b
dec c
@@ -7328,9 +7318,8 @@ _BattleRandom:: ; 3edd8
; a * 5 + 1
ld c, a
rept 2
add a
endr
add a
add c
inc a
@@ -7467,9 +7456,8 @@ GiveExperiencePoints: ; 3ee3b
ld [de], a
.skip
rept 2
inc de
endr
inc de
dec c
jr nz, .loop1
xor a
@@ -7544,9 +7532,8 @@ endr
inc [hl]
jr nz, .skip2
ld a, $ff
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
.skip2
@@ -7881,9 +7868,8 @@ Function3f136: ; 3f136
inc [hl]
jr nz, .asm_3f186
ld a, $ff
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
.asm_3f186
@@ -8800,9 +8786,8 @@ CheckPayDay: ; 3f71d
rl [hl]
jr nc, .okay
ld a, $ff
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
.okay
@@ -9202,13 +9187,11 @@ Function3fa42: ; 3fa42
ld d, 5
.loop
push hl
rept 2
inc hl
endr
inc hl
ld a, [hl]
rept 2
dec hl
endr
dec hl
and a
jr z, .copy
push de
@@ -9308,18 +9291,16 @@ Function3fac8: ; 3fac8
ld c, $1
.loop2
ld a, b
rept 2
add b
endr
add b
ld e, a
ld d, $0
ld hl, wd002
add hl, de
push hl
ld a, c
rept 2
add c
endr
add c
ld e, a
ld d, $0
ld hl, wd002

63
battle/effect_commands.asm
View File

@@ -51,9 +51,8 @@ DoMove: ; 3402c
ld c, a
ld b, 0
ld hl, MoveEffectsPointers
rept 2
add hl, bc
endr
add hl, bc
ld a, BANK(MoveEffectsPointers)
call GetFarHalfword
@@ -102,9 +101,8 @@ endr
ld c, a
ld b, 0
ld hl, BattleCommandPointers
rept 2
add hl, bc
endr
add hl, bc
pop bc
ld a, BANK(BattleCommandPointers)
@@ -1076,9 +1074,8 @@ BattleCommand_DoTurn: ; 34555
jp nz, EndMoveEffect
; SubStatus5
rept 2
inc de
endr
inc de
ld a, [de]
bit SUBSTATUS_TRANSFORMED, a
@@ -1276,9 +1273,8 @@ BattleCommand_Critical: ; 34631
jr nc, .ScopeLens
; +2 critical level
rept 2
inc c
endr
inc c
.ScopeLens
push bc
@@ -1522,9 +1518,8 @@ BattleCommand_Stab: ; 346d2
pop hl
.SkipType
rept 2
inc hl
endr
inc hl
jr .TypesLoop
.end
@@ -2741,9 +2736,8 @@ EndMoveEffect: ; 352a3
ld a, [BattleScriptBufferLoc + 1]
ld h, a
ld a, $ff
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
ret
@@ -3457,9 +3451,8 @@ BattleCommand_DamageCalc: ; 35612
xor a
ld hl, hDividend
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
; Level * 2
@@ -3480,9 +3473,8 @@ endr
pop bc
; + 2
rept 2
inc [hl]
endr
inc [hl]
; * bp
inc hl
@@ -4075,9 +4067,8 @@ BattleCommand_PainSplit: ; 35926
ld [Buffer3], a
ld a, [hl]
ld [Buffer4], a
rept 2
dec de
endr
dec de
ld a, [de]
dec de
add b
@@ -4587,9 +4578,8 @@ BattleCommand_Spite: ; 35c0f
call GetMoveName
call BattleRandom
and 3
rept 2
inc a
endr
inc a
ld b, a
ld a, [hl]
and $3f
@@ -6380,9 +6370,8 @@ CalcStats: ; 3661d
dec c
ld b, 0
ld hl, StatLevelMultipliers
rept 2
add hl, bc
endr
add hl, bc
xor a
ld [hMultiplicand + 0], a
@@ -6538,9 +6527,8 @@ BattleCommand_UnleashEnergy: ; 366e5
ld [wEnemyMoveStruct + MOVE_EFFECT], a
call BattleRandom
and 1
rept 2
inc a
endr
inc a
ld [bc], a
ld a, 1
ld [wKickCounter], a
@@ -6579,9 +6567,8 @@ BattleCommand_CheckRampage: ; 3671a
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and %00000001
rept 2
inc a
endr
inc a
inc de ; ConfuseCount
ld [de], a
.continue_rampage
@@ -7464,9 +7451,8 @@ endr
ld a, [hli]
cp b
jr z, .found_trap_text
rept 2
inc hl
endr
inc hl
jr .find_trap_text
.found_trap_text
@@ -7552,9 +7538,8 @@ BattleCommand_Recoil: ; 36cb2
ld [Buffer2], a
ld a, [hl]
ld [Buffer1], a
rept 2
dec hl
endr
dec hl
ld a, [hl]
ld [Buffer3], a
sub c
@@ -7651,9 +7636,8 @@ BattleCommand_FinishConfusingTarget: ; 36d70
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and 3
rept 2
inc a
endr
inc a
ld [bc], a
ld a, BATTLE_VARS_MOVE_EFFECT
@@ -7844,9 +7828,8 @@ BattleCommand_Substitute: ; 36e7c
rr b
srl a
rr b
rept 2
dec hl
endr
dec hl
ld a, b
ld [de], a
ld a, [hld]
@@ -8457,9 +8440,8 @@ BattleCommand_Transform: ; 371cd
ld a, [hli]
ld [de], a
inc hl
rept 2
inc de
endr
inc de
ld bc, NUM_MOVES
call CopyBytes
ld a, [hBattleTurn]
@@ -9125,9 +9107,8 @@ BattleCommand_GetMagnitude: ; 37991
ld a, [hli]
cp b
jr nc, .ok
rept 2
inc hl
endr
inc hl
jr .loop
.ok
@@ -9528,16 +9509,14 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
inc c
cp WEATHER_SUN
jr z, .Heal
rept 2
dec c
endr
dec c
.Heal
ld b, 0
ld hl, .Multipliers
rept 2
add hl, bc
endr
add hl, bc
ld a, [hli]
ld h, [hl]

4
battle/objects/data.asm
View File

@@ -558,10 +558,10 @@ endm
; ANIM_OBJ_COTTON
battleanimobj $01, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, $04, $1f
; ANIM_OBJ_B8
; ANIM_OBJ_PLAYERFEETFOLLOW
battleanimobj $00, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, $00, $28
; ANIM_OBJ_B9
; ANIM_OBJ_ENEMYFEETFOLLOW
battleanimobj $00, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, $01, $29
; ANIM_OBJ_BA

235
battle/objects/functions.asm
View File

File diff suppressed because it is too large Load Diff

0
battle/objects/library.asm → battle/objects/helpers.asm
View File

4
battle/sliding_intro.asm
View File

@@ -5,10 +5,10 @@ BattleIntroSlidingPics: ; 4e980
ld [rSVBK], a
call .subfunction1
ld a, rSCX - $ff00
ld [hLCDStatCustom], a
ld [hFFC6], a
call .subfunction2
xor a
ld [hLCDStatCustom], a
ld [hFFC6], a
pop af
ld [rSVBK], a
ret