diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-09 10:20:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 10:20:05 -0700 |
| commit | 40b27505b32bac1d96e20a168ac96ab3384878b3 (patch) | |
| tree | 9de98df1188d19ded55bed9f943d785bb1392409 /engine | |
| parent | f1612ae5bfcf3e8e7c250b214883f9ae1abe7fbd (diff) | |
| parent | 51b81e4d9734c9db8b673074e6ab26dd8280f61c (diff) | |
Merge pull request #18 from TwitchPlaysPokemon/chaos_requests
stationary text labeling
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/pinball_game/catchem_mode.asm | 4 | ||||
| -rw-r--r-- | engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm | 8 | ||||
| -rw-r--r-- | engine/pinball_game/catchem_mode/catchem_mode_red_field.asm | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index 095a877..0268589 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -1163,12 +1163,12 @@ Func_10825: ; 0x10825 call AddBCDEToCurBufferValue
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5e9
+ ld hl, wStationaryText2
ld de, Data_2a50
call Func_3372
pop de
pop bc
- ld hl, wd5e4
+ ld hl, wStationaryText1
ld de, JackpotText
call Func_3357
ret
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm index c4b90fa..d03094d 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm @@ -127,12 +127,12 @@ Func_20394: ; 0x20394 push de
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5e9
+ ld hl, wStationaryText2
ld de, Data_2a2a
call Func_3372
pop de
pop bc
- ld hl, wd5e4
+ ld hl, wStationaryText1
ld de, HitText
call Func_3357
ld a, [wNumMonHits]
@@ -271,12 +271,12 @@ Func_204f1: ; 0x204f1 push de
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5e9
+ ld hl, wStationaryText2
ld de, Data_2a3d
call Func_3372
pop de
pop bc
- ld hl, wd5e4
+ ld hl, wStationaryText1
ld de, FlippedText
call Func_3357
.asm_2055e
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm index b34f93d..d6738d8 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm @@ -125,12 +125,12 @@ Func_200d3: ; 0x200d3 push de
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5e9
+ ld hl, wStationaryText2
ld de, Data_2a2a
call Func_3372
pop de
pop bc
- ld hl, wd5e4
+ ld hl, wStationaryText1
ld de, HitText
call Func_3357
ld a, [wNumMonHits]
@@ -269,12 +269,12 @@ Func_20230: ; 0x20230 push de
call FillBottomMessageBufferWithBlackTile
call Func_30db
- ld hl, wd5e9
+ ld hl, wStationaryText2
ld de, Data_2a3d
call Func_3372
pop de
pop bc
- ld hl, wd5e4
+ ld hl, wStationaryText1
ld de, FlippedText
call Func_3357
.asm_2029d
|