diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 20:42:47 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 20:42:47 -0400 |
| commit | dce013880ef1a8171310db173fdb9c45ea170d37 (patch) | |
| tree | eca7a827b7f56fd2caaf441144ed4e9a1fd50cf8 /engine | |
| parent | d42e9f5b72de3d505622b0eb360f5fdfd388e26b (diff) | |
Attempt to make yellow buildable, part 4
Hardcoded pointers, dr (define rom) macro.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c/main.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/start_menu.asm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 4e898e9f..489de063 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -1,6 +1,6 @@ ;INCLUDE "engine/bank3c/overworld.asm" -INCBIN "baserom.gbc",$f0000,$f0274 - $f0000 +dr $f0000,$f0274 ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. @@ -116,4 +116,6 @@ Pointer_f0a76:: ; f0a76 (3c:4a76) db $27,$07,$7b,$4a,$ff db $01,$ec,$02,$ed,$03,$ee,$ff -INCBIN "baserom.gbc",$f0a82,$f4000 - $f0a82 +dr $f0a82,$f25f8 +CheckForHiddenObject:: ; f25f8 (3c:65f8) +dr $f25f8,$f4000
\ No newline at end of file diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm index 7e2052d9..3c3b837c 100755 --- a/engine/menu/start_menu.asm +++ b/engine/menu/start_menu.asm @@ -2,7 +2,7 @@ DisplayStartMenu:: ; 29d1 (0:29d1) switchbank StartMenu_Pokedex ; also bank for other functions ld a,[wWalkBikeSurfState] ; walking/biking/surfing ld [wWalkBikeSurfStateCopy],a - ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound + ld a, $8f ; (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound call PlaySound RedisplayStartMenu:: ; 29e1 (0:29e1) |