diff options
| -rw-r--r-- | engine/events/fish.asm | 4 | ||||
| -rw-r--r-- | engine/math/print_num.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 2 | ||||
| -rw-r--r-- | maps/BillsFamilysHouse.asm | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/fish.asm b/engine/events/fish.asm index c1dde87d8..df8d80a63 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -1,7 +1,7 @@ Fish: ; Using a fishing rod. ; Fish for monsters with rod e in encounter group d. -; Return monster e at level d. +; Return monster d at level e. push af push bc @@ -23,7 +23,7 @@ endr .Fish: ; Fish for monsters with rod b from encounter data in FishGroup at hl. -; Return monster e at level d. +; Return monster d at level e. call Random cp [hl] diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index 62ef97fb3..409379257 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -6,7 +6,7 @@ _PrintNum:: ; digits will be in front of the decimal point. ; Some extra flags can be given in bits 5-7 of b. ; Bit 5: money if set (unless left-aligned without leading zeros) -; Bit 6: right-aligned if set +; Bit 6: left-aligned if set ; Bit 7: print leading zeros if set push bc diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index eb5afa9dc..8133e2671 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -132,7 +132,7 @@ rept NUM_MOVES + -1 ld [hli], a endr ld [hl], a - ld [wBuffer1], a + ld [wEvolutionOldSpecies], a predef FillMoves .next diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 4aca880f8..9dd90f668 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -54,13 +54,13 @@ BillsMomScript: opentext checkevent EVENT_MET_BILL iffalse .HaventMetBill - writetext BillsPopText + writetext BillsMomText_BeforeEcruteak waitbutton closetext end .HaventMetBill: - writetext BillsMomText + writetext BillsMomText_AfterEcruteak waitbutton closetext end @@ -175,7 +175,7 @@ BillPopWontWorkText: line "a real headache…" done -BillsPopText: +BillsMomText_BeforeEcruteak: text "Oh, you collect" line "#MON? My son" cont "BILL is an expert." @@ -193,7 +193,7 @@ BillsPopText: line "being called…" done -BillsMomText: +BillsMomText_AfterEcruteak: text "My husband was" line "once known as a" |