diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-03-25 16:18:33 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-03-25 16:18:33 +0200 |
| commit | 0d9241889fc8a2f047b9fd6db25e55de1e721877 (patch) | |
| tree | 4ae588ae9d97639b456e6d2ba64a94676ddcf703 /engine/link | |
| parent | 60e21a86638cad5fd25133cda1c545461304d902 (diff) | |
Organize the engine/ directory, take 3
Renamed `title` to `movies`.
Moved some functions from `engine/routines/` to their fitting
directories, and cleaned up the base `engine/` directory.
Moved `engine/pokemon/tmhm.asm` back to `engine/items/`.
Made a new subdirectory:
* engine/tilesets: Contains all map-related graphics routines.
Diffstat (limited to 'engine/link')
| -rwxr-xr-x | engine/link/link.asm | 2 | ||||
| -rw-r--r-- | engine/link/placewaitingtext.asm | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index 86af41c01..f6f37619f 100755 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -2029,7 +2029,7 @@ Unreferenced_Function28f09: ; 28f09 ret ; 28f24 -INCLUDE "engine/gfx/trade_animation.asm" +INCLUDE "engine/movie/trade_animation.asm" CheckTimeCapsuleCompatibility: ; 29bfb ; Checks to see if your party is compatible with the Gen 1 games. diff --git a/engine/link/placewaitingtext.asm b/engine/link/placewaitingtext.asm new file mode 100644 index 000000000..9b2260722 --- /dev/null +++ b/engine/link/placewaitingtext.asm @@ -0,0 +1,24 @@ +PlaceWaitingText:: ; 4000 + hlcoord 3, 10 + ld b, 1 + ld c, 11 + + ld a, [wBattleMode] + and a + jr z, .notinbattle + + call TextBox + jr .proceed + +.notinbattle + predef LinkTextboxAtHL + +.proceed + hlcoord 4, 11 + ld de, .Waiting + call PlaceString + ld c, 50 + jp DelayFrames + +.Waiting: ; 4025 + db "Waiting...!@" |