diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-13 14:37:38 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-13 14:37:38 -0500 |
| commit | c71faf165981fd39e14810604894f894bc00b803 (patch) | |
| tree | 90c7fdd3660fbfaf4ce49cde743cffdc83c34b64 /yellow | |
| parent | drain_hp_effect.asm (diff) | |
| download | pokeyellow-c71faf165981fd39e14810604894f894bc00b803.tar.gz pokeyellow-c71faf165981fd39e14810604894f894bc00b803.tar.xz pokeyellow-c71faf165981fd39e14810604894f894bc00b803.zip | |
engine/menu/players_pc.asm
also rename CinnabarGymQuiz_1eb0a to CinnabarGymQuiz_1e4bf
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index 0183a2b8..50d56a7e 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1092,8 +1092,8 @@ INCLUDE "engine/overworld/cable_club_npc.asm" INCLUDE "engine/text_boxes.asm" INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" -PlayerPC: ; 778e (1:778e) - dr $778e,$7a0f +INCLUDE "engine/menu/players_pc.asm" + _RemovePokemon: ; 7a0f (1:7a0f) dr $7a0f,$7abf _DisplayPokedex: ; 7c18 (1:7abf) @@ -3562,7 +3562,7 @@ SafariZoneCheckSteps: ; 1e330 (7:6330) dr $1e330,$1e385 PrintSafariGameOverText: ; 1e385 (7:6385) dr $1e385,$1e4bf -CinnabarGymQuiz_1eb0a: ; 1e4bf (7:64bf) +CinnabarGymQuiz_1e4bf: ; 1e4bf (7:64bf) dr $1e4bf,$20000 SECTION "Pics 1", ROMX, BANK[PICS_1] |