diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-04 20:11:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:11:52 -0500 |
| commit | ed03fc4f4a3287a01647e528abba27aac1937de0 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /home/overworld.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Start reorganizing pokeyellow (diff) | |
| download | pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.gz pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.xz pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.zip | |
Merge pull request #59 from Rangi42/master
Start reorganizing pokeyellow
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index 0cd63cf7..2909b01e 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1801,7 +1801,7 @@ LoadMapHeader:: jr asm_0dbd Func_0db5:: ; XXX - farcall LoadUnusedBluesHouseMissableObjectData + farcall LoadMissableObjectData asm_0dbd: ld a, [wCurMapTileset] ld [wUnusedD119], a @@ -2009,7 +2009,7 @@ ReloadMapAfterSurfingMinigame:: call ReloadMapSpriteTilePatterns pop af call BankswitchCommon - jr asm_0f4d + jr FinishReloadingMap ReloadMapAfterPrinter:: ldh a, [hLoadedROMBank] @@ -2019,9 +2019,9 @@ ReloadMapAfterPrinter:: call LoadTileBlockMap pop af call BankswitchCommon -asm_0f4d: +FinishReloadingMap: jpfar SetMapSpecificScriptFlagsOnMapReload - ret ; useless? + ret ; useless ResetMapVariables:: ld a, $98 |