diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /engine/debug | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/debug')
| -rw-r--r-- | engine/debug/debug_menu.asm | 7 | ||||
| -rw-r--r-- | engine/debug/debug_party.asm | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index d888743e..b90c16b2 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -56,7 +56,7 @@ IF DEF(_DEBUG) ; DEBUG ld hl, wd732 - set 1, [hl] + set BIT_DEBUG_MODE, [hl] ld hl, StartNewGameDebug ret @@ -70,12 +70,11 @@ DebugMenuOptions: db "FIGHT" next "DEBUG@" -TestBattle: +TestBattle: ; unreferenced except in _DEBUG ld a, 1 ldh [hJoy7], a - ; Don't mess around - ; with obedience. + ; Don't mess around with obedience. ld a, 1 << BIT_EARTHBADGE ld [wObtainedBadges], a diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 1945950f..e00ee471 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -1,6 +1,5 @@ -; not IshiharaTeam -SetDebugTeam: - ld de, DebugTeam +SetDebugNewGameParty: ; unreferenced except in _DEBUG + ld de, DebugNewGameParty .loop ld a, [de] cp -1 @@ -13,20 +12,20 @@ SetDebugTeam: call AddPartyMon jr .loop -DebugTeam: +DebugNewGameParty: ; unreferenced except in _DEBUG db SNORLAX, 80 db PERSIAN, 80 db JIGGLYPUFF, 15 db STARTER_PIKACHU, 5 db -1 ; end -DebugStart: +PrepareNewGameDebug: ; dummy except in _DEBUG IF DEF(_DEBUG) xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a ; Fly anywhere. - dec a ; $ff + dec a ; $ff (all bits) ld [wTownVisitedFlag], a ld [wTownVisitedFlag + 1], a @@ -34,7 +33,7 @@ IF DEF(_DEBUG) ld a, ~(1 << BIT_EARTHBADGE) ld [wObtainedBadges], a - call SetDebugTeam + call SetDebugNewGameParty ; Pikachu gets Surf. ld a, SURF |