diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c/main.asm | 9 | ||||
| -rw-r--r-- | engine/bank3d/bank3d_battle.asm | 4 | ||||
| -rw-r--r-- | engine/bank3f/main.asm | 16 | ||||
| -rwxr-xr-x | engine/palettes.asm | 4 |
4 files changed, 23 insertions, 10 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 489de063..c2cf770e 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -1,6 +1,7 @@ ;INCLUDE "engine/bank3c/overworld.asm" - -dr $f0000,$f0274 + dr $f0000,$f010c +_AdvancePlayerSprite:: ; f010c (3c:410c) + dr $f010c,$f0274 ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. @@ -116,6 +117,6 @@ Pointer_f0a76:: ; f0a76 (3c:4a76) db $27,$07,$7b,$4a,$ff db $01,$ec,$02,$ed,$03,$ee,$ff -dr $f0a82,$f25f8 + dr $f0a82,$f25f8 CheckForHiddenObject:: ; f25f8 (3c:65f8) -dr $f25f8,$f4000
\ No newline at end of file + dr $f25f8,$f4000
\ No newline at end of file diff --git a/engine/bank3d/bank3d_battle.asm b/engine/bank3d/bank3d_battle.asm index 2c71a565..9ce82f5e 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/bank3d/bank3d_battle.asm @@ -1,4 +1,4 @@ -InitBattle: ; f5ff2 (3d:f5ff2) +InitBattle: ; f5ff2 (3d:5ff2) ld a, [W_CUROPPONENT] and a jr z, asm_f6003 @@ -21,7 +21,7 @@ asm_f6003: ; f6003 (3d:6003) ret nz callab TryDoWildEncounter ret nz -asm_f601d: ; 3ef3d (f:6f3d) +asm_f601d: ; f601d (f:601d) ld a, [wMapPalOffset] push af ld hl, wd358 diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index 67ebd85b..b1bd6e55 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -290,9 +290,21 @@ Func_fc69a:: ; fc69a (3f:469a) ld [wd431],a ret -INCBIN "baserom.gbc",$fc6c5,$fcc08 - $fc6c5 + dr $fc6c5,$fc6d5 +Func_fc6d5:: ; fc6d5 (3f:46d5) + dr $fc6d5,$fcc08 Func_fcc08:: ; fcc08 (3f:4c08) -INCBIN "baserom.gbc",$fcc08,$fe66f - $fcc08 + dr $fcc08,$fcdb8 +Func_fcdb8:: ; fcdb8 (3f:4db8) + dr $fcdb8,$fce18 +Func_fce18:: ; fce18 (3f:4e18) + dr $fce18,$fcf0c +Func_fcf0c:: ; fcf0c (3f:4f0c) + dr $fcf0c,$fd004 +Func_fd004:: ; fd004 (3f:5004) + dr $fd004,$fd2a1 +Func_fd2a1:: ; fd2a1 (3f:52a1) + dr $fd2a1,$fe66f OfficerJennySprite: INCBIN "gfx/sprites/officer_jenny.2bpp" PikachuSprite: INCBIN "gfx/sprites/pikachu.2bpp" diff --git a/engine/palettes.asm b/engine/palettes.asm index 20dbdccb..4c2ac3b2 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -1055,7 +1055,7 @@ Func_72524:: ; 72524 (1c:6524) call PreparePalDataTransfer ret -Func_7265c:: ; 7265c (1c:656c) +Func_7256c:: ; 7256c (1c:656c) ld a,[wdee2] ld e,a ld a,[wdee3] @@ -1134,7 +1134,7 @@ Func_725be:: ; 725be (1c:65be) callba Func_bf450 ; 2f:7250 ret -INCBIN "baserom.gbc",$725e2,$734b9 - $725e2 + dr $725e2,$734b9 ;INCLUDE "data/sgb_packets.asm" ;INCLUDE "data/mon_palettes.asm" |