diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-01 15:42:29 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-01 15:42:29 -0500 |
| commit | 335bf36311e24f9b652a3970ab07413a03bba056 (patch) | |
| tree | 658c8bde184a9fdeb4e23d56c71880ed20a8bc1c /yellow | |
| parent | Naming screen functions. (diff) | |
| download | pokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.tar.gz pokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.tar.xz pokeyellow-335bf36311e24f9b652a3970ab07413a03bba056.zip | |
oak_speech2.asm
Also replace W_RIVALNAME with wRivalName
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index ecd0b5d9..7c752a69 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -718,10 +718,9 @@ EmptyFunc: ; 64ea (1:64ea) ret INCLUDE "engine/menu/naming_screen.asm" -ChoosePlayerName: ; 66db (1:66db) - dr $66db,$6722 -ChooseRivalName: ; 6722 (1:6722) - dr $6722,$68a6 + +INCLUDE "engine/oak_speech2.asm" + SubtractAmountPaidFromMoney_: ; 68a6 (1:68a6) dr $68a6,$68c9 HandleItemListSwapping: ; 68c9 (1:68c9) |