diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-02-24 00:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 00:58:44 +0100 |
| commit | 25794633f193e46a7844ea065c5932ec6e11765e (patch) | |
| tree | 613d6d83ba275174108f4ff299c215e2a7f4dba9 | |
| parent | 62fccbbd99ce8c4de44fe658f6247468d192e81d (diff) | |
| parent | c3f389d6156cb573c6105059beba67ff0a72d30a (diff) | |
Merge pull request #688 from Rangi42/master
Edit some comments about bad code
| -rw-r--r-- | engine/items/switch_items.asm | 1 | ||||
| -rw-r--r-- | engine/menus/init_gender.asm | 5 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 3 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 4 | ||||
| -rw-r--r-- | home/map.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_menu.asm | 2 |
8 files changed, 10 insertions, 11 deletions
diff --git a/engine/items/switch_items.asm b/engine/items/switch_items.asm index 10fe535b3..680e548c1 100644 --- a/engine/items/switch_items.asm +++ b/engine/items/switch_items.asm @@ -225,7 +225,6 @@ Function24a6c: ret ItemSwitch_ConvertItemFormatToDW: -; This function is absolutely idiotic. push hl ld a, [wMenuData_ScrollingMenuItemFormat] ld c, a diff --git a/engine/menus/init_gender.asm b/engine/menus/init_gender.asm index 9ab0dd710..e0e857fb4 100644 --- a/engine/menus/init_gender.asm +++ b/engine/menus/init_gender.asm @@ -10,12 +10,11 @@ InitCrystalData: ld [wd478], a ld [wd002], a ld [wd003], a - ; could have done "ld a, [wd479] \ and %11111100", saved four operations ld a, [wd479] - res 0, a + res 0, a ; ??? ld [wd479], a ld a, [wd479] - res 1, a + res 1, a ; ??? ld [wd479], a ret diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 0507d98f6..75d1de594 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -122,9 +122,10 @@ RefreshPlayerCoords: ld hl, wPlayerLastMapY ld [hl], e ld e, a +; the next three lines are useless ld a, [wObjectFollow_Leader] cp $0 - ret nz ; wtf + ret nz ret CopyObjectStruct:: diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index a62312d10..cb11aefde 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -23,7 +23,7 @@ DelCellNum:: ret CheckCellNum:: - jp _CheckCellNum ; wtf + jp _CheckCellNum ; useless _CheckCellNum: ld hl, wPhoneList diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index dd0230952..3719f3ade 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -60,7 +60,7 @@ StatsScreenInit_gotaddress: StatsScreenMain: xor a ld [wJumptableIndex], a - ; stupid interns +; ??? ld [wcf64], a ld a, [wcf64] and %11111100 @@ -80,7 +80,7 @@ StatsScreenMain: StatsScreenMobile: xor a ld [wJumptableIndex], a - ; stupid interns +; ??? ld [wcf64], a ld a, [wcf64] and %11111100 diff --git a/home/map.asm b/home/map.asm index 0b7bb6eac..a2268d51a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -592,7 +592,7 @@ ReadObjectEvents:: jr z, .skip ; jr c, .skip -; stupid waste of time and space + ; could have done "inc hl" instead ld bc, 1 add hl, bc ; Fill the remaining sprite IDs and y coords with 0 and -1, respectively. diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index cb1aec1cf..902b7e303 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -6469,7 +6469,7 @@ Function102e07: jr .okay .link_battle -; this is idiotic +; the next three operations are pointless hlcoord 3, 10 ld b, 1 ld c, 11 diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index bf8560309..ec6d2b6aa 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -146,7 +146,7 @@ MobileMenu_InitMenuBuffers: ld [hli], a ld a, $20 ; w2DMenuCursorOffsets ld [hli], a - ; this is a stupid way to load $c3 + ; could have done "ld a, A_BUTTON | D_UP | D_DOWN | B_BUTTON" instead ld a, A_BUTTON add D_UP add D_DOWN |