diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /engine/hidden_object_functions18.asm | |
| parent | Merge pull request #96 from dannye/master (diff) | |
| parent | No more ldh (diff) | |
| download | pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.gz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.tar.xz pokeyellow-ec4c53559379f3bf7bd332905ba144e1d998f38b.zip | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'engine/hidden_object_functions18.asm')
| -rwxr-xr-x | engine/hidden_object_functions18.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/hidden_object_functions18.asm b/engine/hidden_object_functions18.asm index 7696626f..44be4c31 100755 --- a/engine/hidden_object_functions18.asm +++ b/engine/hidden_object_functions18.asm @@ -14,16 +14,16 @@ GymStatues: ; 62419 (18:6419) cp $ff ret z cp b - jr z, .asm_62433 ; 0x6242e $3 + jr z, .asm_62433 inc hl - jr .asm_62429 ; 0x62431 $f6 + jr .asm_62429 .asm_62433 ld b, [hl] ld a, [wd72a] and b cp b ld a, $d - jr z, .asm_6243f ; 0x6243b $2 + jr z, .asm_6243f ld a, $c .asm_6243f jp PrintPredefTextID @@ -139,11 +139,11 @@ CinnabarIslandPokecenterBenchGuyText: ; 624df (18:64df) db "@" SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4) - db $8 ; asm + TX_ASM ld a, [wd838] bit 7, a ld hl, SaffronCityPokecenterBenchGuyText2 - jr nz, .asm_624f2 ; 0x624ed $3 + jr nz, .asm_624f2 ld hl, SaffronCityPokecenterBenchGuyText1 .asm_624f2 call PrintText |